diff --git a/README.md b/README.md
index 8b10e6960..6864725ce 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# odex25-standard-moduless
+# odex25-standard-modules
 This Repo contains general standard modules for all projects.
diff --git a/odex25_project/kpi_scorecard_odex/__init__.py b/odex25_project/kpi_scorecard_odex/__init__.py
new file mode 100644
index 000000000..30a7de2e7
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import reports
+
+
diff --git a/odex25_project/kpi_scorecard_odex/__manifest__.py b/odex25_project/kpi_scorecard_odex/__manifest__.py
new file mode 100644
index 000000000..a200accce
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/__manifest__.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    (Odex - Extending the base module).
+#    Copyright (C) 2024 Expert Co. Ltd. (<http://exp-sa.com>).
+#
+##############################################################################
+{
+    "name": "Odex -KPI",
+    "version": "1.0",
+    "author": "Expert Co. Ltd.",
+    "category": "Odex25-base/Odex-Base25",
+    "website": "http://www.exp-sa.com",
+    "installable": True,
+    "depends": [
+        "kpi_scorecard",
+        
+    ],
+    "data": [
+       "security/ir.model.access.csv",
+        "views/kpi_category.xml",
+        "views/kpi_item.xml",
+        "views/kpi_scorecard_line.xml",
+        'views/menu_security_cus.xml'
+        
+        
+        
+        
+        
+        
+    ],
+    
+    
+
+}
diff --git a/odex25_project/kpi_scorecard_odex/i18n/ar_001.po b/odex25_project/kpi_scorecard_odex/i18n/ar_001.po
new file mode 100644
index 000000000..7f9f1e52e
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/i18n/ar_001.po
@@ -0,0 +1,1999 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* kpi_scorecard
+# 	* kpi_scorecard_odex
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-03-03 00:57+0000\n"
+"PO-Revision-Date: 2024-03-03 00:57+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,help:kpi_scorecard.field_kpi_measure__date_field_ids
+msgid ""
+"\n"
+"            According to those dates Odoo will calculate whether a record is within a specified period.\n"
+"            In case there are a few of date fields, all of related dates should be within a period. \n"
+"        "
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_help.py:0
+#, python-format
+msgid ""
+"\n"
+"<div style=\"width:60%;\">\n"
+"<p style=\"padding-bottom:10px;\">KPI categories serve to structure KPIs and KPI targets for comfortable navigation. Each\n"
+"KPI should be assigned for a single category, what allows users to find required targets quickly just by checking the\n"
+"boxes on the scorecard interface.</p>\n"
+"<p style=\"padding-bottom:10px;\">Hierarchy of categories let users also combine targets in sections to control KPIs\n"
+"related to specific areas. For example, to check targets only in sales (e.g. category 'sales') or targets of a \n"
+"specific sales team (e.g. category 'sales > sales team Europe').</p>\n"
+"<p style=\"padding-bottom:10px;\">Moreover, KPI categories let you administrate user accesses in a batch. Thus, you may\n"
+"grant users and/or user groups an access for this category KPI ('Read Rights') or a right to update those\n"
+"targets ('Edit rights)'. Thus, there would be no need to manage each KPI separately. Take into account that those\n"
+"settings are additive and are not restrictive, meaning that KPI managers would any way have full rights for all\n"
+"KPIs.</p>\n"
+"</div>\n"
+"    "
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_help.py:0
+#, python-format
+msgid ""
+"\n"
+"<div style=\"width:80%;\">\n"
+"<p style=\"padding-bottom:10px;\">\n"
+"A KPI constant is a variable type used for formula construction. In comparison to measurements, KPI constants are fixed\n"
+"and they do not depend on actual Odoo data. This allows to introduce figures which can not be retrieved from modules\n"
+"and/or which should remain the same during the whole period.</p>\n"
+"<p style=\"padding-bottom:10px;\">For example, you might set the 'total size of investments' to calculate return on \n"
+"investments, or the 'number of salesmen' to get sales revenue per person.</p>\n"
+"<p style=\"padding-bottom:10px;\">KPI constant value might be defined for each individual period. If the value does not \n"
+"exist for a calculated period, the app would try to check the parent time frame. For instance, if this constant value\n"
+"does is not set up January 2021, the app would take all the intervals which include January (e.g. Quarter 1 2021 and the\n"
+"year 2021 consequentially). In case the values is not defined for those periods as well, then, the global value would be \n"
+"applied.</p>\n"
+"</div>\n"
+"    "
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_help.py:0
+#, python-format
+msgid ""
+"\n"
+"<div style=\"width:80%;\">\n"
+"<p style=\"padding-bottom:10px;\">A KPI measurement is a final variable used for KPI(s) calculations. It represents\n"
+"specification of basic measurement. For example, 'number of quotations of the sales team Europe' might be a precision of\n"
+"a basic measurement 'total number of sales orders'.</p>\n"
+"<p style=\"padding-bottom:10px;\">Such approach significantly simplifies variables' preparation, since each basic\n"
+"measurement might have an unlimited number of linked KPI measurements. So, the only thing you would need to do is to\n"
+"apply extra filters (in the example 'Sales Team Name is Europe').</p>\n"
+"<p style=\"padding-bottom:10px;\">Take into account that basic measurements of the type 'Execute Python code' can't be\n"
+"any more specified, since they do not relate to any records. In such a case, there is no sense to have a few KPI\n"
+"measurements.</p>\n"
+"<p style=\"padding-bottom:10px;\">In a multi company environment KPI Measurements are applied globally or for each company\n"
+"individually. In the former case that variable is available for any company KPI formulas, while in the latter – only for\n"
+" specific one (it let make quicker overview while constructing formulas).</p>\n"
+"</div>\n"
+"    "
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_help.py:0
+#, python-format
+msgid ""
+"\n"
+"<div style=\"width:80%;font-size:14px;\">\n"
+"<p style=\"padding-bottom:10px;\">A KPI period is a time frame for which companies set their targets to control \n"
+"performance (in a similar way as financial performance is controlled within accounting/fiscal periods).</p>\n"
+"<p style=\"padding-bottom:10px;\">KPI scorecards in comparison to simple dashboard assume that you might not only have \n"
+"overview of actual figures, but to compare those to real targets. However, goals should be time-constrained ('Sell as \n"
+"much as possible' is not a goal, while 'Generate 100,000 Euro Revenue in the year 2021' is a good target for a sales \n"
+"person, for example). That is why KPI periods are introduced.</p>\n"
+"<p style=\"padding-bottom:10px;\">The app allows to set periods of any length including intervals which cross each other \n"
+"(and even the Past periods!).\n"
+"To open a new KPI period you should just set start and end dates. Those dates will be used to calculate KPI actual value.\n"
+"For example, KPI formula might include a basic KPI measurement for total amount of sale orders, while date field of \n"
+"this measurement is defined as 'Order date'. Then, only sale orders which order date is within the period would be \n"
+"taken into account. Thus, KPI scorecard would show total revenue for a given period.</p>\n"
+"<p style=\"padding-bottom:10px;\">It is recommended to have more or less strict logic of periods for comparability \n"
+"purposes. Usually, KPI targets are set for a whole year and quarterly/monthly intervals. It let not only have KPI \n"
+"overview, but also check historical trends. The app automatically considers various periods in order to define which \n"
+"might be compared to this one, and will show users a chart of actual values by a specific KPI. It is possible to define \n"
+"tolerance on the configuration page. For example, 2-days tolerance is needed to compare quarterly periods (since quarter\n"
+" might take from 90 to 92 days), and 3-days tolerance for months (unluckily, February may last 28 days).</p>\n"
+"<p style=\"padding-bottom:10px;\">When end date is already in the Past, it is preferable to close the period to avoid \n"
+"further updates of KPI targets actual values due to further corrections (it is not a good idea to update December KPIs \n"
+"in the next August even though a sale total needs to be corrected, for example). This action is pretty much the same \n"
+"as when accountant finishes a fiscal year. To close a period use the button 'Close period' (this action might be rolled\n"
+"back by re-opening the period).</p>\n"
+"<p style=\"padding-bottom:10px;\">KPI periods let you also copy targets from existing periods (so, use them as a \n"
+"template). To that end just push the button 'Substitute targets' and select a period with proper KPI targets. \n"
+"It significantly saves time, since KPI targets usually remain similar for periods of the same length. Do not worry, \n"
+"after that action you would be still able to change actual scorecard for this period (for sure, until a period is \n"
+"closed).</p>\n"
+"<p style=\"padding-bottom:10px;\">Based on KPI periods you may also configure KPI formulas to rely upon period length in \n"
+"days to calculate figures per days, weeks, etc. To that end use the special Measurements 'Periods Days' or 'Days Passed'\n"
+"(how many days already passed in comparison to today) when you construct a formula. For example, you might have average \n"
+"sales amount per week within the given period, and compare how much it changes from the previous one. That length is\n"
+"calculated automatically, while you just put that to a proper formula place.</p>\n"
+"</div>\n"
+"    "
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_help.py:0
+#, python-format
+msgid ""
+"\n"
+"<div style=\"width:80%;font-size:14px;\">\n"
+"<p style=\"padding-bottom:10px;\">A basic measurement is the core object used for retrieving actual KPI value from Odoo \n"
+"data. Although basic measurements are not used themselves for formula constructions, they are required to prepare any \n"
+"sort of formula variables (KPI measurements).</p>\n"
+"<p style=\"padding-bottom:10px;\">A basic measurement represents the most general calculation, while KPI measurements \n"
+"specify those. For example, 'total number of sales orders' should be a basic measurement, while narrower 'number of \n"
+"quotations of the sales team Europe' is recommended to be a precision of that basic measurement (so, KPI measurement).\n"
+"Each basic measurement might have an unlimited number of linked KPI measurements.</p>\n"
+"<h3>Calculation Types</h3>\n"
+"<p style=\"padding-bottom:10px;\">Basic measurements assume a few types of low-level calculations:</p>\n"
+"<ul>\n"
+"<li>Counting records, e.g. number of registered leads or a number of posted customer invoices. Such measurements should\n"
+"have the KPI type 'Count of records'.</li>\n"
+"<li>Summing up certain number field of records, e.g. sum of all orders amount total or sum of paid taxes by invoices.\n"
+"Such measurements should have the KPI type 'Sum of records field'.</li>\n"
+"<li>Getting of average for records' number fields, e.g. average planned hours per task or average days to assign a lead.\n"
+"Such measurements should have the KPI type 'Average of records field'.</li>\n"
+"<li>Executing Python code. This type requires technical knowledge, but let you compute any sort of figures based on any\n"
+"Odoo data. Merely introduce your Python code and save the value into the special variable 'result'. Here you might also\n"
+"use the special KPI period related variables: 'period_start' (the first date of the period), 'period_end' (the last date\n"
+"of the period), 'period_company_id' - res.company object for which Odoo makes calculations at the moment (according to\n"
+"KPI period).</li>\n"
+"</ul>\n"
+"<h3>Basic Measurement Settings</h3>\n"
+"<p style=\"padding-bottom:10px;\">The first 3 calculation types assume that you define how records should be searched and \n"
+"which records fields should be used for computations.</p>\n"
+"<ul>\n"
+"<li><i>Model</i> is an Odoo document type you have in your database, so with which data set you work. For, examples,\n"
+"'Sales Order' or 'Task'. Here you can rely not only upon standard objects, but also on Odoo reports. The latter is quite\n"
+"useful if indicators are already calculated for existing dashboard (for example, total sales amount in default currency\n"
+"from the 'Sales Analysis Report').</li>\n"
+"<li><i>Date fields</i> are required to understand whether a specific document type relates to a considered period, so,\n"
+"how to distribute objects by time intervals. For example, for tasks you might use 'create date' to analyze jobs\n"
+"registered within this KPI period (e.g. 'Total number of tasks created in January 2021'). It is possible to apply a few\n"
+"date fields (e.g. 'Opportunities opened and won in January 2021'). If date fields are not specified, KPI period would\n"
+"not influence this basic measurement.</li>\n"
+"<li><i>Filters</i> allow you to restrict records set by any stored field. For example, you may calculate count of only\n"
+"won opportunities based on stage settings or only posted customer invoices based on journal entry type and state.</li>\n"
+"<li><i>Measure field</i> is available and required only for calculation types 'Average' and 'Sum'. It defines which\n"
+"figure you use for calculations. For example, total amount of Sales Analysis Report to get accumulated sales revenue or\n"
+"work hours of tasks to get average spent time per each task.</li>\n"
+"<li><i>Company field</i> would be needed for multi companies environment. According to that field, KPIs are considered\n"
+"only withing a KPI period target company. Take into account that records without company stated would be used for\n"
+"all companies' KPI calculations.</li>\n"
+"</ul>\n"
+"<p style=\"padding-bottom:10px;\">All settings might relate to your custom objects or custom fields, including ones\n"
+"created through the interface or the Odoo studio.</p>\n"
+"</div>\n"
+"    "
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_help.py:0
+#, python-format
+msgid ""
+"\n"
+"<div style=\"width:80%;font-size:14px;\">\n"
+"<p style=\"padding-bottom:10px;\">KPIs (key performance indicators) are measurements which aim to evaluate organizational\n"
+"or personal success of a definite activity. Different companies have different KPIs depending on their strategy and\n"
+"business area. However, all KPIs have the common core attribute: they must be measurable within a target period.</p>\n"
+"<p style=\"padding-bottom:10px;\">To that end KPIs allow to construct formulas to retrieve Odoo data sets and process\n"
+"those to real figures. Formula preparation is as simple as it is to write down a mathematical expression: just drag and\n"
+"drop formula parts in a right order with correct operators.</p>\n"
+"<h3>KPIs, KPI periods, and KPI targets</h3>\n"
+"<p style=\"padding-bottom:10px;\">KPIs represent the list of success figures you may use to plan your company activities.\n"
+"Simultaneously, measurements are almost senseless unless you have target values for those KPIs. That is possible only\n"
+"within a time-constrained period. 'Sell as much as you can' is not a goal, while 'Generate 100,000 Euro Revenue in the\n"
+"year 2021' is a good aim for a sales person, for example. To that end KPI periods are introduced.</p>\n"
+"<p style=\"padding-bottom:10px;\">A Combination of a KPI and a KPI period results in a KPI target. Exactly with those\n"
+"targets you work on the score card interface. For each KPI you would like to manage in this period, you should define\n"
+"a planned value to compare those to actual at the end of the period.</p>\n"
+"<p style=\"padding-bottom:10px;\">So, a KPI itself defines how to compute actual value for period and how to estimate the\n"
+"result ('the more the better' or 'the less the better'), but does not assume setting targets. The latter should be done\n"
+"for each period.</p>\n"
+"<h3>Formula parts</h3>\n"
+"<p style=\"padding-bottom:10px;\">As variables for formula you may use:</p>\n"
+"<p style=\"padding-bottom:10px;\"><i>Measurements (KPI measurements, KPI variables)</i> are figures calculated from actual\n"
+"Odoo data for a checked period. For example, 'number of quotations of the sales team Europe'.</p>\n"
+"<p style=\"padding-bottom:10px;\">Among measurements you may also find 2 very specific variables: 'Period Days' and 'Days\n"
+"Passed'. Those figures are calculated not from Odoo data, but from the KPI period settings under consideration. 'Period\n"
+"Days' is an interval length in days. 'Days Passed' is a length between period start and today (if today is before period\n"
+"end; otherwise period end). Those parameters let calculate per-time KPIs, such as, for example, 'Average sales per \n"
+"week'.</p>\n"
+"<p style=\"padding-bottom:10px;\"><i>Constants (KPI constants)</i> are fixed numbers applied globally or for a period.\n"
+"Such numbers do not depend on Odoo data. So, they let define strict non-changeable figures which you can't otherwise get\n"
+"from Odoo. For example, 'Total investments'.</p>\n"
+"<p style=\"padding-bottom:10px;\"><i>Other KPIs</i> are results of other KPI formula calculations. That variables allow to\n"
+"construct derivative complex calculations and make up hierarchy. For example, you may have KPIs 'Sales count' and\n"
+"'Opportunities count', and a derivative KPI 'Opportunity to sales success ratio'.</p>\n"
+"<p style=\"padding-bottom:10px;\">Variables of any types above might be added to a formula. You may drag and drop as many\n"
+"variables as you like (and even use the same variable twice). Just do not forget to add operators in between to make\n"
+"correct mathematical expressions. The following operators are available:</p>\n"
+"<ul>\n"
+"<li>\"-\" - subtraction;</li>\n"
+"<li>\"+\" - addition;</li>\n"
+"<li>\"*\" - multiplication;</li>\n"
+"<li>\"/\" - division;</li>\n"
+"<li>\"(\", \")\" - to make proper calculation order as it is in Math;</li>\n"
+"<li>\"**\" - exponentiation (**2 – squaring; **0.5 – square root extraction);</li>\n"
+"<li>Float number.</li>\n"
+"</ul>\n"
+"<h3>Result appearance</h3>\n"
+"<p style=\"padding-bottom:10px;\">Depending of business logic of KPI formula, the final calculation result might have \n"
+"different form:</p>\n"
+"<ul>\n"
+"<li>Simple number: for example, 'Average sales count per week';</li>\n"
+"<li>Percentage: for example, 'Sales to opportunities success ratio';</li>\n"
+"<li>Monetary: for example, 'Total Sales per period'. <strong>Make sure the measurement field you used is in the same\n"
+"currency (usually company default currency)!</strong></li>\n"
+"</ul>\n"
+"<p style=\"padding-bottom:10px;\">For simple numbers and percentage you may also define result suffix and prefix to make a\n"
+"figure nice looking (e.g. add \"%\" as suffix to have \"88<strong>%</strong>\"). For monetary result type it is recommended\n"
+"to define a currency, which symbol would be added to result.</p>\n"
+"<p style=\"padding-bottom:10px;\">Finally, you may decide how calculation result should be rounded. Available options are\n"
+"from 0 to 4 decimal points (1 > 1.2 > 1.23 > 1.235 > 1.2346).</p>\n"
+"<h3>Categories and hierarchy</h3>\n"
+"<p style=\"padding-bottom:10px;\">To make navigation by KPI targets more comfortable, KPIs are combined into KPI\n"
+"categories. It let not only quickly search targets inside a scorecard, but it let grant additive access rights. In such\n"
+"a way, users would overview only their KPIs structured in sections.</p>\n"
+"<p style=\"padding-bottom:10px;\">Each KPI might also have a parent. Such hierarchy let organize KPI scorecard with\n"
+"indicative padding. For example, 'Total company sales' might have children 'Sales Europe' and 'Sales America'. The\n"
+"latter 2 might be further specified by sales persons.</p>\n"
+"<h3>Additive access to KPIs and targets</h3>\n"
+"<p style=\"padding-bottom:10px;\">By default KPIs and there linked targets are available only for users with the right\n"
+"'KPI Manager'. Simultaneously, you may grant extra rights for other user groups or/and definite users. To that end it is\n"
+"possible to define 'Read Rights' and 'Edit Rights' on KPI category or KPI form views (take into account that KPI\n"
+"category rights and KPI own rights are combined!).</p>\n"
+"<p style=\"padding-bottom:10px;\">Read rights define which user and user groups would be able to observe KPI targets on\n"
+"the scorecard interface. For example, you might want to share tasks' targets by persons with related project users in\n"
+"order their control themselves.</p>\n"
+"<p style=\"padding-bottom:10px;\">Edit rights assume sharing an access to set specific targets up. For instance, you may\n"
+"find it a good idea to involve sales manager to set sub targets for their sales team.</p>\n"
+"<p style=\"padding-bottom:10px;\">Take into account: all security settings are additive and they are not restrictive. KPI\n"
+"managers would have full rights for all KPIs disregarding those settings, while other users would have rights only to\n"
+"KPIs which settings (or category settings) allow them so.</p>\n"
+"</div>\n"
+"    "
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_help.py:0
+#, python-format
+msgid ""
+"\n"
+"<p style=\"padding-bottom:10px;\"></p>A KPI target is your plan for this KPI for a given period. By setting up a target\n"
+"value, you indicate which result you would like to achieve by the end of the period.</p>\n"
+"<p style=\"padding-bottom:10px;\"></p>KPI targets actual values are re-calculated regularly (not in real time) and\n"
+"automatically by the Odoo cron job. Alternatively, you may press the button 'Calculate' on the left navigation bar.</p>\n"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_help.py:0
+#, python-format
+msgid ""
+"\n"
+"<p style=\"padding-bottom:10px;\">The action removes all current targets and copies targets from a chosen period. After \n"
+"that action you would be still able to modify scorecard: change targets' values, delete certain KPI targets, or add new\n"
+"ones.</p>\n"
+"    "
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_kanban
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+msgid "#{record.computation_error.raw_value}"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_kanban
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+msgid "#{record.description.raw_value and record.description.raw_value or ''}"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "<ERROR!!!FORMULA PART DOES NOT EXIST>"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__access_user_ids
+msgid "Access Users"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__data_source__achievement
+msgid "Achievement"
+msgstr "انجاز"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__active
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__active
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__active
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__active
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__active
+msgid "Active"
+msgstr "نشط"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__edit_rights
+msgid "Active User Editor"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#. openerp-web
+#: code:addons/kpi_scorecard/models/kpi_period.py:0
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__formatted_actual_value
+#, python-format
+msgid "Actual"
+msgstr "المحقق"
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__actual_value
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_kanban
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+msgid "Actual Value"
+msgstr "المحقق"
+
+#. module: kpi_scorecard
+#: model_terms:ir.actions.act_window,help:kpi_scorecard.kpi_period_action
+msgid "Add a new period to set KPI targets"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.actions.act_window,help:kpi_scorecard.kpi_item_action
+msgid "Add new KPI to measure performance"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.actions.act_window,help:kpi_scorecard.kpi_constant_action
+msgid "Add new company constants which are used for KPI calculations"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.actions.act_window,help:kpi_scorecard.kpi_measure_action
+msgid ""
+"Add new low-level measurements which are used to distinguish KPI calculations variables.\n"
+"                For example, won opportunities count, total sales, etc."
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.actions.act_window,help:kpi_scorecard.kpi_measure_item_action
+msgid ""
+"Add new measurements (variables) to calculate KPIs.\n"
+"                For example, won opportunities count for sales team 'Europe', total sales conducted by John Brown, etc."
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__formula_warning
+msgid "Alert"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__all_parent_ids
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__all_parents
+msgid "All Parents"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__user_group_ids
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__user_ids
+msgid "Allowed Users"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__measurement_periodic__annually
+msgid "Annually"
+msgstr "سنوي"
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_constant_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_item_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_search
+msgid "Archived"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__automated_weight
+msgid "Automated Weight"
+msgstr "الوزن تلقائيا"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_measure__measure_type__average
+msgid "Average of records field"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.actions.act_window,name:kpi_scorecard.kpi_measure_action
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_basic_measures
+msgid "Basic Measurements"
+msgstr "التكامل"
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_constant_view_form
+msgid "By Periods"
+msgstr "بالفترة"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#, python-format
+msgid "Calculate"
+msgstr "حساب"
+
+#. module: kpi_scorecard
+#: model:ir.actions.server,name:kpi_scorecard.cron_recalculate_kpi_periods_ir_actions_server
+#: model:ir.cron,cron_name:kpi_scorecard.cron_recalculate_kpi_periods
+#: model:ir.cron,name:kpi_scorecard.cron_recalculate_kpi_periods
+msgid "Calculate KPIs"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_copy_template_wizard_form_view
+msgid "Cancel"
+msgstr "الغاء"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#, python-format
+msgid "Categories"
+msgstr "الاهداف"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__category_id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__category_id
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_search
+msgid "Category"
+msgstr "الاهداف"
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_kanban
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+msgid "Change Target"
+msgstr "تغيير المستهدف"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__child_ids
+msgid "Child Categories"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__child_ids
+msgid "Child KPIs"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+#, python-format
+msgid "Close Period"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_period__state__closed
+msgid "Closed"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_category__code
+msgid "Code"
+msgstr "الكود"
+
+#. module: kpi_scorecard
+#: model:ir.model,name:kpi_scorecard.model_res_company
+msgid "Companies"
+msgstr "شركات"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__company_id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__company_id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__company_id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__company_id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__company_id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__company_id
+msgid "Company"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__company_field_id
+msgid "Company Field"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__company_field_name
+msgid "Company Field Name"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_config_settings__kpi_company_id
+msgid "Company for KPI settings"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_measure_item.py:0
+#, python-format
+msgid ""
+"Computation Error: KPI is not correctly defined. Perhaps, the related module was uninstalled or \n"
+"                field was removed. Please check basic measurements involved in formula"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_measure.py:0
+#, python-format
+msgid ""
+"Computation Error: Python code is incorrect: it doesn't contain 'result' key"
+" word"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_measure.py:0
+#, python-format
+msgid ""
+"Computation Error: Python code is incorrect: it returns not number but {}"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "Computation Error: the formula is empty"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#: code:addons/kpi_scorecard/models/kpi_measure.py:0
+#, python-format
+msgid "Computation Error: {}"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_search
+msgid "Computation Errors"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model,name:kpi_scorecard.model_res_config_settings
+msgid "Config Settings"
+msgstr "ضبط الاعدادات"
+
+#. module: kpi_scorecard
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_conf
+msgid "Configuration"
+msgstr "الاعدادات"
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.res_config_settings_view_form
+msgid "Configure cron job"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.res_config_settings_view_form
+msgid ""
+"Configure when and how frequent KPIs actual values should be re-calculated"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#: model:ir.actions.act_window,name:kpi_scorecard.kpi_constant_action
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__constant_ids
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_constants
+#, python-format
+msgid "Constants"
+msgstr "ادخال القياس"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__template_id
+msgid "Copy targets from"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_measure__measure_type__count
+msgid "Count of records"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__create_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__create_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__create_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__create_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__create_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__create_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__create_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__create_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__create_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__create_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__create_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__create_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__create_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__create_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__create_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__create_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__measurement_method__data_entry
+msgid "Data entry"
+msgstr "ادخال بيانات"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__data_source
+msgid "Data source"
+msgstr "مصدر البيانات"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__date_field_name
+msgid "Date Field Name"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__date_field_ids
+msgid "Date Fields"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__period_passed
+#, python-format
+msgid "Days Passed"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#, python-format
+msgid ""
+"Days of periods which are already in the Past. If period is not yet started "
+"- 1. If the whole period is in the Past - period length in days"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.res_config_settings_view_form
+msgid ""
+"Define how to distinguish similar periods. For example, 7-days periods might be\n"
+"                                    compared to 5-days and 9-days periods. Then, tolerance would be 2. If you have\n"
+"                                    monthly or quartely periods you should have at least 3-days tolerance"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_kanban
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+msgid "Delete Target"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "Details"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__data_source__direct_data
+msgid "Direct Data"
+msgstr "بيانات مباشرة"
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_help__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_company__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_category__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__display_name
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/js/scorecard_kanbancontroller.js:0
+#, python-format
+msgid ""
+"Do you really want to close the period? Actual values by its targets would "
+"be frozen then."
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/js/scorecard_kanbancontroller.js:0
+#, python-format
+msgid "Do you really want to delete this target?"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__kpi_help_dummy
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__kpi_help_dummy
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__kpi_help_dummy
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_help__kpi_help_dummy
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__kpi_help_dummy
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__kpi_help_dummy
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__kpi_help_dummy
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__kpi_help_dummy
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__kpi_help_dummy
+msgid "Dummy Help"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+msgid "Edit Rights"
+msgstr "صلاحية التعديل"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__edit_access_user_ids
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__edit_access_user_ids
+msgid "Edit Rights Access Users"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__edit_user_ids
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__edit_user_ids
+msgid "Edit Rights Allowed Users"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__edit_user_group_ids
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__edit_user_group_ids
+msgid "Edit Rights User Groups"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type__effectiveness
+msgid "Effectiveness"
+msgstr "فاعلية"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type__efficiency
+msgid "Efficiency"
+msgstr "كفاءة"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_scorecard_line__result__error
+msgid "Error"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_measure__measure_type__py_code
+msgid "Execute Python code"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#, python-format
+msgid "Export Scorecard"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__external_bench_ids
+msgid "External Benchmarking"
+msgstr "جهة المقارنة المرجعية الخارجية"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__domain
+msgid "Extra Filters"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+msgid "Extra Targets Security"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_search
+msgid "Failed Targets"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_scorecard_line__result__failure
+msgid "Failure"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__domain
+msgid "Filters"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type__financial
+msgid "Financial"
+msgstr "مالي"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__formula
+msgid "Formula"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__target_value
+msgid "Global Value"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_constant_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_item_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_search
+msgid "Group By"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__help_notes
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__help_notes
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__help_notes
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_help__help_notes
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__help_notes
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__help_notes
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__help_notes
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__help_notes
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__help_notes
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_constant_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+msgid "Help"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_kanban
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+msgid "History"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_company__kpi_history_tolerance
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_config_settings__kpi_history_tolerance
+msgid "History Tolerance"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#, python-format
+msgid "History by similar periods"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_help__id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_company__id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_config_settings__id
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_category__id
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__id
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_measure.py:0
+#, python-format
+msgid "In order to activate the KPI, please install the module for {}"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type_region__inputs
+msgid "Inputs"
+msgstr "مدخلات"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__existing_kpi
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__existing_kpi
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_search
+msgid "Installed"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_domain__institute
+msgid "Institutional Accreditation"
+msgstr "الاعتماد المؤسسي"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__internal_bench_ids
+msgid "Internal Benchmarking"
+msgstr "جهة المقارنة المرجعية الداخلية"
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_category.py:0
+#, python-format
+msgid "It is not allowed to make recursions!"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/res_config_settings.py:0
+#, python-format
+msgid "Job: Calculate KPIs"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: code:addons/kpi_scorecard/models/kpi_period.py:0
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model:ir.actions.act_window,name:kpi_scorecard.kpi_item_action
+#: model:ir.model,name:kpi_scorecard_odex.model_kpi_item
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__kpi_id
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_main
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+#, python-format
+msgid "KPI"
+msgstr "المؤشرات"
+
+#. module: kpi_scorecard
+#: model:ir.actions.act_window,name:kpi_scorecard.kpi_category_action
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_categories
+msgid "KPI Categories"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model,name:kpi_scorecard_odex.model_kpi_category
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_form
+msgid "KPI Category"
+msgstr "الهدف التشغيلي"
+
+#. module: kpi_scorecard_odex
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__code
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__code
+#, python-format
+msgid "KPI Code"
+msgstr "كود المؤشر"
+
+#. module: kpi_scorecard
+#: model:ir.model,name:kpi_scorecard.model_kpi_constant
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__constant_id
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_constant_view_form
+msgid "KPI Constant"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__kpi_domain
+msgid "KPI Domain"
+msgstr "مجال المؤشر"
+
+#. module: kpi_scorecard
+#: model:ir.model,name:kpi_scorecard.model_kpi_help
+msgid "KPI Help"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/js/scorecard_kanbancontroller.js:0
+#, python-format
+msgid "KPI History"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.module.category,name:kpi_scorecard.module_category_kpi
+msgid "KPI Management"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:res.groups,name:kpi_scorecard.group_kpi_admin
+msgid "KPI Manager"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_form
+msgid "KPI Measure"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model,name:kpi_scorecard.model_kpi_measure
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_item_view_form
+msgid "KPI Measurement"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model,name:kpi_scorecard.model_kpi_measure_item
+msgid "KPI Measurement (Variable)"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__kpi_owner_id
+msgid "KPI Owner"
+msgstr "مالك الموشر"
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model,name:kpi_scorecard.model_kpi_period
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__kpi_period
+msgid "KPI Period"
+msgstr "مدة المؤشر"
+
+#. module: kpi_scorecard
+#: model:ir.model,name:kpi_scorecard.model_kpi_period_value
+msgid "KPI Period Value"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/js/scorecard_kanbanview.js:0
+#: model:ir.actions.act_window,name:kpi_scorecard.kpi_scorecard_line_action
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.res_config_settings_view_form
+#, python-format
+msgid "KPI Scorecard"
+msgstr "تقرير مؤشرات اﻷداء"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model,name:kpi_scorecard_odex.model_kpi_scorecard_line
+msgid "KPI Target"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__line_ids
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__line_ids
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+msgid "KPI Targets"
+msgstr "المستهدف"
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__measure_type
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__measure_type
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__kpi_type
+msgid "KPI Type"
+msgstr "نمط الموشر"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__kpi_type_region
+msgid "KPI Type By Region"
+msgstr "نوع المؤشر حسب المنطقة"
+
+#. module: kpi_scorecard
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_kpi
+msgid "KPIs"
+msgstr "المؤشرات"
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_form
+msgid "KPIs Targets Security"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__last_recalculation_date
+msgid "Last KPI Calculation"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_help____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_company____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_config_settings____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_category____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item____last_update
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__write_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__write_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__write_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__write_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__write_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__write_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__write_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__write_uid
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__write_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__write_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__write_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__write_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__write_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__write_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__write_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__write_date
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__computation_error
+msgid "Logs"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,help:kpi_scorecard.field_kpi_measure__py_code
+msgid ""
+"Make sure the 'result' is defined and it contains the new current value."
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__measure_field_id
+msgid "Measure Field"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__measure_field_name
+msgid "Measure Field Name"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__measure_id
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_item_view_search
+msgid "Measurement"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__measurement_method
+msgid "Measurement Method"
+msgstr "طريقة القياس "
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__measurement_periodic
+msgid "Measurement Periodicity"
+msgstr "دورية القياس"
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_search
+msgid "Measurement Type"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__measures_ids
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__item_ids
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_measurements_general
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+#, python-format
+msgid "Measurements"
+msgstr "المقاييس"
+
+#. module: kpi_scorecard
+#: model:ir.actions.act_window,name:kpi_scorecard.kpi_measure_item_action
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_measures
+msgid "Measurements (Variables)"
+msgstr "ممقاييس المؤشرات"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__measures_len
+msgid "Measurements Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+msgid "Misc"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__model_id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__model_id
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_item_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_search
+msgid "Model"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__model_name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__model_name
+msgid "Model Name"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_item__result_appearance__monetory
+msgid "Monetary"
+msgstr "نقدي"
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: code:addons/kpi_scorecard/models/kpi_scorecard_line.py:0
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#, python-format
+msgid "N/A"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__name
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#, python-format
+msgid "New Period"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: code:addons/kpi_scorecard/models/kpi_period.py:0
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__description
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__description
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__description
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__description
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__description
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_constant_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_form
+#, python-format
+msgid "Notes"
+msgstr "ملاحظات"
+
+#. modules: kpi_scorecard,kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__description
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+msgid "Notes"
+msgstr "وصف المؤشر"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_item__result_appearance__number
+msgid "Number"
+msgstr "عدد"
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_search
+msgid "Open"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/js/scorecard_kanbancontroller.js:0
+#, python-format
+msgid "Open New Period"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_period__state__open
+msgid "Opened"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_category__type__op_goal
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_search
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_tree
+msgid "Operational Goal"
+msgstr "هدف تشغيلي"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#, python-format
+msgid "Operators"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__data_source__poll
+msgid "Opinion Polls"
+msgstr "استطلاعات رأي"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_category__type__other
+msgid "Other"
+msgstr "اخرى"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__kpi_ids
+#, python-format
+msgid "Other KPIs"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-f.ormat
+msgid ""
+"Other KPIs used in formula depends on this KPI. Calculation is impossible"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type_region__outputs
+msgid "Outputs"
+msgstr "مخرجات"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__parent_id
+msgid "Parent Category"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__parent_id
+msgid "Parent KPI"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__parent_id
+msgid "Parent Period"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_item__result_appearance__percentage
+msgid "Percentage"
+msgstr "نسبة"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__period_id
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__period_id
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+#, python-format
+msgid "Period"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__period_length
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__period_length
+#, python-format
+msgid "Period Days"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__date_end
+msgid "Period End"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__date_start
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_search
+msgid "Period Start"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_period.py:0
+#: model:ir.model.constraint,message:kpi_scorecard.constraint_kpi_period_dates_check
+#, python-format
+msgid "Period end should be after period start"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#, python-format
+msgid "Period length in days"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_period_value.py:0
+#: model:ir.model.constraint,message:kpi_scorecard.constraint_kpi_period_value_period_constant_id_uniq
+#, python-format
+msgid "Period should be unique per each constant!"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__measurement_periodic__periodical
+msgid "Periodical"
+msgstr "فصلي"
+
+#. module: kpi_scorecard
+#: model:ir.actions.act_window,name:kpi_scorecard.kpi_period_action
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_period
+msgid "Periods"
+msgstr "الفترات"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_category__type__pillar
+msgid "Pillar"
+msgstr "ركيزة"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type_region__processes
+msgid "Processes"
+msgstr "عمليات"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type__productivity
+msgid "Productivity"
+msgstr "إنتاجية"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__program_id
+msgid "Program"
+msgstr "البرنامج"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_domain__program
+msgid "Program Accreditation"
+msgstr "اعتماد برامجي"
+
+#. module: kpi_scorecard_odex
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__progress
+#, python-format
+msgid "Progress"
+msgstr "الانجاز"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__py_code
+msgid "Python Code"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type__quality
+msgid "Quality"
+msgstr "جودة"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+#, python-format
+msgid "Re-Open Period"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_search
+msgid "Reached Targets"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+msgid "Read Rights"
+msgstr "صلاحية اطلاع"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__access_user_ids
+msgid "Read Rights Access Users"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__user_group_ids
+msgid "Read Rights User Groups"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__user_ids
+msgid "Read Rights Users"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__name
+msgid "Reference"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__result
+msgid "Result"
+msgstr "النتيجة"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__result_preffix
+msgid "Result Prefix"
+msgstr "بادئة"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__result_suffix
+msgid "Result Suffix"
+msgstr "لاحقة"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__result_appearance
+msgid "Result Type"
+msgstr "نوع النتيجة"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__result_rounding
+msgid "Rounding Decimals"
+msgstr "التقريب"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_domain__research
+msgid "Scientific Research"
+msgstr "البحث العلمي"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#: code:addons/kpi_scorecard/static/src/xml/kpi_formula.xml:0
+#, python-format
+msgid "Search"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_type__security
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+msgid "Security"
+msgstr "الصلاحيات"
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.res_config_settings_view_form
+msgid "Select company to configure KPI management settings"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_category__sequence
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__sequence
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__sequence
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure__sequence
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_measure_item__sequence
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__sequence
+msgid "Sequence"
+msgstr "متسلسل"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/js/scorecard_kanbancontroller.js:0
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#, python-format
+msgid "Set Target"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_constant__periods_ids
+msgid "Set for periods"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.actions.act_window,name:kpi_scorecard.res_config_settings_kpi_scorecard_action
+#: model:ir.ui.menu,name:kpi_scorecard.menu_kpi_settings
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+msgid "Settings"
+msgstr "الاعدادات"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_company__show_kpi_help
+#: model:ir.model.fields,field_description:kpi_scorecard.field_res_config_settings__show_kpi_help
+msgid "Show Help Tabs"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period__state
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_search
+msgid "State"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_category__type__st_goal
+msgid "Strategic Goal"
+msgstr "هدف استراتيجي"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_copy_template_wizard_form_view
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+#, python-format
+msgid "Substitute Targets"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__template_id
+msgid "Substitute Targets With"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.actions.act_window,name:kpi_scorecard.kpi_copy_template_action
+msgid "Substitute Targets with Targets from Another Period"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_scorecard_line__result__success
+#, python-format
+msgid "Success"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_item__result_type
+msgid "Success Criteria"
+msgstr "معايير النجاح"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__target_value
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+msgid "Success Value"
+msgstr "نجاح المؤشر"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_measure__measure_type__sum
+msgid "Sum of records field"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#. openerp-web
+#: code:addons/kpi_scorecard/models/kpi_period.py:0
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_scorecard_line__formatted_target_value
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__formatted_planed_value
+#, python-format
+msgid "Target"
+msgstr "المستهدف"
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_period_value__target_value
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__planed_value
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_scorecard_line_view_kanban
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+msgid "Target Value"
+msgstr "المستهدف"
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_scorecard_line.py:0
+#: model:ir.model.constraint,message:kpi_scorecard.constraint_kpi_scorecard_line_period_kpi_uniq
+#, python-format
+msgid "Target for this KPI is already set for this period"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+msgid "Targets"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#, python-format
+msgid "Targets by all periods"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_category_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_constant_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_item_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_measure_view_form
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+msgid "Technical"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model,name:kpi_scorecard.model_kpi_copy_template
+msgid "Template Targets Replace"
+msgstr ""
+
+#. modules: kpi_scorecard, kpi_scorecard_odex
+#: code:addons/kpi_scorecard/models/kpi_period.py:0
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#, python-format
+msgid ""
+"The Python library xlsxwriter is installed. Contact your system "
+"administrator"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "The formula is empty"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "The formula might be incorrect: {}"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "The formula might rely upon incorrect KPI: {}.>> {}"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "The formula uses obsolete measurement: {}"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_item__result_type__less
+msgid "The less the better"
+msgstr "اﻷقل اﻷفضل"
+
+#. module: kpi_scorecard
+#: model:ir.model.fields.selection,name:kpi_scorecard.selection__kpi_item__result_type__more
+msgid "The more the better"
+msgstr "اﻷكثر اﻷفضل"
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "There are KPIs which depend on this KPI: {}. Delete them before"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_measure_item.py:0
+#, python-format
+msgid ""
+"There are KPIs which depend on this MEASUREMENT: {}. Delete them before"
+msgstr ""
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_constant.py:0
+#, python-format
+msgid "There are KPIs which depend on this constant: {}. Delete them before"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,field_description:kpi_scorecard.field_kpi_copy_template__period_id
+msgid "This Period"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.res_config_settings_view_form
+msgid "Turn on / off help notes on KPI settings objects"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_category__type
+msgid "Type"
+msgstr "نوع"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__kpi_domain__university
+msgid "University Strategy"
+msgstr "استراتيجية الجامعة"
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/js/scorecard_kanbancontroller.js:0
+#, python-format
+msgid "Update Target"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,help:kpi_scorecard.field_kpi_constant__target_value
+msgid "Value used in case this constant is not applied for a target period"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_category__weight
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_item__weight
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__weight
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_tree
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+#, python-format
+msgid "Weight"
+msgstr "الوزن"
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields,field_description:kpi_scorecard_odex.field_kpi_scorecard_line__weight_progress
+msgid "Weight Progress"
+msgstr "الوزن المحقق"
+
+#. module: kpi_scorecard_odex
+#: code:addons/kpi_scorecard_odex/models/kpi_scorecard_line.py:0
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_scorecard_line_view_kanban
+#, python-format
+msgid "Weight progress"
+msgstr "الوزن المحقق"
+
+#. module: kpi_scorecard
+#: code:addons/kpi_scorecard/models/kpi_item.py:0
+#, python-format
+msgid "You cannot create recursive KPIs."
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.customer_invoice_all
+msgid "[account] Posted Customer Invoices: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.customer_invoice_amount_all
+#: model:kpi.measure,name:kpi_scorecard.vendor_bills_amount_all
+msgid "[account] Posted Customer Invoices: Total"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.vendor_invoice_all
+msgid "[account] Posted Vendor Bills: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_all
+msgid "[crm] Leads and Opportunities: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_leads_only
+msgid "[crm] Leads: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_opportunities_days_to_assign
+msgid "[crm] Opportunities: Average Days to Assign"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_opportunities_days_to_close
+msgid "[crm] Opportunities: Average Days to Close"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_opportunities_expected_revenue
+msgid "[crm] Opportunities: Average Expected Revenue"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_opportunities_sale_average
+msgid "[crm] Opportunities: Average of Sale Orders"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_opportunities_only
+msgid "[crm] Opportunities: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_opportunities_expected_revenue_total
+msgid "[crm] Opportunities: Total Expected Revenue"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_opportunities_sale_total
+msgid "[crm] Opportunities: Total Sale Orders"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.crm_lead_won_opprotunities
+msgid "[crm] Won Opportunities: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.project_task_planned_hours_average
+msgid "[project] Tasks: Average Planned Hours"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.project_task_all
+msgid "[project] Tasks: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.project_task_planned_hours
+msgid "[project] Tasks: Total Planned Hours"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.project_task_working_days_to_assign
+msgid "[project] Tasks: Working Days to Assign"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.project_task_working_days_to_close
+msgid "[project] Tasks: Working Days to Close"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.sale_order_all_abs
+msgid "[sales] All Sale Orders and Quotations: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.sale_order_all
+msgid "[sales] Сonfirmed/Done Sale Orders: Count"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.sale_order_delivered_qty
+msgid "[sales] Сonfirmed/Done Sale Orders: Delivered Units"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.sale_order_invoiced_qty
+msgid "[sales] Сonfirmed/Done Sale Orders: Invoiced Units"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.sale_order_number_of_lines
+msgid "[sales] Сonfirmed/Done Sale Orders: Number of Lines"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.sale_order_total
+msgid "[sales] Сonfirmed/Done Sale Orders: Total"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:kpi.measure,name:kpi_scorecard.sale_order_total_qty
+msgid "[sales]Сonfirmed/Done Sale Orders: Product Units"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+msgid "e.g. Year 2021"
+msgstr ""
+
+#. module: kpi_scorecard
+#. openerp-web
+#: code:addons/kpi_scorecard/static/src/xml/kpi_kanban.xml:0
+#, python-format
+msgid "if closed, KPI actual values would not be re-calculated any more"
+msgstr ""
+
+#. module: kpi_scorecard_odex
+#: model:ir.model.fields.selection,name:kpi_scorecard_odex.selection__kpi_item__measurement_method__integration
+msgid "integration"
+msgstr "تكامل"
+
+#. module: kpi_scorecard_odex
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard_odex.kpi_item_view_form
+msgid "kpiFormula"
+msgstr "المعادلة"
+
+#. module: kpi_scorecard
+#: model_terms:ir.ui.view,arch_db:kpi_scorecard.kpi_period_view_form
+msgid "to"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,help:kpi_scorecard.field_kpi_item__result_suffix
+msgid "would be shown after the result value"
+msgstr ""
+
+#. module: kpi_scorecard
+#: model:ir.model.fields,help:kpi_scorecard.field_kpi_item__result_preffix
+msgid "would be shown before the result value"
+msgstr ""
diff --git a/odex25_project/kpi_scorecard_odex/models/__init__.py b/odex25_project/kpi_scorecard_odex/models/__init__.py
new file mode 100644
index 000000000..be398e78e
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/models/__init__.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+
+from . import kpi_category
+from . import kpi_item
+from . import kpi_scorecard_line
+from . import kpi_period
+from . import partner_target
+
+
+
+
+
diff --git a/odex25_project/kpi_scorecard_odex/models/kpi_category.py b/odex25_project/kpi_scorecard_odex/models/kpi_category.py
new file mode 100644
index 000000000..050b3c913
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/models/kpi_category.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    (Odex - Extending the base module).
+#    Copyright (C) 2024 Expert Co. Ltd. (<http://exp-sa.com>).
+#
+##############################################################################
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class kpi_category(models.Model):
+
+    _inherit = "kpi.category"
+
+    code = fields.Char(string="Code")
+    weight = fields.Float(string="Weight")
+    type = fields.Selection([
+        ("pillar", "Pillar"), 
+        ("st_goal", "Strategic Goal"),
+        ("op_goal", "Operational Goal"),
+        ("other", "Other")],string="Type", default="op_goal")
+
+    def name_get(self):
+        return super(models.Model, self).name_get()
+        
+        
+    def write(self, data):
+        res = super(kpi_category, self).write(data)
+        if data.get('weight'):
+            self.env["kpi.item"].compute_automated_weight(self)
+        return res
+
+
diff --git a/odex25_project/kpi_scorecard_odex/models/kpi_item.py b/odex25_project/kpi_scorecard_odex/models/kpi_item.py
new file mode 100644
index 000000000..09cb11863
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/models/kpi_item.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    (Odex - Extending the base module).
+#    Copyright (C) 2024 Expert Co. Ltd. (<http://exp-sa.com>).
+#
+##############################################################################
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class kpi_item(models.Model):
+
+    _inherit = "kpi.item"
+
+    code = fields.Char(string="KPI Code", required=True)
+    weight = fields.Float(string="Weight")
+    automated_weight = fields.Boolean(string="Automated Weight", default=True)
+    kpi_domain = fields.Selection([
+        ("university", "University Strategy"), 
+        ("research", "Scientific Research"),
+        ("institute", "Institutional Accreditation"),
+        ("program", "Program Accreditation")], string="KPI Domain", required=True, default="university")     
+    program_id = fields.Many2one("kpi.category", string="Program")
+    kpi_type = fields.Selection([
+        ("efficiency", "Efficiency"), 
+        ("effectiveness", "Effectiveness"),
+        ("productivity", "Productivity"),
+        ("financial", "Financial"),
+        ("quality", "Quality"),
+        ("security", "Security")], string="KPI Type", required=True, default="efficiency")  
+    kpi_type_region = fields.Selection([
+        ("inputs", "Inputs"), 
+        ("processes", "Processes"),
+        ("outputs", "Outputs"),], string="KPI Type By Region", required=True, default="inputs") 
+    data_source = fields.Selection([
+        ("achievement", "Achievement"), 
+        ("direct_data", "Direct Data"),
+        ("poll", "Opinion Polls"),], string="Data source", required=True, default="achievement") 
+    measurement_method = fields.Selection([
+        ("data_entry", "Data entry"), 
+        ("integration", "integration"),], string="Measurement Method", required=True, default="data_entry") 
+    measurement_periodic= fields.Selection([
+        ("periodical", "Periodical"), 
+        ("annually", "Annually"),], string="Measurement Periodicity", required=True, default="annually") 
+    kpi_owner_id = fields.Many2one("res.partner", string="KPI Owner")
+    internal_bench_ids = fields.Many2many("res.partner",  
+        "res_partner_kpi_item_rel_internal", 
+        "res_partner_id", "kpi_item_id", string="Internal Benchmarking")
+    external_bench_ids = fields.Many2many("res.partner",  
+        "res_partner_kpi_item_rel_external", 
+        "res_partner_id", "kpi_item_id",  string="External Benchmarking")
+        
+    kpi_period = fields.Selection([
+            ("1", "1"),
+            ("2", "2"),
+            ("3", "3"),
+            ("4", "4"),("5", "5") ], string="KPI Period", default="5")
+        
+    line_ids = fields.One2many("kpi.scorecard.line", "kpi_id", string="KPI Targets", copy=True)
+    
+    
+    def compute_automated_weight(self, category_ids):
+        for category in category_ids:
+            goal_kpis = self.env["kpi.item"].sudo().search([ ("category_id", "=", category.id),("automated_weight", "=", True)])
+            goal_kpis_edit = self.env["kpi.item"].sudo().search([ ("category_id", "=", category.id),("automated_weight", "=", False)])
+            goal_weight = category.weight - sum(goal_kpis_edit.mapped('weight')) 
+            if len(goal_kpis) > 0:
+                weight = round(goal_weight / len(goal_kpis) , 2)
+                goal_kpis.write({"weight": weight})
+                
+    @api.model
+    def create(self, data):
+        res = super(kpi_item, self).create(data)
+        category_ids =[]
+        for kpi in res:
+            category_ids.append(kpi.category_id)
+        self.compute_automated_weight(category_ids)
+        return res
+            
+    def write(self, data):
+        category_ids =[]
+        for kpi in self:
+           if data.get('category_id'):
+               category_ids.append(kpi.category_id)
+        res = super(kpi_item, self).write(data)
+        if data.keys() & {'automated_weight', 'active', 'category_id'}:
+            for kpi in self:
+                category_ids.append(kpi.category_id)
+        if data.get('weight') and not data.get('automated_weight'):
+            for kpi in self:
+                if not kpi.automated_weight:
+                    category_ids.append(kpi.category_id) 
+        self.compute_automated_weight(category_ids)
+        return res
+
+    def unlink(self):
+        category_ids =[]
+        for kpi in self:
+           category_ids.append(kpi.category_id)
+        res = super(kpi_item, self).unlink()
+        self.compute_automated_weight(category_ids)
+        return res
+                   
+    @api.onchange('category_id')
+    def onchange_category_id(self):
+        '''
+        This function generates the kpi code automatically with the possibility to modify it
+        '''
+        if self.category_id and self.category_id.code:
+            parent_code = self.category_id.code
+            count = len (self.search([("category_id", "=", self.category_id.id)])) or 1 
+            serial = int(count)
+            added = 0
+            code = ''
+            while True:
+                serial += added
+                code_length = len(str(parent_code)) + len(str(serial))
+                code = parent_code +str(serial)
+                if not self.search([('code','=',code)]):
+                    break
+                added += 1
+            self.code = code  
+                
+                
+                
+                
diff --git a/odex25_project/kpi_scorecard_odex/models/kpi_period.py b/odex25_project/kpi_scorecard_odex/models/kpi_period.py
new file mode 100644
index 000000000..056d05763
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/models/kpi_period.py
@@ -0,0 +1,111 @@
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError, UserError
+import base64
+import logging
+import tempfile
+
+_logger = logging.getLogger(__name__)
+
+try:
+    import xlsxwriter
+except ImportError:
+    _logger.warning("Cannot import xlsxwriter")
+    xlsxwriter = False
+
+
+class kpi_period(models.Model):
+    _inherit = "kpi.period"
+
+    def name_get(self):
+        return super(models.Model, self).name_get()
+
+    def action_export_scorecard(self):
+        """
+        The method to prepare the xls table
+
+        Methods:
+         * _get_xls_table of kpi.scorecard.line
+
+        Returns:
+         * action of downloading the xlsx table
+
+        Extra info:
+         * Expected singleton
+        """
+        self.ensure_one()
+        if not xlsxwriter:
+            raise UserError(_("The Python library xlsxwriter is installed. Contact your system administrator"))
+        file_name = u"{}.xlsx".format(self.name_get()[0][1])
+        file_path = tempfile.mktemp(suffix='.xlsx')
+        workbook = xlsxwriter.Workbook(file_path)
+        main_header_style = workbook.add_format({
+            'bold': True,
+            'font_size': 11,
+            'border': 1,
+            'align': 'center',
+            'valign': 'vcenter',
+            'bg_color': 'silver',
+            'border_color': 'gray',
+        })
+        main_cell_style_dict = {
+            'font_size': 11,
+            'border': 1,
+            'border_color': 'gray',
+        }
+        worksheet = workbook.add_worksheet(file_name)
+        column_keys = [
+            {"key": "A", "label": _("KPI Code"), "width": 14},
+            {"key": "B", "label": _("KPI"), "width": 60},
+            {"key": "C", "label": _("Target"), "width": 14},
+            {"key": "D", "label": _("Success"), "width": 14},
+            {"key": "E", "label": _("Actual"), "width": 14},
+            {"key": "F", "label": _("Progress"), "width": 14},
+            {"key": "G", "label": _("Weight"), "width": 14},
+            {"key": "H", "label": _("Weight progress"), "width": 14},
+            {"key": "I", "label": _("Notes"), "width": 80},
+        ]
+        total_row_number = len(self.line_ids)
+        cell_values = self.line_ids._get_xls_table()
+        for ccolumn in column_keys:
+            ckey = ccolumn.get("key")
+            # set columns
+            worksheet.set_column('{c}:{c}'.format(c=ckey), ccolumn.get("width"))
+            # set header row
+            worksheet.write("{}1".format(ckey), ccolumn.get("label"), main_header_style)
+            # set column values
+            for row_number in range(2, total_row_number + 2):
+                cell_number = "{}{}".format(ckey, row_number)
+                cell_value_dict = cell_values.get(cell_number)
+                cell_value = ""
+                cell_level = 0
+                cell_style = main_cell_style_dict.copy()
+                if cell_value_dict:
+                    cell_value = cell_value_dict.get("value")
+                    cell_style.update(cell_value_dict.get("style"))
+                    cell_level = cell_value_dict.get("level") or 0
+                cell_style = workbook.add_format(cell_style)
+                if ckey == "A":
+                    cell_style.set_indent(cell_level)
+                worksheet.write(
+                    cell_number,
+                    cell_value,
+                    cell_style,
+                )
+        worksheet.set_row(0, 24)
+        workbook.close()
+        with open(file_path, 'rb') as r:
+            xls_file = base64.b64encode(r.read())
+        att_vals = {
+            'name': file_name,
+            'type': 'binary',
+            'datas': xls_file,
+        }
+        attachment_id = self.env['ir.attachment'].create(att_vals)
+        self.env.cr.commit()
+        action = {
+            'type': 'ir.actions.act_url',
+            'url': '/web/content/{}?download=true'.format(attachment_id.id, ),
+            'target': 'self',
+        }
+        return action
+
diff --git a/odex25_project/kpi_scorecard_odex/models/kpi_scorecard_line.py b/odex25_project/kpi_scorecard_odex/models/kpi_scorecard_line.py
new file mode 100644
index 000000000..0b527965a
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/models/kpi_scorecard_line.py
@@ -0,0 +1,216 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    (Odex - Extending the base module).
+#    Copyright (C) 2024 Expert Co. Ltd. (<http://exp-sa.com>).
+#
+##############################################################################
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError, UserError
+import base64
+import logging
+import tempfile
+
+_logger = logging.getLogger(__name__)
+
+try:
+    import xlsxwriter
+except ImportError:
+    _logger.warning("Cannot import xlsxwriter")
+    xlsxwriter = False
+
+
+class kpi_scorecard_line(models.Model):
+    _inherit = "kpi.scorecard.line"
+
+    @api.depends("target_value", "actual_value", "computation_error", "kpi_id", "kpi_id.result_appearance",
+                 "kpi_id.result_preffix", "kpi_id.result_suffix", "kpi_id.result_type")
+    def _compute_formatted_actual_value(self):
+        """
+        Compute method for formatted_actual_value, result, formatted_target_value
+
+        Methods:
+         * _return_formated_appearance of kpi.item
+        """
+        for line in self:
+            kpi_id = line.kpi_id
+            company_currency = line.period_id.company_id.currency_id
+            if line.computation_error:
+                line.formatted_actual_value = _("N/A")
+                line.result = "error"
+                line.formatted_target_value = kpi_id._return_formated_appearance(
+                    line.target_value, novalue_change=True, currency=company_currency,
+                )
+                line.formatted_planed_value = kpi_id._return_formated_appearance(
+                    line.planed_value, novalue_change=True, currency=company_currency,
+                )
+            else:
+                actual_value = line.actual_value
+                line.formatted_actual_value = kpi_id._return_formated_appearance(
+                    line.actual_value, novalue_change=False, currency=company_currency,
+                )
+                line.formatted_planed_value = kpi_id._return_formated_appearance(
+                    line.planed_value, novalue_change=True, currency=company_currency,
+                )
+                line.formatted_target_value = kpi_id._return_formated_appearance(
+                    line.target_value, novalue_change=True, currency=company_currency,
+                )
+                result_type = kpi_id.result_type
+                actual_value = line.kpi_id.result_appearance == "percentage" and (actual_value * 100) or actual_value
+                bigger_result = actual_value >= line.target_value
+                if result_type == "more":
+                    line.result = bigger_result and "success" or "failure"
+                elif result_type == "less":
+                    line.result = bigger_result and "failure" or "success"
+
+    weight = fields.Float(string="Weight", related="kpi_id.weight", store=True)
+    code = fields.Char(string="KPI Code", related="kpi_id.code", store=True)
+    progress = fields.Float("Progress", compute='_compute_progress_kpi', store=True, group_operator="avg")
+    weight_progress = fields.Float("Weight Progress", compute='_compute_progress_kpi', store=True, )
+    target_value = fields.Float(string="Success Value")
+    planed_value = fields.Float(string="Target Value")
+    formatted_planed_value = fields.Char(
+        string="Target",
+        compute=_compute_formatted_actual_value,
+        compute_sudo=True,
+        store=True,
+    )
+
+    pillar_categ_id = fields.Many2one(comodel_name='kpi.category', compute='_compute_parent_category', store=True, )
+    strategic_category_id = fields.Many2one(comodel_name='kpi.category', compute='_compute_parent_category',
+                                            store=True, )
+    plan_progress = fields.Float(string="Planned Progress", compute='_compute_progress_kpi', store=True,
+                                 )
+
+    def get_strategic_category(self, category_id):
+        """
+             Get the last parent category with type 'st_goal' in the chain of categories.
+
+             :param category_id: The initial category for which to find the last 'pillar' parent.
+             :return: The last Strategic Goal parent category or None if not found.
+             """
+        if category_id.type == 'st_goal':
+            return category_id
+
+        while category_id.parent_id:
+            category_id = category_id.parent_id
+            if category_id.type == 'st_goal':
+                return category_id
+        return None
+
+    def get_pillar_category(self, category_id):
+        """
+             Get the last parent category with type 'pillar' in the chain of categories.
+
+             :param category_id: The initial category for which to find the last 'pillar' parent.
+             :return: The last 'pillar' parent category or None if not found.
+             """
+        if category_id.type == 'pillar':
+            return category_id
+
+        while category_id.parent_id:
+            category_id = category_id.parent_id
+            if category_id.type == 'pillar':
+                return category_id
+        return None
+
+    def action_compare_with_partners_targets(self):
+        return self.env['ir.actions.act_window']._for_xml_id('kpi_scorecard_odex.scorecard_line_tree_action')
+
+    @api.depends('kpi_id', 'kpi_id.category_id')
+    def _compute_parent_category(self):
+        for line in self:
+            last_pillar_categ = line.get_pillar_category(line.category_id)
+            last_strategic_categ = line.get_strategic_category(line.category_id)
+            line.pillar_categ_id = last_pillar_categ.id if last_strategic_categ else False
+            line.strategic_category_id = last_strategic_categ.id if last_strategic_categ else False
+
+    @api.depends('target_value', 'actual_value', 'weight')
+    def _compute_progress_kpi(self):
+        for kpi in self:
+            if (kpi.target_value > 0.0):
+                if kpi.actual_value > kpi.target_value:
+                    kpi.progress = 100
+                else:
+                    kpi.progress = round(100.0 * kpi.actual_value / kpi.target_value, 2)
+            else:
+                kpi.progress = 0.0
+
+            kpi.weight_progress = round((kpi.progress * kpi.weight) / 100.0, 2)
+            kpi.plan_progress = kpi.progress * kpi.weight
+
+    def _get_xls_table(self):
+        """
+        The method to prepare dict of values for xls row
+
+        Args:
+         * spaces - str - to add at the beginning of the name
+
+        Methods:
+         * _return_xls_formatting - of kpi.item
+    
+        Returns:
+         * dict
+        """
+        result = {}
+        row = 2
+        previous_kpis = {}
+        for line in self:
+            parent_id = line.kpi_id.parent_id.id
+            level = previous_kpis.get(parent_id) is not None and previous_kpis.get(parent_id) + 1 or 0
+            previous_kpis.update({line.kpi_id.id: level})
+            description = line.description or ""
+            target_value = line.target_value
+            planed_value = line.planed_value
+            actual_value = line.actual_value
+            overall_style = {
+                "color": line.result == "success" and "black" or line.result == "failure" and "red" or "orange"
+            }
+            if line.computation_error:
+                target_value = 0
+                planed_value = 0
+                actual_value = 0
+                description = "{} {}".format(line.computation_error, description)
+                overall_style.update({"color": "orange"})
+            planed_value = line.kpi_id._return_xls_formatting(line.planed_value, False)
+            target_value = line.kpi_id._return_xls_formatting(line.target_value, False)
+            actual_value = line.kpi_id._return_xls_formatting(line.actual_value, True)
+            num_style = overall_style.copy()
+            num_style.update({
+                "align": "center",
+            })
+            num_style1 = num_style.copy()
+
+            if line.kpi_id.result_appearance == "percentage":
+                num_style.update({"num_format": 10}),
+            overall_style.update({
+                "valign": "vjustify",
+            })
+
+            result.update({
+                "A{}".format(row): {"value": line.kpi_id.code, "style": overall_style, "level": level},
+                "B{}".format(row): {"value": line.kpi_id.name, "style": overall_style, "level": level},
+                "C{}".format(row): {"value": planed_value, "style": num_style},
+                "D{}".format(row): {"value": target_value, "style": num_style},
+                "E{}".format(row): {"value": actual_value, "style": num_style},
+                "F{}".format(row): {"value": line.progress, "style": num_style1},
+                "G{}".format(row): {"value": line.kpi_id.weight, "style": num_style1},
+                "H{}".format(row): {"value": line.weight_progress, "style": num_style1},
+                "I{}".format(row): {"value": description, "style": overall_style},
+            })
+            row += 1
+        return result
+
+    def action_assign_target_values(self):
+        self.ensure_one()
+        partner_target_ids = self.env['partner.target'].search([('kbi_line_id', '=', self.id)])
+        action = {
+            'name': _('Targets'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'partner.target',
+            'view_mode': 'tree',
+            'context': {'default_kbi_line_id': self.id},
+            'target': 'current',
+            'domain': [('id', 'in', partner_target_ids.ids)],
+        }
+        return action
diff --git a/odex25_project/kpi_scorecard_odex/models/partner_target.py b/odex25_project/kpi_scorecard_odex/models/partner_target.py
new file mode 100644
index 000000000..76128fc2a
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/models/partner_target.py
@@ -0,0 +1,11 @@
+from odoo import fields, models, api
+
+
+class PartnerTarget(models.Model):
+    _name = 'partner.target'
+    kbi_line_id = fields.Many2one(comodel_name='kpi.scorecard.line')
+    partner_id = fields.Many2one(comodel_name='res.partner')
+    planned_value = fields.Float()
+    target_value=fields.Float(related='kbi_line_id.target_value')
+    actual_value=fields.Float(related='kbi_line_id.actual_value')
+
diff --git a/odex25_project/kpi_scorecard_odex/reports/__init__.py b/odex25_project/kpi_scorecard_odex/reports/__init__.py
new file mode 100644
index 000000000..7c68785e9
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/reports/__init__.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-
\ No newline at end of file
diff --git a/odex25_project/kpi_scorecard_odex/security/ir.model.access.csv b/odex25_project/kpi_scorecard_odex/security/ir.model.access.csv
new file mode 100644
index 000000000..402c9b60c
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_partner_target,access.partner.target,model_partner_target,,1,1,1,1
diff --git a/odex25_project/kpi_scorecard_odex/views/kpi_category.xml b/odex25_project/kpi_scorecard_odex/views/kpi_category.xml
new file mode 100644
index 000000000..d40e1cd8c
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/views/kpi_category.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<odoo>
+
+    
+    <record id="kpi_category_view_form" model="ir.ui.view">
+        <field name="name">kpi.category.form.inherit</field>
+        <field name="model">kpi.category</field>
+        <field name="inherit_id" ref="kpi_scorecard.kpi_category_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='parent_id']" position="before">
+                <field name="code" />
+                <field name="type" />
+                <field name="weight" />
+            </xpath>
+        </field>
+    </record>
+    
+    <record id="kpi_category_view_tree" model="ir.ui.view">
+        <field name="name">kpi.category.tree.inherit</field>
+        <field name="model">kpi.category</field>
+        <field name="inherit_id" ref="kpi_scorecard.kpi_category_view_tree"/>
+        <field name="arch" type="xml">
+		    <xpath expr="//tree" position="replace">
+		            <tree  decoration-bf="type in ('pillar','st_goal')"  decoration-warning="type=='pillar'"  decoration-info="type=='op_goal'">
+		            <field name="sequence" widget="handle"/>
+		            <field name="type"/>
+		            <field name="code"/>
+		            <field name="name"/>
+		            <field name="parent_id"/>
+		            <field name="weight"  />
+		            <field name="active" invisible="1"/>
+		            <field name="child_ids" invisible="1"/>
+		        </tree>
+		     </xpath>
+        </field>
+    </record>
+   
+</odoo>
diff --git a/odex25_project/kpi_scorecard_odex/views/kpi_item.xml b/odex25_project/kpi_scorecard_odex/views/kpi_item.xml
new file mode 100644
index 000000000..d9bc473f5
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/views/kpi_item.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<odoo>
+
+
+    <record id="kpi_item_view_form" model="ir.ui.view">
+        <field name="name">kpi.item.form.inherit</field>
+        <field name="model">kpi.item</field>
+        <field name="inherit_id" ref="kpi_scorecard.kpi_item_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form" position="replace">
+
+                <form>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name" placeholder="KPI"/>
+                            </h1>
+
+                        </div>
+                        <group>
+                            <group>
+                                <field name="category_id" string="Operational Goal"/>
+                                <field name="kpi_domain"/>
+                                <field name="program_id" attrs="{'invisible': [('kpi_domain', '!=', 'program')]}"/>
+                                <field name="kpi_owner_id"/>
+                                <field name="company_id" options="{'no_create_edit': 1, 'no_quick_create': 1}"
+                                       groups="base.group_multi_company"/>
+                            </group>
+                            <group>
+                                <field name="code"/>
+                                <field name="kpi_type"/>
+                                <field name="kpi_type_region"/>
+                            </group>
+                        </group>
+                        <group>
+                            <field name="description"
+                                   placholder="notes... would be shown as explanation title on scorecard target line"/>
+                        </group>
+                        <group col="4">
+                            <field name="internal_bench_ids" invisible="1"/>
+                            <field name="external_bench_ids" widget="many2many_tags" invisible="1"/>
+                        </group>
+                        <notebook>
+                            <page string="Settings">
+
+                                <group>
+                                    <group>
+                                        <field name="automated_weight"/>
+                                        <field name="weight" attrs="{'readonly': [('automated_weight', '=', True)]}"/>
+                                        <field name="data_source"/>
+                                        <field name="measurement_periodic"/>
+                                        <field name="measurement_method"/>
+                                        <field name="kpi_period"/>
+                                        <field name="sequence"/>
+                                    </group>
+                                    <group>
+                                        <field name="result_type"/>
+                                        <field name="result_appearance"/>
+                                        <field name="result_preffix"
+                                               attrs="{'invisible': [('result_appearance', '=', 'monetory')]}"/>
+                                        <field name="result_suffix"
+                                               attrs="{'invisible': [('result_appearance', '=', 'monetory')]}"/>
+                                        <field name="currency_id"
+                                               attrs="{'invisible': [('result_appearance', '!=', 'monetory')]}"/>
+                                        <field name="result_rounding"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="kpiFormula">
+                                <h2 class="oe_read_only pull-right text-warning"
+                                    attrs="{'invisible': [('formula_warning', '=', False)]}">
+                                    <field name="formula_warning"/>
+                                </h2>
+                                <field name="formula" widget="kpiFormulaWidget"/>
+                            </page>
+                            <page string="KPI Targets">
+                                <field name="line_ids">
+                                    <tree editable="bottom">
+                                        <field name="period_id" domain="[('state','=','open')]"/>
+                                        <field name="planed_value"/>
+                                        <field name="target_value"/>
+                                        <button name="action_assign_target_values" type="object" icon="fa-list"
+                                                width="0.1" role="img" title="Assign Partners Target"/>
+
+                                        <field name="pillar_categ_id" invisible="1"/>
+                                        <field name="strategic_category_id" invisible="1"/>
+
+                                    </tree>
+                                </field>
+                            </page>
+
+                            <page string="Security">
+                                <group string="Read Rights">
+                                    <field name="user_ids" widget="many2many_tags"
+                                           options="{'no_create_edit': 1, 'no_quick_create': 1}"/>
+                                    <field name="user_group_ids" widget="many2many_tags"
+                                           options="{'no_create_edit': 1, 'no_quick_create': 1}"/>
+                                    <field name="access_user_ids" widget="many2many_tags" invisible="1"/>
+                                </group>
+                                <group string="Edit Rights">
+                                    <field name="edit_user_ids" widget="many2many_tags"
+                                           options="{'no_create_edit': 1, 'no_quick_create': 1}"/>
+                                    <field name="edit_user_group_ids" widget="many2many_tags"
+                                           options="{'no_create_edit': 1, 'no_quick_create': 1}"/>
+                                    <field name="edit_access_user_ids" widget="many2many_tags" invisible="1"/>
+                                </group>
+                            </page>
+                            <page string="Technical" invisible="1">
+                                <group>
+                                    <field name="active"/>
+                                    <field name="all_parent_ids" widget="many2many_tags"/>
+                                </group>
+                                <group string="Measurements">
+                                    <field name="measures_ids" widget="many2many_tags"/>
+                                    <field name="constant_ids" widget="many2many_tags"/>
+                                    <field name="kpi_ids" widget="many2many_tags"/>
+                                </group>
+                            </page>
+                            <page string="Help" attrs="{'invisible': [('help_notes', '=', False)]}">
+                                <field name="kpi_help_dummy" invisible="1"/>
+                                <field name="help_notes"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+
+            </xpath>
+        </field>
+    </record>
+
+
+    <record id="kpi_item_view_tree" model="ir.ui.view">
+        <field name="name">kpi.item.tree.inherit</field>
+        <field name="model">kpi.item</field>
+        <field name="inherit_id" ref="kpi_scorecard.kpi_item_view_tree"/>
+        <field name="arch" type="xml">
+
+            <xpath expr="//field[@name='name']" position="before">
+                <field name="code"/>
+            </xpath>
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="category_id" string="Operational Goal"/>
+                <field name="kpi_owner_id" optional="hide"/>
+                <field name="kpi_domain" optional="hide"/>
+                <field name="kpi_type" optional="show"/>
+                <field name="kpi_type_region" optional="hide"/>
+                <field name="data_source" optional="hide"/>
+                <field name="measurement_periodic" optional="hide"/>
+                <field name="measurement_method" optional="show"/>
+                <field name="result_appearance" optional="show"/>
+                <field name="weight" sum="Weight"/>
+            </xpath>
+            <xpath expr="//field[@name='formula_warning']" position="replace">
+                <field name="formula_warning" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="kpi_item_view_search" model="ir.ui.view">
+        <field name="name">kpi.item.search.inherit</field>
+        <field name="model">kpi.item</field>
+        <field name="inherit_id" ref="kpi_scorecard.kpi_item_view_search"/>
+        <field name="arch" type="xml">
+            <search position="inside">
+                <searchpanel>
+                    <field name="category_id" string="Operational Goal" icon="fa-building" enable_counters="1"/>
+                    <field name="kpi_type" icon="fa-building" enable_counters="1"/>
+                    <field name="kpi_type_region" icon="fa-building" enable_counters="1"/>
+                </searchpanel>
+            </search>
+        </field>
+    </record>
+
+    <record id="kpi_item_view_kanban" model="ir.ui.view">
+        <field name="name">kpi.item.kanban</field>
+        <field name="model">kpi.item</field>
+        <field name="arch" type="xml">
+            <kanban class="o_kanban_mobile">
+                <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_content oe_kanban_global_click">
+                            <div class="row">
+                                <div class="col-12">
+                                    <strong>
+                                        <field name="name"/>
+                                    </strong>
+                                </div>
+
+                            </div>
+                            <div class="oe_kanban_bottom_right mt-1">
+                                <field name="code"/>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="kpi_scorecard.kpi_item_action" model="ir.actions.act_window">
+        <field name="view_mode">tree,kanban,form</field>
+    </record>
+
+    <record id="kpi_period_view_form" model="ir.ui.view">
+        <field name="name">kpi.period.form.inherit</field>
+        <field name="model">kpi.period</field>
+        <field name="inherit_id" ref="kpi_scorecard.kpi_period_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='target_value']" position="before">
+                <field name="planed_value"/>
+
+            </xpath>
+        </field>
+    </record>
+    <record id="view_partner_target_tree" model="ir.ui.view">
+    <field name="name">partner.target.tree</field>
+    <field name="model">partner.target</field>
+    <field name="arch" type="xml">
+        <tree editable="bottom" create="1" delete="1">
+            <field name="kbi_line_id" readonly="1" string="Period"/>
+            <field name="partner_id" string="Partner" required="1"/>
+            <field name="planned_value" string="Planned Value"/>
+        </tree>
+    </field>
+</record>
+        <record id="partner_target_view_tree" model="ir.ui.view">
+            <field name="name">partner.target.tree.view</field>
+        <field name="model">partner.target</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" decoration-danger="(actual_value &lt; planned_value)" >
+                    <field name="partner_id"/>
+                    <field name="planned_value" string="Benchmark"/>
+                    <field name="target_value"/>
+                    <field name="actual_value"/>
+
+
+                </tree>
+            </field>
+        </record>
+
+<record id="scorecard_line_tree_action" model="ir.actions.act_window">
+            <field name="name">Partners Targets</field>
+            <field name="res_model">partner.target</field>
+            <field name="view_mode">tree</field>
+            <field name="target">current</field>
+                  <field name="view_ids" eval="[(5, 0, 0),
+        (0, 0, {'view_mode': 'tree', 'view_id': ref('partner_target_view_tree')})]"/>
+
+        </record>
+
+
+
+</odoo>
diff --git a/odex25_project/kpi_scorecard_odex/views/kpi_scorecard_line.xml b/odex25_project/kpi_scorecard_odex/views/kpi_scorecard_line.xml
new file mode 100644
index 000000000..58dda6359
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/views/kpi_scorecard_line.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<odoo>
+
+    
+    <record id="kpi_scorecard_line_view_kanban" model="ir.ui.view">
+        <field name="name">kpi.scorecard.line.kanban.inherit</field>
+        <field name="model">kpi.scorecard.line</field>
+        <field name="inherit_id" ref="kpi_scorecard.kpi_scorecard_line_view_kanban"/>
+        <field name="arch" type="xml">
+            <xpath expr="//kanban" position="replace">
+                
+                
+            <kanban js_class="scorecard_kanban" 
+                    class="kpi-kanban-view"
+                    group_create="0"
+                    group_delete="0"
+                    group_edit="0" 
+                    archivable="0"
+                    quick_create="0"
+                    records_draggable="0"   
+            >
+                <field name="id"/>
+                <field name="kpi_id"/>
+                <field name="formatted_target_value"/>
+                <field name="formatted_actual_value"/>
+                <field name="computation_error"/>
+                <field name="result"/>
+                <field name="weight" />
+                <field name="progress" />
+                <field name="weight_progress" />
+                <field name="all_parents"/>
+                <field name="sequence"/>
+                <field name="description"/>
+                <field name="edit_rights"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="kpi-kanban-record-card row mx-0"
+                             t-att-id="id"
+                        >
+                           <div class="col mx-2">
+                                <b><field name="code" /></b>
+                            </div>
+                            <div t-attf-class="text-#{record.result.raw_value == 'error' and 'muted' or ''}"                                 
+                                 t-attf-data-parent="#{record.all_parents.raw_value}"
+                                 t-attf-data-id="#{record.id.raw_value}"
+                                 t-attf-title="#{record.description.raw_value and record.description.raw_value or ''}"
+                              style="flex: 0 0 35%;">
+                                <field name="kpi_id"/>
+                                <i t-if="record.computation_error.raw_value"
+                                   class="fa fa-warning text-danger" 
+                                   t-attf-title="#{record.computation_error.raw_value}"  
+                                > </i>
+                            </div>
+                            
+                            <div class="col mx-2">
+                                <b><field name="formatted_planed_value" /></b>
+                                    <div>Target Value</div>
+                            </div>
+                            <div class="col mx-2">
+                                <b><field name="formatted_target_value" /></b>
+                                    <div>Success Value</div>
+                            </div>
+                            <div t-attf-class="col mx-2 text-#{record.result.raw_value == 'success' and 'success' or record.result.raw_value == 'failure' and 'danger' or 'muted'}">
+                                <b><field name="formatted_actual_value" /></b>
+                                    <div>Actual Value</div>
+                            </div>
+                            
+                            <div class="col mx-2">
+                                <b><field name="progress" widget="progressbar"/></b>
+                            </div>
+                            <div class="col mx-2">
+                                <b><field name="weight" /></b>
+                                    <div>Weight</div>
+                            </div>
+                            <div class="col mx-2">
+                                <b><field name="weight_progress" /></b>
+                                    <div>Weight progress</div>
+                            </div>
+                            
+                            <div style="flex: 0 0 5%;">
+                                    <div class="pull-right">
+                                    <button type="button" 
+                                            class="btn btn-primary kpi-edit-target kpi-kanban-row-btn kpi-kanban-button kpi-kanban-conditional"
+                                            kpi-required="period,open"
+                                            t-attf-data-id="#{record.id.raw_value}"
+                                            title="Change Target"
+                                            t-if="record.edit_rights.raw_value"
+                                            name="kpi-edit-target"
+                                    >
+                                        <i class="fa fa-edit"></i>
+                                    </button>    
+                                    <button type="button" 
+                                            class="btn btn-primary kpi-show-history kpi-kanban-row-btn kpi-kanban-button kpi-kanban-conditional"
+                                            kpi-required="period"
+                                            t-attf-data-id="#{record.id.raw_value}"
+                                            title="History"
+                                            name="kpi-show-history"
+                                    >
+                                        <i class="fa fa-signal"></i>
+                                    </button>
+
+                                    <button type="button"
+                                            class="btn btn-primary kpi-remove-target kpi-kanban-row-btn kpi-kanban-button kpi-kanban-conditional"
+                                            kpi-required="period,open"
+                                            t-attf-data-id="#{record.id.raw_value}"
+                                            title="Delete Target"
+                                            t-if="record.edit_rights.raw_value"
+                                            name="kpi-remove-target"
+                                    >
+                                        <i class="fa fa-remove"></i>
+                                    </button>
+                                                   <button name="action_compare_with_partners_targets"  type="object" class="btn btn-warning btn-block" title="Compare"
+                               >
+                                                        <i class="fa fa-bar-chart">Benchmark</i>
+                                                   </button>
+                                </div>       
+                                                           
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+            </xpath>
+        </field>
+    </record>
+    
+    <record id="kpi_scorecard_line_view_pivot" model="ir.ui.view">
+         <field name="name">kpi.scorecard.line.pivot</field>
+            <field name="model">kpi.scorecard.line</field>
+            <field name="arch" type="xml">
+                <pivot string="Kbi" sample="1">
+                                        <field name="planed_value" type="measure"/>
+
+                    <field name="target_value" type="measure"/>
+                    <field name="actual_value" type="measure"/>
+                    <field name="kpi_id" type="row"/>
+                    <field name="period_id" type="col"/>
+                </pivot>
+            </field>
+        </record>
+
+       <record id="kpi_scorecard.kpi_scorecard_line_action" model="ir.actions.act_window">
+        <field name="view_mode">kanban,pivot</field>
+    </record>
+</odoo>
diff --git a/odex25_project/kpi_scorecard_odex/views/menu_security_cus.xml b/odex25_project/kpi_scorecard_odex/views/menu_security_cus.xml
new file mode 100644
index 000000000..c6c781d94
--- /dev/null
+++ b/odex25_project/kpi_scorecard_odex/views/menu_security_cus.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Customize menus security -->
+<odoo>
+    <record model="ir.ui.menu" id="kpi_scorecard.menu_kpi_main">
+        <field name="groups_id" eval="[(6,0,[ref('kpi_scorecard.group_kpi_user')])]"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/odex25_helpdesk_sale/__init__.py b/odex25_project/odex25_helpdesk_sale/__init__.py
new file mode 100644
index 000000000..cde864bae
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_sale/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
diff --git a/odex25_project/odex25_helpdesk_sale/__manifest__.py b/odex25_project/odex25_helpdesk_sale/__manifest__.py
new file mode 100644
index 000000000..bb2c4ba7b
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_sale/__manifest__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Helpdesk After Sales',
+    'category': 'Odex25-Project/Odex25-Project',
+    'summary': 'Project, Tasks, After Sales',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'depends': ['odex25_helpdesk', 'sale_management'],
+    'auto_install': True,
+    'description': """
+Manage the after sale of the products from helpdesk tickets.
+    """,
+    'data': [
+        'views/odex25_helpdesk_views.xml',
+    ],
+    'demo': ['data/odex25_helpdesk_sale_demo.xml'],
+}
diff --git a/odex25_project/odex25_helpdesk_sale/data/odex25_helpdesk_sale_demo.xml b/odex25_project/odex25_helpdesk_sale/data/odex25_helpdesk_sale_demo.xml
new file mode 100644
index 000000000..4f496f622
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_sale/data/odex25_helpdesk_sale_demo.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="sale_order_odex25_helpdesk_1" model="sale.order">
+        <field name="partner_id" ref="base.res_partner_2"/>
+        <field name="partner_invoice_id" ref="base.res_partner_2"/>
+        <field name="partner_shipping_id" ref="base.res_partner_2"/>
+    </record>
+    <record id="sale_order_line_odex25_helpdesk_1" model="sale.order.line">
+        <field name="name" model="sale.order.line" eval="obj().env.ref('product.product_product_27').get_product_multiline_description_sale()"/>
+        <field name="product_id" ref="product.product_product_27"/>
+        <field name="product_uom_qty">1</field>
+        <field name="price_unit">3645.00</field>
+        <field name="order_id" ref="sale_order_odex25_helpdesk_1"/>
+    </record>
+
+    <record id="sale_order_odex25_helpdesk_2" model="sale.order">
+        <field name="partner_id" ref="base.res_partner_10"/>
+        <field name="partner_invoice_id" ref="base.res_partner_10"/>
+        <field name="partner_shipping_id" ref="base.res_partner_10"/>
+    </record>
+    <record id="sale_order_line_odex25_helpdesk_2" model="sale.order.line">
+        <field name="name" model="sale.order.line" eval="obj().env.ref('product.product_product_10').get_product_multiline_description_sale()"/>
+        <field name="product_id" ref="product.product_product_10"/>
+        <field name="product_uom_qty">1</field>
+        <field name="price_unit">14.00</field>
+        <field name="order_id" ref="sale_order_odex25_helpdesk_2"/>
+    </record>
+
+    <record id="sale_order_odex25_helpdesk_3" model="sale.order">
+        <field name="partner_id" ref="base.res_partner_2"/>
+        <field name="partner_invoice_id" ref="base.res_partner_2"/>
+        <field name="partner_shipping_id" ref="base.res_partner_2"/>
+    </record>
+    <record id="sale_order_line_odex25_helpdesk_3" model="sale.order.line">
+        <field name="name" model="sale.order.line" eval="obj().env.ref('product.product_product_12').get_product_multiline_description_sale()"/>
+        <field name="product_id" ref="product.product_product_12"/>
+        <field name="product_uom_qty">1</field>
+        <field name="price_unit">12.50</field>
+        <field name="order_id" ref="sale_order_odex25_helpdesk_3"/>
+    </record>
+
+    <record id="odex25_helpdesk.odex25_helpdesk_ticket_13" model="odex25_helpdesk.ticket">
+        <field name="sale_order_id" ref="sale_order_odex25_helpdesk_2"/>
+    </record>
+    <record id="odex25_helpdesk.odex25_helpdesk_ticket_16" model="odex25_helpdesk.ticket">
+        <field name="sale_order_id" ref="sale_order_odex25_helpdesk_1"/>
+    </record>
+    <record id="odex25_helpdesk.odex25_helpdesk_ticket_10" model="odex25_helpdesk.ticket">
+        <field name="sale_order_id" ref="sale_order_odex25_helpdesk_3"/>
+    </record>
+
+</odoo>
diff --git a/odex25_project/odex25_helpdesk_sale/i18n/ar.po b/odex25_project/odex25_helpdesk_sale/i18n/ar.po
new file mode 100644
index 000000000..b93406335
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_sale/i18n/ar.po
@@ -0,0 +1,59 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex25_helpdesk_sale
+# 
+# Translators:
+# Mustafa Rawi <mustafa@cubexco.com>, 2020
+# Osama Ahmaro <osamaahmaro@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~13.5+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-01 07:39+0000\n"
+"PO-Revision-Date: 2020-09-07 08:20+0000\n"
+"Last-Translator: Osama Ahmaro <osamaahmaro@gmail.com>, 2020\n"
+"Language-Team: Arabic (https://www.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex25_helpdesk_sale
+#: model:ir.model.fields,field_description:odex25_helpdesk_sale.field_odex25_helpdesk_ticket__commercial_partner_id
+msgid "Commercial Entity"
+msgstr "الكيان التجاري"
+
+#. module: odex25_helpdesk_sale
+#: model:ir.model.fields,field_description:odex25_helpdesk_sale.field_odex25_helpdesk_ticket__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: odex25_helpdesk_sale
+#: model:ir.model,name:odex25_helpdesk_sale.model_odex25_helpdesk_ticket
+msgid "Helpdesk Ticket"
+msgstr "تذكرة مكتب المساعدة"
+
+#. module: odex25_helpdesk_sale
+#: model:ir.model.fields,field_description:odex25_helpdesk_sale.field_odex25_helpdesk_ticket__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex25_helpdesk_sale
+#: model:ir.model.fields,field_description:odex25_helpdesk_sale.field_odex25_helpdesk_ticket____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: odex25_helpdesk_sale
+#: model:ir.model.fields,field_description:odex25_helpdesk_sale.field_odex25_helpdesk_ticket__sale_order_id
+msgid "Ref. Sales Order"
+msgstr ""
+
+#. module: odex25_helpdesk_sale
+#: model:ir.model.fields,help:odex25_helpdesk_sale.field_odex25_helpdesk_ticket__sale_order_id
+msgid ""
+"Reference of the Sales Order to which this ticket refers. Setting this "
+"information aims at easing your After Sales process and only serves "
+"indicative purposes."
+msgstr ""
diff --git a/odex25_project/odex25_helpdesk_sale/models/__init__.py b/odex25_project/odex25_helpdesk_sale/models/__init__.py
new file mode 100644
index 000000000..27eb465e7
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_sale/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import odex25_helpdesk
diff --git a/odex25_project/odex25_helpdesk_sale/models/odex25_helpdesk.py b/odex25_project/odex25_helpdesk_sale/models/odex25_helpdesk.py
new file mode 100644
index 000000000..66e965b0b
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_sale/models/odex25_helpdesk.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models
+
+
+class odex25_helpdeskTicket(models.Model):
+    _inherit = 'odex25_helpdesk.ticket'
+
+    commercial_partner_id = fields.Many2one(related='partner_id.commercial_partner_id')
+    sale_order_id = fields.Many2one('sale.order', string='Ref. Sales Order',
+        domain="""[
+            '|', (not commercial_partner_id, '=', 1), ('partner_id', 'child_of', commercial_partner_id or []),
+            ('company_id', '=', company_id)]""",
+        groups="sales_team.group_sale_salesman,account.group_account_invoice",
+        help="Reference of the Sales Order to which this ticket refers. Setting this information aims at easing your After Sales process and only serves indicative purposes.")
+
+    def copy(self, default=None):
+        if not self.env.user.has_group('sales_team.group_sale_salesman') and not self.env.user.has_group('account.group_account_invoice'):
+            if default is None:
+                default = {'sale_order_id': False}
+            else:
+                default.update({'sale_order_id': False})
+        return super(odex25_helpdeskTicket, self).copy(default=default)
diff --git a/odex25_project/odex25_helpdesk_sale/static/description/icon.png b/odex25_project/odex25_helpdesk_sale/static/description/icon.png
new file mode 100644
index 000000000..4141f52da
Binary files /dev/null and b/odex25_project/odex25_helpdesk_sale/static/description/icon.png differ
diff --git a/odex25_project/odex25_helpdesk_sale/views/odex25_helpdesk_views.xml b/odex25_project/odex25_helpdesk_sale/views/odex25_helpdesk_views.xml
new file mode 100644
index 000000000..492237564
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_sale/views/odex25_helpdesk_views.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_invoicing" model="ir.ui.view">
+        <field name='name'>odex25_helpdesk.ticket.form.inherit.invoicing</field>
+        <field name="model">odex25_helpdesk.ticket</field>
+        <field name="inherit_id" ref="odex25_helpdesk.odex25_helpdesk_ticket_view_form"/>
+        <field name="arch" type="xml">
+            <field name='email_cc' position="after">
+                <field name="commercial_partner_id" invisible="1"/>
+                <field name="sale_order_id" options='{"no_open": True}' readonly="1" invisible="1"/>
+            </field>
+            <xpath expr="//field[@name='partner_id']" position="attributes">
+                <attribute name="options">{'always_reload': True}</attribute>
+                <attribute name="context">{'res_partner_search_mode': 'customer'}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="quick_create_ticket_form" model="ir.ui.view">
+        <field name='name'>odex25_helpdesk.ticket.form.quick_create</field>
+        <field name="model">odex25_helpdesk.ticket</field>
+        <field name="inherit_id" ref="odex25_helpdesk.quick_create_ticket_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="attributes">
+                <attribute name="options">{'always_reload': True}</attribute>
+                <attribute name="context">{'res_partner_search_mode': 'customer'}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="odex25_helpdesk_ticket_view_form_inherit_sale_user" model="ir.ui.view">
+        <field name='name'>odex25_helpdesk.ticket.form.inherit.invoicing</field>
+        <field name="model">odex25_helpdesk.ticket</field>
+        <field name="inherit_id" ref="odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_invoicing"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='sale_order_id']" position="attributes">
+                <attribute name="options">{"no_create": True}</attribute>
+                <attribute name="readonly">0</attribute>
+            </xpath>
+        </field>
+        <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+    </record>
+
+</odoo>
diff --git a/odex25_project/odex25_helpdesk_timesheet/__init__.py b/odex25_project/odex25_helpdesk_timesheet/__init__.py
new file mode 100644
index 000000000..55a65860f
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/__init__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import wizard
+
+from odoo import api, SUPERUSER_ID
+
+
+def _odex25_helpdesk_timesheet_post_init(cr, registry):
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    teams = env['odex25_helpdesk.team'].search([('use_odex25_helpdesk_timesheet', '=', True), ('project_id', '=', False), ('use_odex25_helpdesk_sale_timesheet', '=', False)])
+
+    for team in teams:
+        team.project_id = team._create_project(team.name, team.use_odex25_helpdesk_sale_timesheet, {'allow_timesheets': True, 'allow_timesheets': True})
+        env['odex25_helpdesk.ticket'].search([('team_id', '=', team.id), ('project_id', '=', False)]).write({'project_id': team.project_id.id})
diff --git a/odex25_project/odex25_helpdesk_timesheet/__manifest__.py b/odex25_project/odex25_helpdesk_timesheet/__manifest__.py
new file mode 100644
index 000000000..2d599487b
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/__manifest__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Helpdesk Timesheet',
+    'category': 'Odex25-Project/Odex25-Project',
+    'summary': 'Project, Tasks, Timesheet',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'depends': ['hr_timesheet', 'odex25_timesheet_grid', 'odex25_helpdesk'],
+    'description': """
+        - Allow to set project for Helpdesk team
+        - Track timesheet for a task from a ticket
+    """,
+    'data': [
+        'security/ir.model.access.csv',
+        'security/odex25_helpdesk_timesheet_security.xml',
+        'views/odex25_helpdesk_views.xml',
+        'views/project_views.xml',
+        'wizard/odex25_helpdesk_ticket_create_timesheet_views.xml',
+        'data/odex25_helpdesk_timesheet_data.xml',
+    ],
+    'demo': ['data/odex25_helpdesk_timesheet_demo.xml'],
+    'post_init_hook': '_odex25_helpdesk_timesheet_post_init'
+}
diff --git a/odex25_project/odex25_helpdesk_timesheet/data/odex25_helpdesk_timesheet_data.xml b/odex25_project/odex25_helpdesk_timesheet/data/odex25_helpdesk_timesheet_data.xml
new file mode 100644
index 000000000..df6c9dbd6
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/data/odex25_helpdesk_timesheet_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- TODO: remove me in master (function deprecated)
+    	Force project creation for projects allowing timesheet: this will only be for the
+    	first Team activating the 'use_odex25_helpdesk_timesheet' option and installing this module
+	-->
+    <function
+        model="odex25_helpdesk.team"
+        name="_init_data_create_project"
+        eval="[]"/>
+</odoo>
diff --git a/odex25_project/odex25_helpdesk_timesheet/data/odex25_helpdesk_timesheet_demo.xml b/odex25_project/odex25_helpdesk_timesheet/data/odex25_helpdesk_timesheet_demo.xml
new file mode 100644
index 000000000..6bfec5c17
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/data/odex25_helpdesk_timesheet_demo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="odex25_helpdesk.odex25_helpdesk_team3" model="odex25_helpdesk.team">
+        <field name="use_odex25_helpdesk_timesheet" eval="True"/>
+    </record>
+
+    <record id="odex25_helpdesk_timesheet_1" model="account.analytic.line">
+        <field name="name">Fix Drawer Slides</field>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=-1)).strftime('%Y-%m-%d')"/>
+        <field name="employee_id" ref="hr.employee_admin"/>
+        <field name="unit_amount">01.00</field>
+        <field name="odex25_helpdesk_ticket_id" ref="odex25_helpdesk.odex25_helpdesk_ticket_16"/>
+        <field name="account_id" ref="analytic.analytic_internal"/>
+    </record>
+    <record id="odex25_helpdesk_timesheet_2" model="account.analytic.line">
+        <field name="name">Changed Drawer Handle</field>
+        <field name="date" eval="(DateTime.now() + relativedelta(days=+1)).strftime('%Y-%m-%d')"/>
+        <field name="employee_id" ref="hr.employee_admin"/>
+        <field name="unit_amount">0.5</field>
+        <field name="odex25_helpdesk_ticket_id" ref="odex25_helpdesk.odex25_helpdesk_ticket_16"/>
+        <field name="account_id" ref="analytic.analytic_internal"/>
+    </record>
+
+</odoo>
diff --git a/odex25_project/odex25_helpdesk_timesheet/i18n/ar.po b/odex25_project/odex25_helpdesk_timesheet/i18n/ar.po
new file mode 100644
index 000000000..d3814fe02
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/i18n/ar.po
@@ -0,0 +1,404 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex25_helpdesk_timesheet
+# 
+# Translators:
+# Sherif Abd Ekmoniem <sherif.tsupport@gmail.com>, 2020
+# Mustafa Rawi <mustafa@cubexco.com>, 2020
+# Akram Alfusayal <akram_ma@hotmail.com>, 2020
+# amrnegm <amrnegm.01@gmail.com>, 2020
+# Martin Trigaux, 2020
+# Mohammed Ibrahim <m.ibrahim@mussder.com>, 2020
+# Osama Ahmaro <osamaahmaro@gmail.com>, 2020
+# Shaima Safar <shaima.safar@open-inside.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-11-27 13:48+0000\n"
+"PO-Revision-Date: 2020-09-07 08:20+0000\n"
+"Last-Translator: Shaima Safar <shaima.safar@open-inside.com>, 2020\n"
+"Language-Team: Arabic (https://www.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket___related_task_ids
+msgid " Related Task"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_project_project__ticket_count
+msgid "# Tickets"
+msgstr "# التذاكر"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_timer_ticket_view_kanban
+msgid "<i class=\"fa fa-pause text-warning\" title=\"Timer is Paused\"/>"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_timer_ticket_view_kanban
+msgid "<i class=\"fa fa-play text-success\" title=\"Timer is Running\"/>"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: code:addons/odex25_helpdesk_timesheet/models/odex25_helpdesk.py:0
+#, python-format
+msgid ""
+"All timesheet hours will be assigned to the selected task on save. Discard "
+"to avoid the change."
+msgstr ""
+"عند الحفظ، سيتم إسناد ساعات سجل الأنشطة للمهمة المختارة. اختر تجاهل لتفادي "
+"تطبيق التغيير."
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model,name:odex25_helpdesk_timesheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "البند التحليلي"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_create_timesheet_view_form
+msgid "Cancel"
+msgstr "الغاء"
+
+#. module: odex25_helpdesk_timesheet
+#: code:addons/odex25_helpdesk_timesheet/models/odex25_helpdesk.py:0
+#, python-format
+msgid "Closed"
+msgstr "مغلق"
+
+#. module: odex25_helpdesk_timesheet
+#: code:addons/odex25_helpdesk_timesheet/models/odex25_helpdesk.py:0
+#, python-format
+msgid "Confirm Time Spent"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model,name:odex25_helpdesk_timesheet.model_odex25_helpdesk_ticket_create_timesheet
+msgid "Create Timesheet from ticket"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_create_timesheet_view_form
+msgid "Describe your activity..."
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__description
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Description"
+msgstr "الوصف"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Description of the ticket..."
+msgstr "وصف التذكرة..."
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_account_analytic_line__display_name
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_team__display_name
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__display_name
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__display_name
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_project_project__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__display_timer
+msgid "Display Timer"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__display_timer_pause
+msgid "Display Timer Pause"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__display_timer_resume
+msgid "Display Timer Resume"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__display_timer_start_primary
+msgid "Display Timer Start Primary"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__display_timer_start_secondary
+msgid "Display Timer Start Secondary"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__display_timer_stop
+msgid "Display Timer Stop"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__display_timesheet_timer
+msgid "Display Timesheet Time"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_team__display_timesheet_timer
+msgid "Display Timesheet Timer"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_create_timesheet_view_form
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Duration"
+msgstr "المدة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__encode_uom_in_days
+msgid "Encode Uom In Days"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model,name:odex25_helpdesk_timesheet.model_odex25_helpdesk_team
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_project_project__odex25_helpdesk_team
+msgid "Helpdesk Team"
+msgstr "فريق مكتب المساعدة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model,name:odex25_helpdesk_timesheet.model_odex25_helpdesk_ticket
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_account_analytic_line__odex25_helpdesk_ticket_id
+msgid "Helpdesk Ticket"
+msgstr "تذكرة مكتب المساعدة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_account_analytic_line__id
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_team__id
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__id
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__id
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_project_project__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex25_helpdesk_timesheet
+#: code:addons/odex25_helpdesk_timesheet/models/odex25_helpdesk.py:0
+#, python-format
+msgid "In Progress"
+msgstr "قيد التنفيذ"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__is_closed
+msgid "Is Closed"
+msgstr "مقفل"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__is_task_active
+msgid "Is Task Active"
+msgstr "هل المهمة نشطة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__is_timer_running
+msgid "Is Timer Running"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_account_analytic_line____last_update
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_team____last_update
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket____last_update
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet____last_update
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_project_project____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Pause"
+msgstr "إيقاف"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model,name:odex25_helpdesk_timesheet.model_project_project
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_team__project_id
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__project_id
+msgid "Project"
+msgstr "المشروع"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.actions.act_window,name:odex25_helpdesk_timesheet.project_project_action_view_odex25_helpdesk_tickets
+msgid "Project Tickets"
+msgstr "تذاكر المشروع"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,help:odex25_helpdesk_timesheet.field_odex25_helpdesk_team__project_id
+msgid ""
+"Project to which the tickets (and the timesheets) will be linked by default."
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Resume"
+msgstr "استكمال الجلسة"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_create_timesheet_view_form
+msgid "Save"
+msgstr "حفظ"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_create_timesheet_view_form
+msgid "Save time"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Start"
+msgstr "بدء"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Stop"
+msgstr "إيقاف"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__task_id
+msgid "Task"
+msgstr "المهمة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,help:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__is_closed
+msgid "Tasks in this stage are considered as closed."
+msgstr "المهام في هذه المرحلة تعتبر مغلقة."
+
+#. module: odex25_helpdesk_timesheet
+#: code:addons/odex25_helpdesk_timesheet/models/odex25_helpdesk.py:0
+#, python-format
+msgid "The project is required to track time on ticket."
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: code:addons/odex25_helpdesk_timesheet/models/odex25_helpdesk.py:0
+#, python-format
+msgid "The task must be in ticket's project."
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,help:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__task_id
+msgid "The task must have the same customer as this ticket."
+msgstr "يجب أن يكون العميل المرتبط بالمهمة هو نفسه العميل صاحب التذكرة."
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.constraint,message:odex25_helpdesk_timesheet.constraint_odex25_helpdesk_ticket_create_timesheet_time_positive
+msgid "The timesheet's time must be positive"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,help:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__use_odex25_helpdesk_timesheet
+msgid "This required to have project module installed."
+msgstr "يتطلب هذا تثبيت موديول المشروع."
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__ticket_id
+msgid "Ticket"
+msgstr "التذكرة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,help:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__ticket_id
+msgid "Ticket for which we are creating a sales order"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_project_project__ticket_ids
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.project_project_view_form_inherit_odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.project_project_view_project_tickets_kanban_inherited
+msgid "Tickets"
+msgstr "تذاكر"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket_create_timesheet__time_spent
+msgid "Time"
+msgstr "الوقت"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__timer_pause
+msgid "Timer Last Pause"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__timer_start
+msgid "Timer Start"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Timesheet Activities"
+msgstr "أنشطة سجل النشاط"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_team__timesheet_timer
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__timesheet_timer
+msgid "Timesheet Timer"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__use_odex25_helpdesk_timesheet
+msgid "Timesheet activated on Team"
+msgstr "سجل النشاط المُفعل للفريق"
+
+#. module: odex25_helpdesk_timesheet
+#: code:addons/odex25_helpdesk_timesheet/models/odex25_helpdesk.py:0
+#, python-format
+msgid ""
+"Timesheet hours will not be assigned to a customer task. Set a task to "
+"charge a customer."
+msgstr "لن يتم إسناد ساعات سجل الأنشطة لمهمة عميل. اختر مهمة لتُحسب على عميل."
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__timesheet_ids
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Timesheets"
+msgstr "سجلات الأنشطة"
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__total_hours_spent
+msgid "Total Hours Spent"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Total hours"
+msgstr "إجمالي الساعات"
+
+#. module: odex25_helpdesk_timesheet
+#: model_terms:ir.ui.view,arch_db:odex25_helpdesk_timesheet.odex25_helpdesk_team_view_form_inherit_odex25_helpdesk_timesheet
+msgid "Track your time using a timer"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: model:ir.model.fields,field_description:odex25_helpdesk_timesheet.field_odex25_helpdesk_ticket__user_timer_id
+msgid "User Timer"
+msgstr ""
+
+#. module: odex25_helpdesk_timesheet
+#: code:addons/odex25_helpdesk_timesheet/models/odex25_helpdesk.py:0
+#, python-format
+msgid "Warning"
+msgstr "تحذير"
diff --git a/odex25_project/odex25_helpdesk_timesheet/models/__init__.py b/odex25_project/odex25_helpdesk_timesheet/models/__init__.py
new file mode 100644
index 000000000..19e731b0b
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from . import analytic
+from . import odex25_helpdesk
+from . import project
diff --git a/odex25_project/odex25_helpdesk_timesheet/models/analytic.py b/odex25_project/odex25_helpdesk_timesheet/models/analytic.py
new file mode 100644
index 000000000..730bfa04a
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/models/analytic.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models
+from odoo.osv import expression
+
+
+class AccountAnalyticLine(models.Model):
+    _inherit = 'account.analytic.line'
+
+    odex25_helpdesk_ticket_id = fields.Many2one('odex25_helpdesk.ticket', 'Helpdesk Ticket')
+
+    def _compute_task_id(self):
+        super(AccountAnalyticLine, self)._compute_task_id()
+        for line in self.filtered(lambda line: line.odex25_helpdesk_ticket_id):
+            line.task_id = line.odex25_helpdesk_ticket_id.task_id
+
+    def _timesheet_preprocess(self, vals):
+        odex25_helpdesk_ticket_id = vals.get('odex25_helpdesk_ticket_id')
+        if odex25_helpdesk_ticket_id:
+            ticket = self.env['odex25_helpdesk.ticket'].browse(odex25_helpdesk_ticket_id)
+            if ticket.project_id:
+                vals['project_id'] = ticket.project_id.id
+            if ticket.task_id:
+                vals['task_id'] = ticket.task_id.id
+        vals = super(AccountAnalyticLine, self)._timesheet_preprocess(vals)
+        return vals
+
+    def _timesheet_get_portal_domain(self):
+        domain = super(AccountAnalyticLine, self)._timesheet_get_portal_domain()
+        return expression.OR([domain, self._timesheet_in_odex25_helpdesk_get_portal_domain()])
+
+    def _timesheet_in_odex25_helpdesk_get_portal_domain(self):
+        return [
+            '&',
+                '&',
+                    '&',
+                        ('task_id', '=', False),
+                        ('odex25_helpdesk_ticket_id', '!=', False),
+                    '|',
+                        '|',
+                            ('project_id.message_partner_ids', 'child_of', [self.env.user.partner_id.commercial_partner_id.id]),
+                            ('project_id.allowed_portal_user_ids', 'child_of', [self.env.user.id]),
+                        ('odex25_helpdesk_ticket_id.message_partner_ids', 'child_of', [self.env.user.partner_id.commercial_partner_id.id]),
+                ('project_id.privacy_visibility', '=', 'portal')
+        ]
diff --git a/odex25_project/odex25_helpdesk_timesheet/models/odex25_helpdesk.py b/odex25_project/odex25_helpdesk_timesheet/models/odex25_helpdesk.py
new file mode 100644
index 000000000..827a00f90
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/models/odex25_helpdesk.py
@@ -0,0 +1,253 @@
+# -*- coding: utf-8 -*-
+from math import ceil
+
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class odex25_helpdeskTeam(models.Model):
+    _inherit = 'odex25_helpdesk.team'
+
+    project_id = fields.Many2one("project.project", string="Project", ondelete="restrict", domain="[('allow_timesheets', '=', True), ('company_id', '=', company_id)]",
+        help="Project to which the tickets (and the timesheets) will be linked by default.")
+    timesheet_timer = fields.Boolean('Timesheet Timer', default=True)
+    display_timesheet_timer = fields.Boolean(compute='_compute_display_timesheet_timer')
+
+    @api.depends('use_odex25_helpdesk_timesheet')
+    def _compute_display_timesheet_timer(self):
+        is_uom_hour = self.env.company.timesheet_encode_uom_id == self.env.ref('uom.product_uom_hour')
+        for team in self:
+            team.display_timesheet_timer = team.use_odex25_helpdesk_timesheet and is_uom_hour
+
+    @api.depends('use_odex25_helpdesk_timesheet')
+    def _compute_timesheet_timer(self):
+        for team in self:
+            team.timesheet_timer = team.use_odex25_helpdesk_timesheet
+
+    def _create_project(self, name, allow_billable, other):
+        return self.env['project.project'].create({
+            'name': name,
+            'type_ids': [
+                (0, 0, {'name': _('In Progress')}),
+                (0, 0, {'name': _('Closed'), 'is_closed': True})
+            ],
+            'allow_timesheets': True,
+            'allow_timesheet_timer': True,
+            **other,
+        })
+
+    @api.model
+    def create(self, vals):
+        if vals.get('use_odex25_helpdesk_timesheet') and not vals.get('project_id'):
+            allow_billable = vals.get('use_odex25_helpdesk_sale_timesheet')
+            vals['project_id'] = self._create_project(vals['name'], allow_billable, {}).id
+        return super(odex25_helpdeskTeam, self).create(vals)
+
+    def write(self, vals):
+        if 'use_odex25_helpdesk_timesheet' in vals and not vals['use_odex25_helpdesk_timesheet']:
+            vals['project_id'] = False
+        result = super(odex25_helpdeskTeam, self).write(vals)
+        for team in self.filtered(lambda team: team.use_odex25_helpdesk_timesheet and not team.project_id):
+            team.project_id = team._create_project(team.name, team.use_odex25_helpdesk_sale_timesheet, {'allow_timesheets': True, 'allow_timesheet_timer': True})
+            self.env['odex25_helpdesk.ticket'].search([('team_id', '=', team.id), ('project_id', '=', False)]).write({'project_id': team.project_id.id})
+        return result
+
+    @api.model
+    def _init_data_create_project(self):
+        # TODO: remove me in master
+        return
+
+
+class odex25_helpdeskTicket(models.Model):
+    _inherit = 'odex25_helpdesk.ticket'
+    # _inherit = ['odex25_helpdesk.ticket', 'timer.mixin']
+
+    @api.model
+    def default_get(self, fields_list):
+        result = super(odex25_helpdeskTicket, self).default_get(fields_list)
+        if 'project_id' in fields_list and result.get('team_id') and not result.get('project_id'):
+            result['project_id'] = self.env['odex25_helpdesk.team'].browse(result['team_id']).project_id.id
+        return result
+
+    # TODO: [XBO] change this field in related and stored (to count the number of tickets per project) field to the one in odex25_helpdesk.team
+    project_id = fields.Many2one("project.project", string="Project", domain="[('allow_timesheets', '=', True), ('company_id', '=', company_id)]")
+    # TODO: [XBO] remove me in master
+    task_id = fields.Many2one(
+        "project.task", string="Task", compute='_compute_task_id', store=True, readonly=False,
+        domain="[('id', 'in', _related_task_ids)]", tracking=True,
+        help="The task must have the same customer as this ticket.")
+    # TODO: [XBO] remove me in master (since task_id field will be removed too)
+    _related_task_ids = fields.Many2many('project.task', compute='_compute_related_task_ids')
+    timesheet_ids = fields.One2many('account.analytic.line', 'odex25_helpdesk_ticket_id', 'Timesheets')
+    is_closed = fields.Boolean(related="task_id.stage_id.is_closed", string="Is Closed", readonly=True)
+    # TODO: [XBO] remove me in master (since task_id field will be removed too)
+    is_task_active = fields.Boolean(related="task_id.active", string='Is Task Active', readonly=True)
+    use_odex25_helpdesk_timesheet = fields.Boolean('Timesheet activated on Team', related='team_id.use_odex25_helpdesk_timesheet', readonly=True)
+    timesheet_timer = fields.Boolean(related='team_id.timesheet_timer')
+    display_timesheet_timer = fields.Boolean("Display Timesheet Time", compute='_compute_display_timesheet_timer')
+    total_hours_spent = fields.Float(compute='_compute_total_hours_spent', default=0)
+    display_timer_start_secondary = fields.Boolean(compute='_compute_display_timer_buttons')
+    display_timer = fields.Boolean(compute='_compute_display_timer')
+    encode_uom_in_days = fields.Boolean(compute='_compute_encode_uom_in_days')
+
+    def _compute_encode_uom_in_days(self):
+        self.encode_uom_in_days = self.env.company.timesheet_encode_uom_id == self.env.ref('uom.product_uom_day')
+
+    @api.depends('display_timesheet_timer', 'timer_start', 'timer_pause', 'total_hours_spent')
+    def _compute_display_timer_buttons(self):
+        for ticket in self:
+            if not ticket.display_timesheet_timer:
+                ticket.update({
+                    'display_timer_start_primary': False,
+                    'display_timer_start_secondary': False,
+                    'display_timer_stop': False,
+                    'display_timer_pause': False,
+                    'display_timer_resume': False,
+                })
+            else:
+                super(odex25_helpdeskTicket, ticket)._compute_display_timer_buttons()
+                ticket.display_timer_start_secondary = ticket.display_timer_start_primary
+                if not ticket.timer_start:
+                    ticket.update({
+                        'display_timer_stop': False,
+                        'display_timer_pause': False,
+                        'display_timer_resume': False,
+                    })
+                    if not ticket.total_hours_spent:
+                        ticket.display_timer_start_secondary = False
+                    else:
+                        ticket.display_timer_start_primary = False
+
+    def _compute_display_timer(self):
+        if self.env.user.has_group('odex25_helpdesk.group_odex25_helpdesk_user') and self.env.user.has_group('hr_timesheet.group_hr_timesheet_user'):
+            self.display_timer = True
+        else:
+            self.display_timer = False
+
+    @api.depends('use_odex25_helpdesk_timesheet', 'timesheet_timer', 'timesheet_ids', 'encode_uom_in_days')
+    def _compute_display_timesheet_timer(self):
+        for ticket in self:
+            ticket.display_timesheet_timer = ticket.use_odex25_helpdesk_timesheet and ticket.timesheet_timer and not ticket.encode_uom_in_days
+
+    @api.depends('project_id', 'company_id')
+    def _compute_related_task_ids(self):
+        # TODO: [XBO] remove me in master because the task_id will be removed, then this compute and the _related_task_ids field will be useless
+        for t in self:
+            domain = [('project_id.allow_timesheets', '=', True), ('company_id', '=', t.company_id.id)]
+            if t.project_id:
+                domain = [('project_id', '=', t.project_id.id)]
+            t._related_task_ids = self.env['project.task'].search(domain)._origin
+
+    @api.depends('timesheet_ids')
+    def _compute_total_hours_spent(self):
+        for ticket in self:
+            ticket.total_hours_spent = round(sum(ticket.timesheet_ids.mapped('unit_amount')), 2)
+
+    @api.depends('project_id')
+    def _compute_task_id(self):
+        # TODO: [XBO] remove me in master (task_id field will be removed)
+        with_different_project = self.filtered(lambda t: t.project_id != t.task_id.project_id)
+        with_different_project.update({'task_id': False})
+
+    @api.onchange('task_id')
+    def _onchange_task_id(self):
+        # TODO: remove me in master
+        return
+
+    @api.constrains('project_id', 'team_id')
+    def _check_project_id(self):
+        # TODO: [XBO] see in master if we must remove this method, but since project_id will be a related field, this constrains will be useless.
+        for ticket in self:
+            if ticket.use_odex25_helpdesk_timesheet and not ticket.project_id:
+                raise ValidationError(_("The project is required to track time on ticket."))
+
+    @api.constrains('project_id', 'task_id')
+    def _check_task_in_project(self):
+        # TODO: [XBO] remove me in master (task_id field will be removed in master)
+        for ticket in self:
+            if ticket.task_id:
+                if ticket.task_id.project_id != ticket.project_id:
+                    raise ValidationError(_("The task must be in ticket's project."))
+
+    def _get_timesheet(self):
+        # return not invoiced timesheet
+        timesheet_ids = self.timesheet_ids
+        return timesheet_ids.filtered(lambda t: (not t.timesheet_invoice_id or t.timesheet_invoice_id.state == 'cancel'))
+
+    @api.model_create_multi
+    def create(self, value_list):
+        team_ids = set([value['team_id'] for value in value_list if value.get('team_id')])
+        teams = self.env['odex25_helpdesk.team'].browse(team_ids)
+
+        team_project_map = {}  # map with the team that require a project
+        for team in teams:
+            if team.use_odex25_helpdesk_timesheet:
+                team_project_map[team.id] = team.project_id.id
+
+        for value in value_list:
+            if value.get('team_id') and not value.get('project_id') and team_project_map.get(value['team_id']):
+                value['project_id'] = team_project_map[value['team_id']]
+
+        return super(odex25_helpdeskTicket, self).create(value_list)
+
+    def write(self, values):
+        result = super(odex25_helpdeskTicket, self).write(values)
+        # force timesheet values: changing ticket's task or project will reset timesheet ones
+        timesheet_vals = {}
+        for fname in self._timesheet_forced_fields():
+            if fname in values:
+                timesheet_vals[fname] = values[fname]
+        if timesheet_vals:
+            for timesheet in self.sudo()._get_timesheet():
+                timesheet.write(timesheet_vals)  # sudo since Helpdesk user can change task
+        return result
+
+#     @api.model
+#     def _fields_view_get(self, view_id=None, view_type='form', toolbar=False, submenu=False):
+#         """ Set the correct label for `unit_amount`, depending on company UoM """
+#         result = super(odex25_helpdeskTicket, self)._fields_view_get(view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu)
+#         result['arch'] = self.env['account.analytic.line']._apply_timesheet_label(result['arch'])
+#         return result
+
+    def action_view_ticket_task(self):
+        # TODO: [XBO] remove me in master (task_id field will be removed in master)
+        self.ensure_one()
+        return {
+            'view_mode': 'form',
+            'res_model': 'project.task',
+            'type': 'ir.actions.act_window',
+            'res_id': self.task_id.id,
+        }
+
+    def _timesheet_forced_fields(self):
+        """ return the list of field that should also be written on related timesheets """
+        return ['task_id', 'project_id']
+
+    def action_timer_start(self):
+        if not self.user_timer_id.timer_start and self.display_timesheet_timer:
+            super().action_timer_start()
+
+    def action_timer_stop(self):
+        # timer was either running or paused
+        if self.user_timer_id.timer_start and self.display_timesheet_timer:
+            minutes_spent = self.user_timer_id._get_minutes_spent()
+            minimum_duration = int(self.env['ir.config_parameter'].sudo().get_param('hr_timesheet.timesheet_min_duration', 0))
+            rounding = int(self.env['ir.config_parameter'].sudo().get_param('hr_timesheet.timesheet_rounding', 0))
+            minutes_spent = self._timer_rounding(minutes_spent, minimum_duration, rounding)
+            return self._action_open_new_timesheet(minutes_spent * 60 / 3600)
+        return False
+
+    def _action_open_new_timesheet(self, time_spent):
+        return {
+            "name": _("Confirm Time Spent"),
+            "type": 'ir.actions.act_window',
+            "res_model": 'odex25_helpdesk.ticket.create.timesheet',
+            "views": [[False, "form"]],
+            "target": 'new',
+            "context": {
+                **self.env.context,
+                'active_id': self.id,
+                'active_model': self._name,
+                'default_time_spent': time_spent,
+            },
+        }
diff --git a/odex25_project/odex25_helpdesk_timesheet/models/project.py b/odex25_project/odex25_helpdesk_timesheet/models/project.py
new file mode 100644
index 000000000..6b7b58de3
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/models/project.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models
+
+class Project(models.Model):
+    _inherit = 'project.project'
+
+    ticket_ids = fields.One2many('odex25_helpdesk.ticket', 'project_id', string='Tickets')
+    ticket_count = fields.Integer('# Tickets', compute='_compute_ticket_count')
+
+    odex25_helpdesk_team = fields.One2many('odex25_helpdesk.team', 'project_id')
+
+    @api.depends('ticket_ids.project_id')
+    def _compute_ticket_count(self):
+        if not self.user_has_groups('odex25_helpdesk.group_odex25_helpdesk_user'):
+            self.ticket_count = 0
+            return
+        result = self.env['odex25_helpdesk.ticket'].read_group([
+            ('project_id', 'in', self.ids)
+        ], ['project_id'], ['project_id'])
+        data = {data['project_id'][0]: data['project_id_count'] for data in result}
+        for project in self:
+            project.ticket_count = data.get(project.id, 0)
+
+    @api.depends('odex25_helpdesk_team.timesheet_timer')
+    def _compute_allow_timesheet_timer(self):
+        super(Project, self)._compute_allow_timesheet_timer()
+
+        for project in self:
+            project.allow_timesheet_timer = project.allow_timesheet_timer or project.odex25_helpdesk_team.timesheet_timer
diff --git a/odex25_project/odex25_helpdesk_timesheet/security/ir.model.access.csv b/odex25_project/odex25_helpdesk_timesheet/security/ir.model.access.csv
new file mode 100644
index 000000000..4a3d31c32
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_project_odex25_helpdesk_user,project.project.odex25_helpdesk.user,project.model_project_project,odex25_helpdesk.group_odex25_helpdesk_user,1,0,0,0
+access_project_task_odex25_helpdesk_user,project.task.odex25_helpdesk.user,project.model_project_task,odex25_helpdesk.group_odex25_helpdesk_user,1,0,0,0
+access_analytic_account_heldpdesk_user,analytic.account.odex25_helpdesk.user,analytic.model_account_analytic_account,odex25_helpdesk.group_odex25_helpdesk_user,1,1,0,0
+access_analytic_line_heldpdesk_user,analytic.line.odex25_helpdesk.user,analytic.model_account_analytic_line,odex25_helpdesk.group_odex25_helpdesk_user,1,1,1,1
+access_odex25_helpdesk_ticket_create_timesheet,access.odex25_helpdesk.ticket.create.timesheet,model_odex25_helpdesk_ticket_create_timesheet,odex25_helpdesk.group_odex25_helpdesk_user,1,1,1,0
diff --git a/odex25_project/odex25_helpdesk_timesheet/security/odex25_helpdesk_timesheet_security.xml b/odex25_project/odex25_helpdesk_timesheet/security/odex25_helpdesk_timesheet_security.xml
new file mode 100644
index 000000000..29233bfed
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/security/odex25_helpdesk_timesheet_security.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo noupdate="1">
+
+        <record id="timesheet_line_rule_odex25_helpdesk_user" model="ir.rule">
+            <field name="name">account.analytic.line.odex25_helpdesk.user</field>
+            <field name="model_id" ref="analytic.model_account_analytic_line"/>
+            <field name="domain_force">[('user_id', '=', user.id), ('odex25_helpdesk_ticket_id', '!=', False)]</field>
+            <field name="groups" eval="[(4, ref('odex25_helpdesk.group_odex25_helpdesk_user'))]"/>
+            <field name="perm_create" eval="1"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_unlink" eval="1"/>
+            <field name="perm_read" eval="0"/>
+        </record>
+
+        <record id="timesheet_line_rule_odex25_helpdesk_manager" model="ir.rule">
+            <field name="name">account.analytic.line.timesheet.manager</field>
+            <field name="model_id" ref="analytic.model_account_analytic_line"/>
+            <field name="domain_force">[('odex25_helpdesk_ticket_id', '!=', False)]</field>
+            <field name="groups" eval="[(4, ref('odex25_helpdesk.group_odex25_helpdesk_manager'))]"/>
+            <field name="perm_create" eval="1"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_unlink" eval="1"/>
+            <field name="perm_read" eval="0"/>
+        </record>
+
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/odex25_helpdesk_timesheet/static/description/icon.png b/odex25_project/odex25_helpdesk_timesheet/static/description/icon.png
new file mode 100644
index 000000000..4141f52da
Binary files /dev/null and b/odex25_project/odex25_helpdesk_timesheet/static/description/icon.png differ
diff --git a/odex25_project/odex25_helpdesk_timesheet/tests/__init__.py b/odex25_project/odex25_helpdesk_timesheet/tests/__init__.py
new file mode 100644
index 000000000..a39e41c3e
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import test_project
+
diff --git a/odex25_project/odex25_helpdesk_timesheet/tests/test_project.py b/odex25_project/odex25_helpdesk_timesheet/tests/test_project.py
new file mode 100644
index 000000000..6fef5bd4c
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/tests/test_project.py
@@ -0,0 +1,111 @@
+# -*- coding: utf-8 -*-
+
+from odoo.tests.common import TransactionCase
+
+
+class TestTimesheet(TransactionCase):
+
+    def setUp(self):
+        super(TestTimesheet, self).setUp()
+
+        self.partner = self.env['res.partner'].create({
+            'name': 'Customer Task',
+            'email': 'customer@task.com',
+        })
+
+        self.analytic_account = self.env['account.analytic.account'].create({
+            'name': 'Analytic Account for Test Customer',
+            'partner_id': self.partner.id,
+            'code': 'TEST'
+        })
+
+    def test_allow_timesheets_and_timer(self):
+        """
+        Check that a modification of the 'allow_timesheets' field updates correctly the
+        'allow_timesheet_timer' field.
+        """
+        Project = self.env['project.project']
+        odex25_helpdeskTeam = self.env['odex25_helpdesk.team']
+
+        # case 1: create a project with allow_timesheets set to FALSE
+        project_1 = Project.create({
+            'name': 'Project 1',
+            'allow_timesheets': False,
+            'partner_id': self.partner.id
+        })
+
+        self.assertFalse(
+            project_1.allow_timesheet_timer,
+            "On project creation with 'allow_timesheets' set to FALSE, 'allow_timesheet_timer' shall be set to FALSE")
+
+        # case 2: create a project with allow_timesheets set to TRUE
+        project_2 = Project.create({
+            'name': 'Project 2',
+            'allow_timesheets': True,
+            'partner_id': self.partner.id,
+            'analytic_account_id': self.analytic_account.id
+        })
+
+        self.assertTrue(
+            project_2.allow_timesheet_timer,
+            "On project creation with 'allow_timesheets' set to TRUE, 'allow_timesheet_timer' shall be set to TRUE")
+
+        # case 3: change 'allow_timesheets' from FALSE to TRUE
+        project_1.write({
+            'allow_timesheets': True
+        })
+
+        self.assertTrue(
+            project_1.allow_timesheet_timer,
+            "On 'allow_timesheets' change to TRUE, 'allow_timesheet_timer' shall be set to TRUE")
+
+        # case 4: change 'allow_timesheets' from TRUE to FALSE
+        project_2.write({
+            'allow_timesheets': False
+        })
+
+        self.assertFalse(
+            project_2.allow_timesheet_timer,
+            "On 'allow_timesheets' change to FALSE, 'allow_timesheet_timer' shall be set to FALSE")
+
+        # case 5: a Helpdesk team without timesheet timer
+        odex25_helpdeskTeam_1 = odex25_helpdeskTeam.create({
+            'name': 'Team #1',
+            'project_id': project_1.id,
+            'timesheet_timer': False,
+        })
+
+        self.assertTrue(
+            odex25_helpdeskTeam_1.project_id.allow_timesheet_timer,
+            "If 'allow_timesheets' is TRUE and 'timesheet_timer' is FALSE, 'allow_timesheet_timer' shall be set to TRUE")
+
+        # case 5: a Helpdesk team with a timesheet timer
+        odex25_helpdeskTeam_2 = odex25_helpdeskTeam.create({
+            'name': 'Team #2',
+            'project_id': project_2.id,
+            'timesheet_timer': True,
+        })
+
+        self.assertTrue(
+            odex25_helpdeskTeam_2.project_id.allow_timesheet_timer,
+            "If 'allow_timesheets' is FALSE and 'timesheet_timer' is TRUE,"
+            " 'allow_timesheet_timer' shall be set to TRUE")
+
+        # case 6: project with 'allow_timesheets' set to FALSE and team with
+        # 'timesheet_timer' set to FALSE.
+        project_3 = Project.create({
+            'name': 'Project 3',
+            'allow_timesheets': False,
+            'partner_id': self.partner.id
+        })
+
+        odex25_helpdeskTeam_3 = odex25_helpdeskTeam.create({
+            'name': 'Team #3',
+            'project_id': project_3.id,
+            'timesheet_timer': False,
+        })
+
+        self.assertFalse(
+            odex25_helpdeskTeam_3.project_id.allow_timesheet_timer,
+            "If 'allow_timesheets' is FALSE and 'timesheet_timer' is FALSE,"
+            " 'allow_timesheet_timer' shall be set to FALSE")
diff --git a/odex25_project/odex25_helpdesk_timesheet/views/odex25_helpdesk_views.xml b/odex25_project/odex25_helpdesk_timesheet/views/odex25_helpdesk_views.xml
new file mode 100644
index 000000000..85460e0b5
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/views/odex25_helpdesk_views.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <record id="odex25_helpdesk_team_view_form_inherit_odex25_helpdesk_timesheet" model="ir.ui.view">
+        <field name="name">odex25_helpdesk.team.form.inherit.timesheet</field>
+        <field name="model">odex25_helpdesk.team</field>
+        <field name="inherit_id" ref="odex25_helpdesk.odex25_helpdesk_team_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='odex25_helpdesk_timesheet']" position='replace'>
+                <div attrs="{'invisible': [('use_odex25_helpdesk_timesheet', '=', False)]}" class="pt-4">
+                    <label for="project_id"/>
+                    <field name="project_id" class="oe_inline" context="{'default_allow_timesheets': 1, 'default_allow_billable': use_odex25_helpdesk_sale_timesheet}"/>
+                </div>
+            </xpath>
+            <xpath expr="//div[@id='timesheet']" position='after'>
+                <field name="display_timesheet_timer" invisible="1"/>
+                <div class="col-lg-6 o_setting_box" attrs="{'invisible': [('display_timesheet_timer', '=', False)]}"  id="timer_timesheet">
+                    <div class="o_setting_left_pane">
+                        <field name="timesheet_timer"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="timesheet_timer"/>
+                        <div class="text-muted">
+                            Track your time using a timer
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="odex25_helpdesk_ticket_view_form_inherit_odex25_helpdesk_timesheet" model="ir.ui.view">
+        <field name='name'>odex25_helpdesk.ticket.form.inherit.timesheet</field>
+        <field name="model">odex25_helpdesk.ticket</field>
+        <field name="inherit_id" ref="odex25_helpdesk.odex25_helpdesk_ticket_view_form"/>
+        <field name="arch" type="xml">
+                <button name="assign_ticket_to_self" position="after">
+                    <field name="company_id" invisible="1"/>
+                    <field name="display_timer" invisible="1"/>
+                    <field name="display_timesheet_timer" invisible="1"/>
+                    <field name="timer_pause" invisible="1" />
+                    <field name="display_timer_start_primary" invisible="1"/>
+                    <field name="display_timer_start_secondary" invisible="1"/>
+                    <field name="display_timer_stop" invisible="1"/>
+                    <field name="display_timer_pause" invisible="1"/>
+                    <field name="display_timer_resume" invisible="1"/>
+                    <field name="is_closed" invisible="1"/>
+                    <field name="is_task_active" invisible="1"/>
+                    <field name="encode_uom_in_days" invisible="1"/>
+                    <button class="btn-primary" name="action_timer_start" type="object" string="Start"
+                        attrs="{'invisible': ['|', ('display_timer_start_primary', '=', False), ('display_timer', '=', False)]}" icon="fa-clock-o"/>
+                    <button class="btn-secondary" name="action_timer_start" type="object" string="Start"
+                        attrs="{'invisible': ['|', ('display_timer_start_secondary', '=', False), ('display_timer', '=', False)]}" icon="fa-clock-o"/>
+                    <button class="btn-primary btn-danger o_fsm_stop" name="action_timer_stop" type="object" string="Stop"
+                        attrs="{'invisible': ['|', ('display_timer_stop', '=', False), ('display_timer', '=', False)]}" icon="fa-clock-o"/>
+                    <button class="btn-primary" name="action_timer_pause" type="object" string="Pause"
+                        attrs="{'invisible': ['|', ('display_timer_pause', '=', False), ('display_timer', '=', False)]}"/>
+                    <button class="btn-primary btn-info" name="action_timer_resume" type="object" string="Resume"
+                        attrs="{'invisible': ['|', ('display_timer_resume', '=', False), ('display_timer', '=', False)]}"/>
+                </button>
+                <xpath expr="//field[@name='stage_id']" position="attributes">
+                    <attribute name="class">ml-2</attribute>
+                </xpath>
+                <xpath expr="//field[@name='stage_id']" position="before">
+                    <field name="display_timer" invisible="1"/>
+                    <field name="timer_start" widget="timer_timer" class="text-danger ml-auto h2 ml-4 font-weight-bold"
+                        attrs="{'invisible': [('display_timer', '=', False)]}"/>
+                </xpath>
+            <xpath expr="//field[@name='email_cc']" position="after">
+                <field name="use_odex25_helpdesk_timesheet" invisible="1"/>
+                <field name="project_id" invisible="1"/>
+                <field name="_related_task_ids" invisible="1"/>
+                <field name="task_id" context="{'default_project_id': project_id, 'default_partner_id': partner_id}" invisible="1" widget="task_with_hours"/>
+            </xpath>
+            <xpath expr="//field[@name='description']" position="replace">
+                <notebook>
+                    <page string="Description" name="description">
+                        <field name="emp_req" invisible="1"/>
+                        <field name="description" placeholder="Description of the ticket..." attrs="{'readonly':[('emp_req','=',True)]}"/>
+                    </page>
+                    <page string="Timesheets" name="timesheets"
+                        attrs="{'invisible': ['|', ('project_id', '=', False), ('use_odex25_helpdesk_timesheet', '=', False)]}"
+                        groups="hr_timesheet.group_hr_timesheet_user">
+                        <field name='timesheet_ids' mode="tree,kanban" attrs="{'readonly': [('task_id', '!=', False), '|', ('is_closed', '=', True), ('is_task_active', '=', False)]}" context="{'default_project_id': project_id, 'default_task_id': task_id}" groups="hr_timesheet.group_hr_timesheet_user">
+                            <tree editable="bottom" string="Timesheet Activities" default_order="date">
+                                <field name="date"/>
+                                <field name="user_id" invisible="1"/>
+                                <field name="employee_id" required="1" widget="many2one_avatar_employee"/>
+                                <field name="name" required="0"/>
+                                <field name="unit_amount" widget="timesheet_uom" decoration-danger="unit_amount &gt; 24"/>
+                                <field name="project_id" invisible="1"/>
+                                <field name="task_id" invisible="1"/>
+                                <field name="company_id" invisible="1"/>
+                            </tree>
+                            <kanban class="o_kanban_mobile">
+                                <field name="date"/>
+                                <field name="user_id"/>
+                                <field name="employee_id"/>
+                                <field name="name"/>
+                                <field name="unit_amount"/>
+                                <field name="project_id"/>
+                                <templates>
+                                    <t t-name="kanban-box">
+                                        <div t-attf-class="oe_kanban_card oe_kanban_global_click">
+                                            <div class="row">
+                                                <div class="col-6">
+                                                    <strong><span><t t-esc="record.employee_id.value"/></span></strong>
+                                                </div>
+                                                <div class="col-6 pull-right text-right">
+                                                    <strong><t t-esc="record.date.value"/></strong>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-6 text-muted">
+                                                    <span><t t-esc="record.name.value"/></span>
+                                                </div>
+                                                <div class="col-6">
+                                                    <span class="pull-right text-right">
+                                                        <field name="unit_amount" widget="float_time" decoration-danger="unit_amount &gt; 24"/>
+                                                    </span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </t>
+                                </templates>
+                            </kanban>
+                            <form  string="Timesheet Activities">
+                                <sheet>
+                                    <group>
+                                        <field name="date"/>
+                                        <field name="user_id" invisible="1"/>
+                                        <field name="employee_id" required="1"/>
+                                        <field name="name"/>
+                                        <field name="unit_amount" string="Duration" widget="float_time" decoration-danger="unit_amount &gt; 24"/>
+                                        <field name="project_id" invisible="1"/>
+                                        <field name="company_id" invisible="1"/>
+                                    </group>
+                                </sheet>
+                            </form>
+                        </field>
+                        <group>
+                            <group class="oe_subtotal_footer oe_right" name="ticket_hours">
+                                <span>
+                                    <label class="font-weight-bold" for="total_hours_spent" string="Hours Spent"
+                                        attrs="{'invisible': [('encode_uom_in_days', '=', True)]}"/>
+                                    <label class="font-weight-bold" for="total_hours_spent" string="Days Spent"
+                                        attrs="{'invisible': [('encode_uom_in_days', '=', False)]}"/>
+                                </span>
+                                <field name="total_hours_spent" widget="timesheet_uom" nolabel="1" />
+                            </group>
+                        </group>
+                    </page>
+                </notebook>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="odex25_helpdesk_ticket_view_search_inherit_odex25_helpdesk_timesheet" model="ir.ui.view">
+        <field name="name">odex25_helpdesk.ticket.search.inherit.timesheet</field>
+        <field name="model">odex25_helpdesk.ticket</field>
+        <field name="inherit_id" ref="odex25_helpdesk.odex25_helpdesk_tickets_view_search"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="project_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Improve the ticket kanban in Project -->
+    <record id="odex25_helpdesk_timer_ticket_view_kanban" model="ir.ui.view">
+        <field name="name">odex25_helpdesk.ticket.kanban.timer</field>
+        <field name="model">odex25_helpdesk.ticket</field>
+        <field name="priority">5</field>
+        <field name="inherit_id" ref="odex25_helpdesk.odex25_helpdesk_ticket_view_kanban"/>
+        <field name="arch" type="xml">
+            <xpath expr="//t[@t-name='kanban-box']//field[@name='activity_ids']" position="before">
+                <field name="display_timesheet_timer" invisible="1"/>
+                <field name="timer_start" invisible="1"/>
+                <field name="timer_pause" invisible="1"/>
+                <t t-if="record.display_timesheet_timer &amp;&amp; record.timer_pause.raw_value">
+                    <i class="fa fa-pause text-warning" title="Timer is Paused"></i>
+                </t>
+                <t t-elif="record.display_timesheet_timer &amp;&amp; record.timer_start.raw_value">
+                    <i class="fa fa-play text-success" title="Timer is Running"></i>
+                </t>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/odex25_project/odex25_helpdesk_timesheet/views/project_views.xml b/odex25_project/odex25_helpdesk_timesheet/views/project_views.xml
new file mode 100644
index 000000000..15d3024a1
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/views/project_views.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="project_project_action_view_odex25_helpdesk_tickets" model="ir.actions.act_window">
+        <field name="name">Project Tickets</field>
+        <field name="res_model">odex25_helpdesk.ticket</field>
+        <field name="view_mode">kanban,tree,form,pivot,graph</field>
+        <field name="search_view_id" ref="odex25_helpdesk_ticket_view_search_inherit_odex25_helpdesk_timesheet"/>
+        <field name="context">{'search_default_project_id': active_id, 'default_project_id': active_id}</field>
+    </record>
+
+    <record id="project_project_view_project_tickets_kanban_inherited" model="ir.ui.view">
+            <field name="name">project.project.tickets.kanban.inherited</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="project.view_project_kanban"/>
+            <field name="priority">24</field>
+            <field name="arch" type="xml">
+                <xpath expr="//a[hasclass('o_project_kanban_box')]" position="after">
+                    <a t-if="record.ticket_count" class="o_project_kanban_box" name="%(project_project_action_view_odex25_helpdesk_tickets)d" type="action" attrs="{'invisible': [('ticket_count', '=', 0)]}" context="{'search_default_project_id': [active_id], 'default_project_id': active_id}" >
+                        <field name="ticket_count" string="Tickets" widget="statinfo"/>
+                    </a>
+                </xpath>
+            </field>
+            <field name="groups_id" eval="[(4, ref('odex25_helpdesk.group_odex25_helpdesk_user'))]"/>
+        </record>
+
+   <record id="project_project_view_form_inherit_odex25_helpdesk_timesheet" model="ir.ui.view">
+        <field name="name">project.form.inherit.odex25_helpdesk.timesheet</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button
+                    class="oe_stat_button"
+                    type="action"
+                    name="%(project_project_action_view_odex25_helpdesk_tickets)d"
+                    context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+                    icon="fa-life-ring"
+                    attrs="{'invisible': [('ticket_count', '=', 0)]}">
+                    <field name="ticket_count" string="Tickets" widget="statinfo"/>
+                </button>
+            </div>
+        </field>
+        <field name="groups_id" eval="[(4, ref('odex25_helpdesk.group_odex25_helpdesk_user'))]"/>
+   </record>
+
+</odoo>
diff --git a/odex25_project/odex25_helpdesk_timesheet/wizard/__init__.py b/odex25_project/odex25_helpdesk_timesheet/wizard/__init__.py
new file mode 100644
index 000000000..2ba46a4a2
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/wizard/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import odex25_helpdesk_ticket_create_timesheet
diff --git a/odex25_project/odex25_helpdesk_timesheet/wizard/odex25_helpdesk_ticket_create_timesheet.py b/odex25_project/odex25_helpdesk_timesheet/wizard/odex25_helpdesk_ticket_create_timesheet.py
new file mode 100644
index 000000000..aff87ba79
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/wizard/odex25_helpdesk_ticket_create_timesheet.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models
+
+
+class odex25_helpdeskTicketCreateTimesheet(models.TransientModel):
+    _name = 'odex25_helpdesk.ticket.create.timesheet'
+    _description = "Create Timesheet from ticket"
+
+    _sql_constraints = [('time_positive', 'CHECK(time_spent > 0)', "The timesheet's time must be positive" )]
+
+    time_spent = fields.Float('Time', digits=(16, 2))
+    description = fields.Char('Description')
+    ticket_id = fields.Many2one(
+        'odex25_helpdesk.ticket', "Ticket", required=True,
+        default=lambda self: self.env.context.get('active_id', None),
+        help="Ticket for which we are creating a sales order",
+    )
+
+    def action_generate_timesheet(self):
+        values = {
+            'task_id': self.ticket_id.task_id.id,
+            'project_id': self.ticket_id.project_id.id,
+            'date': fields.Datetime.now(),
+            'name': self.description,
+            'user_id': self.env.uid,
+            'unit_amount': self.time_spent,
+        }
+
+        timesheet = self.env['account.analytic.line'].create(values)
+
+        self.ticket_id.write({
+            'timer_start': False,
+            'timer_pause': False
+        })
+        self.ticket_id.timesheet_ids = [(4, timesheet.id, None)]
+        self.ticket_id.user_timer_id.unlink()
+        return timesheet
diff --git a/odex25_project/odex25_helpdesk_timesheet/wizard/odex25_helpdesk_ticket_create_timesheet_views.xml b/odex25_project/odex25_helpdesk_timesheet/wizard/odex25_helpdesk_ticket_create_timesheet_views.xml
new file mode 100644
index 000000000..c4738a0a7
--- /dev/null
+++ b/odex25_project/odex25_helpdesk_timesheet/wizard/odex25_helpdesk_ticket_create_timesheet_views.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <record id="odex25_helpdesk_ticket_create_timesheet_view_form" model="ir.ui.view">
+        <field name="name">odex25_helpdesk.ticket.create.timesheet.wizard.form</field>
+        <field name="model">odex25_helpdesk.ticket.create.timesheet</field>
+        <field name="arch" type="xml">
+            <form string="Save time">
+                <group>
+                    <field name="ticket_id" invisible="True"/>
+                    <field name="time_spent" string="Duration" class="oe_inline" widget="float_time" required="True"/>
+                    <field name="description" widget="text" required="False" placeholder="Describe your activity..."/>
+                </group>
+                <footer>
+                    <button string="Save" type="object" name="action_generate_timesheet" class="btn btn-primary"/>
+                    <button string="Cancel" special="cancel" type="object" class="btn btn-secondary"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_base/.idea/inspectionProfiles/profiles_settings.xml b/odex25_project/project_base/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 000000000..105ce2da2
--- /dev/null
+++ b/odex25_project/project_base/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/odex25_project/project_base/.idea/misc.xml b/odex25_project/project_base/.idea/misc.xml
new file mode 100644
index 000000000..2d83d70ff
--- /dev/null
+++ b/odex25_project/project_base/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (2)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/odex25_project/project_base/.idea/modules.xml b/odex25_project/project_base/.idea/modules.xml
new file mode 100644
index 000000000..d6d1f7c82
--- /dev/null
+++ b/odex25_project/project_base/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/project_base.iml" filepath="$PROJECT_DIR$/.idea/project_base.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/odex25_project/project_base/.idea/project_base.iml b/odex25_project/project_base/.idea/project_base.iml
new file mode 100644
index 000000000..d0876a78d
--- /dev/null
+++ b/odex25_project/project_base/.idea/project_base.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/odex25_project/project_base/.idea/workspace.xml b/odex25_project/project_base/.idea/workspace.xml
new file mode 100644
index 000000000..33a513015
--- /dev/null
+++ b/odex25_project/project_base/.idea/workspace.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="32aae643-c2b0-4a35-aea5-e7e201bf9ad3" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 6
+}]]></component>
+  <component name="ProjectId" id="2gNEeH003Qz6EWNSSDbcZ8gpmuZ" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-python-sdk-babbdf50b680-746f403e7f0c-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-241.15989.155" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="32aae643-c2b0-4a35-aea5-e7e201bf9ad3" name="Changes" comment="" />
+      <created>1715529731411</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1715529731411</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/odex25_project/project_base/__init__.py b/odex25_project/project_base/__init__.py
new file mode 100644
index 000000000..f2155f77c
--- /dev/null
+++ b/odex25_project/project_base/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+from . import models
+from . import wizard
+
diff --git a/odex25_project/project_base/__manifest__.py b/odex25_project/project_base/__manifest__.py
new file mode 100644
index 000000000..549eabee9
--- /dev/null
+++ b/odex25_project/project_base/__manifest__.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Odex25 Project Base",
+    'summary': """Odex25 Project Base""",
+    'description': """
+1- Project Charter 
+2- Project Stage
+3- Project Tasks
+4- Project Invoice Requests
+    """,
+    'category': 'Odex25-Project/Odex25-Project',
+    'version': '1.0',
+    'depends': ['sale_timesheet','hr' ,'project','mail',  'portal',  'base' ,'account'],
+    'data': [
+        'data/project_data.xml',
+        'data/project_cron.xml',
+        'security/project_security.xml',
+        'security/ir_rule_allow_users.xml',
+        'security/ir.model.access.csv',
+        'wizard/project_hold_reason_view.xml',
+        'wizard/edit_project_phase_view.xml',
+        'wizard/down_payment_invoice_advance_views.xml',
+        'report/project_reports.xml',
+        'report/project_report_templates.xml',
+        'report/project_invoice_report_templates.xml',
+        'views/project_views.xml',
+        'views/project_invoice_views.xml',
+        'views/project_phase_view.xml',
+        'views/res_config_setting.xml',
+        'views/project_task_views.xml',
+        'views/asset.xml',
+        
+    ],
+}
diff --git a/odex25_project/project_base/data/project_cron.xml b/odex25_project/project_base/data/project_cron.xml
new file mode 100644
index 000000000..1715fd934
--- /dev/null
+++ b/odex25_project/project_base/data/project_cron.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="ir_cron_project_status" model="ir.cron">
+        <field name="name">Project: Update Project Status</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="nextcall" eval="(DateTime.now().replace(hour=2, minute=0) + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')" />
+        <field name="doall" eval="False"/>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="code">model.update_project_status()</field>
+        <field name="state">code</field>
+    </record>
+    
+    <record id="ir_cron_project_invoice" model="ir.cron">
+        <field name="name">Project: Send Invoice Issue Notification</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="nextcall" eval="(DateTime.now().replace(hour=2, minute=0) + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        <field name="doall" eval="False"/>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="code">model.project_invoice_notification()</field>
+        <field name="state">code</field>
+    </record>
+</odoo>
diff --git a/odex25_project/project_base/data/project_data.xml b/odex25_project/project_base/data/project_data.xml
new file mode 100644
index 000000000..c2489b81d
--- /dev/null
+++ b/odex25_project/project_base/data/project_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="0">
+<!--
+        Project Number
+        -->
+        <record id="seq_project_project" model="ir.sequence">
+            <field name="name">Project Number</field>
+            <field name="code">project.project</field>
+            <field name="prefix">P%(y)s-</field>
+            <field name="padding">5</field>
+            <field name="company_id" eval="False"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/odex25_project/project_base/i18n/ar.po b/odex25_project/project_base/i18n/ar.po
new file mode 100644
index 000000000..b4a7497b9
--- /dev/null
+++ b/odex25_project/project_base/i18n/ar.po
@@ -0,0 +1,48 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-05-11 15:00+0000\n"
+"PO-Revision-Date: 2024-05-11 15:00+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.actions.act_window,name:project.open_view_project_all_config
+#: model:ir.model.fields,field_description:project.field_account_analytic_account__project_ids
+#: model:ir.model.fields,field_description:project.field_project_delete_wizard__project_ids
+#: model:ir.model.fields,field_description:project.field_project_task_type__project_ids
+#: model:ir.model.fields,field_description:project.field_project_task_type_delete_wizard__project_ids
+#: model:ir.ui.menu,name:project.menu_projects
+#: model:ir.ui.menu,name:project.menu_projects_config
+#: model_terms:ir.ui.view,arch_db:project.account_analytic_account_view_form_inherit
+#: model_terms:ir.ui.view,arch_db:project.portal_layout
+#: model_terms:ir.ui.view,arch_db:project.portal_my_home
+#: model_terms:ir.ui.view,arch_db:project.portal_my_projects
+#: model_terms:ir.ui.view,arch_db:project.view_project
+msgid "Projects"
+msgstr "المشاريع"
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_main_pm
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project
+#: model_terms:ir.ui.view,arch_db:project.edit_project
+msgid "Tasks In Progress"
+msgstr "المهام قيد التنفيذ"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task__task_progress
+msgid "Task Progress"
+msgstr "نسبة الانجاز"
diff --git a/odex25_project/project_base/i18n/ar_001.po b/odex25_project/project_base/i18n/ar_001.po
new file mode 100644
index 000000000..e7ada4c5a
--- /dev/null
+++ b/odex25_project/project_base/i18n/ar_001.po
@@ -0,0 +1,2142 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project_base
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-03 08:58+0000\n"
+"PO-Revision-Date: 2024-06-03 08:58+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_base
+#: code:addons/project_base/models/project_phase.py:0
+#, python-format
+msgid " For Reasone: %s"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/wizard/project_hold_reason.py:0
+#, python-format
+msgid " with Reason: %s"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_phase_wizard
+msgid ""
+"<b>\n"
+"                       Kindly make sure to Save current project stages before edit.\n"
+"                   </b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>Country</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>Customer</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>Finish Date</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>Kick-Off Date</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>Project Category</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>Project Manager</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>Sale Order</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>Start Date</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "<b>stage</b>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<i class=\"fa fa-ellipsis-v\" role=\"img\" aria-label=\"Manage\" title=\"Manage\"/>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid ""
+"<i class=\"fa fa-long-arrow-right mx-2 oe_edit_only\" aria-label=\"Arrow icon\" title=\"Arrow\"/>\n"
+"                            <i class=\"fa fa-long-arrow-right mx-2 oe_read_only\" aria-label=\"Arrow icon\" title=\"Arrow\" attrs=\"{'invisible': [('start', '=', False), ('date', '=', False)]}\"/>"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_phase.py:0
+#, python-format
+msgid "<p style='color: #FF0000;'><b>Project Phase updated %s</b></p><ul>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<span class=\"fa fa-clock-o mr-2\" title=\"Dates\"/>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<span class=\"fa fa-user mr-2\" aria-label=\"Partner\" title=\"Partner\"/>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid ""
+"<span class=\"o_form_label o_td_label\" name=\"address_name\">\n"
+"                                <b>Address</b>\n"
+"                            </span>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid ""
+"<span class=\"o_form_label\">Project Invoicing Method</span>\n"
+"                            <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "<span class=\"o_form_label\">Project Type</span>"
+msgstr "<span class=\"o_form_label\">نوع المشروع</span>"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "<span class=\"o_stat_text\">Invoices</span>"
+msgstr "<span class=\"o_stat_text\">الدفعات</span>"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "<span class=\"oe_inline\">Days</span>"
+msgstr "<span class=\"oe_inline\">ايام</span>"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<span class=\"text-muted\">All</span>"
+msgstr "<span class=\"text-muted\">الكل</span>"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<span class=\"text-muted\">Finished</span>"
+msgstr "<span class=\"text-muted\">تم</span>"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<span class=\"text-muted\">In progress</span>"
+msgstr "<span class=\"text-muted\">التنفيذ</span>"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<span class=\"text-muted\">New</span>"
+msgstr "<span class=\"text-muted\">جديد</span>"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid ""
+"<span>\n"
+"                                                No\n"
+"                                            </span>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid ""
+"<span>\n"
+"                                                Yes\n"
+"                                            </span>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "<span>Amount</span>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<span>Reporting</span>"
+msgstr "<span>التقارير</span>"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "<span>Status</span>"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "<span>View</span>"
+msgstr "<span>عرض</span>"
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_sale_advance_payment_inv__advance_down_payment_method
+msgid ""
+"A standard invoice is issued with all the order lines ready for invoicing,"
+"         according to their invoicing policy (based on ordered or delivered "
+"quantity)."
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__account_id
+msgid "Account"
+msgstr "الحساب"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_needaction
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_ids
+msgid "Activities"
+msgstr "الانشطة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Actual Forcast-Issue"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__actual_payment_date
+msgid "Actual Payment date"
+msgstr "تاريخ دفع الفاتورة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Add Customer Team Details in your Projects"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Add Risk Register Log in your Projects"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Add Variation Order to your Projects"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__estimated_hours
+msgid "Additional Estimated Hours"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__task_count_all
+msgid "All Task Count"
+msgstr "المهام"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__estimated_hours
+msgid "Allocated By"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__amount
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Amount"
+msgstr "المبلغ"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "Arrow"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "Arrow icon"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_attachment_count
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المستندات"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__back_log_amount
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Back Log Amount"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_phase_wizard
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_hold_wizard
+msgid "Cancel"
+msgstr "الغاء"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_invoice__state__cancel
+msgid "Cancelled"
+msgstr "ملغي"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_project_filter_inherit
+msgid "Categories"
+msgstr "التصنيفات"
+
+#. module: project_base
+#: model:ir.ui.menu,name:project_base.menu_project_category
+msgid "Category"
+msgstr "التصنيف"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_hold_wizard
+msgid "Choose the reason for the project hold."
+msgstr "اختر سبب تعليق المشروع."
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_task_type__color_gantt
+msgid "Choose your color for Task Bar"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__city
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "City"
+msgstr "المدينة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Close"
+msgstr "إغلاق"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__close_reason
+msgid "Close Reason"
+msgstr "اسباب اﻹغلاق"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_phase__state__close
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__status__close
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_project_filter_inherit
+msgid "Closed"
+msgstr "مغلق"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task_type__color_gantt
+msgid "Color Task Bar"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_category__company_id
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason__company_id
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__company_id
+#: model:ir.model.fields,field_description:project_base.field_project_phase__company_id
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type__company_id
+#: model:ir.model.fields,field_description:project_base.field_project_task_type__company_id
+msgid "Company"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_res_config_settings
+msgid "Config Settings"
+msgstr "ضبط الاعدادات"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Confirm"
+msgstr "تاكيد"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_invoice__state__confirm
+msgid "Confirmed"
+msgstr "مؤكد"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__consultant_id
+msgid "Consultant"
+msgstr "المستشار"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__beneficiary_id
+msgid "Beneficiary"
+msgstr "المستفيد"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Contract Amount"
+msgstr "مبلغ العقد"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "Contract Item"
+msgstr "بند العقد"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__contract_number
+msgid "Contract Number"
+msgstr "رقم العقد"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__contract_value_untaxed
+msgid "Contract Value"
+msgstr "مبلغ العقد"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__country_id
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Country"
+msgstr "الدولة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_sale_advance_payment_inv__advance_down_payment_method
+msgid "Create Down Payment"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Create Invoice"
+msgstr "إنشاء فاتورة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Create Invoice for project per stage or every specific period"
+msgstr "إنشاء فاتورة للمشروع لكل مرحلة أو كل فترة محددة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__create_uid
+#: model:ir.model.fields,field_description:project_base.field_project_category__create_uid
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason__create_uid
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard__create_uid
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__create_uid
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__create_uid
+#: model:ir.model.fields,field_description:project_base.field_project_phase__create_uid
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type__create_uid
+#: model:ir.model.fields,field_description:project_base.field_project_team__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__create_date
+#: model:ir.model.fields,field_description:project_base.field_project_category__create_date
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason__create_date
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard__create_date
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__create_date
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__create_date
+#: model:ir.model.fields,field_description:project_base.field_project_phase__create_date
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type__create_date
+#: model:ir.model.fields,field_description:project_base.field_project_team__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__currency_id
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_invoice_filter
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task_type__is_default
+msgid "Default in new project"
+msgstr "الافتراضي في المشروع الجديد"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__department_id
+#: model:ir.model.fields,field_description:project_base.field_project_team__department_id
+msgid "Department"
+msgstr "القسم"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__name
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Description"
+msgstr "الوصف"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Details"
+msgstr "التفاصيل"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__discount
+msgid "Discount (%)"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__display_name
+#: model:ir.model.fields,field_description:project_base.field_project_category__display_name
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason__display_name
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard__display_name
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__display_name
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__display_name
+#: model:ir.model.fields,field_description:project_base.field_project_phase__display_name
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type__display_name
+#: model:ir.model.fields,field_description:project_base.field_project_team__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "Documents"
+msgstr "المستندات"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_invoice__state__done
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__state__done
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Done"
+msgstr "تم"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "DowmPayment"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__is_down_payment
+msgid "Down Payment"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__sale_advance_payment_inv__advance_down_payment_method__fixed
+msgid "Down payment (fixed amount)"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__sale_advance_payment_inv__advance_down_payment_method__percentage
+msgid "Down payment (percentage)"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_invoice_line__is_downpayment
+msgid ""
+"Down payments are made when creating invoices from a sales order. They are "
+"not copied when duplicating a sales order."
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid "Downpayment amount can't be greater than invoiced amount"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_invoice__state__draft
+#: model:ir.model.fields.selection,name:project_base.selection__project_phase__state__draft
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__plan_date
+msgid "Due Date"
+msgstr "تاريخ اﻹستحقاق"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_phase_wizard
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "Edit"
+msgstr "تعديل"
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.action_edit_project_phase
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_phase_wizard
+msgid "Edit Project Phase"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_team__employee_id
+msgid "Employee"
+msgstr "الموظف"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task__user_ids
+msgid "Employees"
+msgstr "الموظفين"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__end_date
+#: model:ir.model.fields,field_description:project_base.field_project_phase__end_date
+#: model:ir.model.fields,field_description:project_base.field_project_project__date
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+msgid "End Date"
+msgstr "تاريخ الانتهاء"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "Enter Description For invoice"
+msgstr "ادخل الوصف للفاتورة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Expected Collection Date"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__type__expense
+#: model:ir.model.fields.selection,name:project_base.selection__res_company__type__expense
+msgid "Expense"
+msgstr "مصروف"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Expenses"
+msgstr "المصروفات"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__task_count_finished
+msgid "Finished Task Count"
+msgstr "عدد المهام المنتهية"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_follower_ids
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_channel_ids
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_partner_ids
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_phase__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_phase.py:0
+#, python-format
+msgid "From Project For Reasone: %s"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_invoice_filter
+msgid "Group By"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__has_downpayment
+msgid "Has Downpayment"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__status__hold
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_hold_wizard
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_project_filter_inherit
+msgid "Hold"
+msgstr "تعليق"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__hold_reason
+#: model:ir.ui.menu,name:project_base.menu_hold_reason
+msgid "Hold Reason"
+msgstr "اسباب التعليق"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__id
+#: model:ir.model.fields,field_description:project_base.field_project_category__id
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason__id
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard__id
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__id
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__id
+#: model:ir.model.fields,field_description:project_base.field_project_phase__id
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type__id
+#: model:ir.model.fields,field_description:project_base.field_project_team__id
+msgid "ID"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_phase__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_invoice__message_needaction
+#: model:ir.model.fields,help:project_base.field_project_invoice__message_unread
+#: model:ir.model.fields,help:project_base.field_project_phase__message_needaction
+#: model:ir.model.fields,help:project_base.field_project_phase__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_invoice__message_has_error
+#: model:ir.model.fields,help:project_base.field_project_invoice__message_has_sms_error
+#: model:ir.model.fields,help:project_base.field_project_phase__message_has_error
+#: model:ir.model.fields,help:project_base.field_project_phase__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "In Payment"
+msgstr "للدفع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__task_count_inprogress
+msgid "In progress Task Count"
+msgstr "عدد المهام قيد التنفيذ"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__type__internal
+#: model:ir.model.fields.selection,name:project_base.selection__res_company__type__internal
+msgid "Internal"
+msgstr "داخلي"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__invoice_id
+#: model:ir.model.fields,field_description:project_base.field_project_project__invoice_ids
+msgid "Invoice"
+msgstr "الفاتورة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__amount
+msgid "Invoice Amount"
+msgstr "مبلغ الفاتورة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Invoice Every"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_sale_order_line__project_invoiceline_ids
+msgid "Invoice Line"
+msgstr "تفاصيل الفاتورة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "Invoice Lines"
+msgstr "تفاصيل الفاتورة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Invoice No"
+msgstr "رقم الفاتورة"
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.action_project_invoice
+#: model:ir.ui.menu,name:project_base.menu_project_invoice
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_tree_view
+msgid "Invoice Request"
+msgstr "طلب فاتورة"
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid "Invoice Request "
+msgstr "طلب فاتورة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__invoice_type
+msgid "Invoice Type"
+msgstr "نوع الدفعة"
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid "Invoice request created for project %s  and need your action"
+msgstr "تم إنشاء طلب فاتورة للمشروع %s ويحتاج إلى إجراء من طرفك"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__qty_invoiced
+msgid "Invoiced Quantity"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project.py:0
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+#, python-format
+msgid "Invoices"
+msgstr "الدفعات"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Invoices Report"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Invoicing"
+msgstr "الدفعات"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__invoice_period
+msgid "Invoicing Every"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__invoice_method
+#: model:ir.model.fields,field_description:project_base.field_res_company__invoice_method
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__invoice_method
+msgid "Invoicing Method"
+msgstr "سياسة الفوترة"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__invoice_method__per_period
+msgid "Invoicing Per Period"
+msgstr "فوترة بالفترات"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__invoice_method__per_stage
+msgid "Invoicing Per Phase"
+msgstr "فوترة بالمراحل"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_res_company__invoice_period
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__invoice_period
+msgid "Invoicing Period"
+msgstr "الفترة"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__res_company__invoice_method__per_period
+msgid "Invoicing per Period"
+msgstr "فوترة بالفترات"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__res_company__invoice_method__per_stage
+msgid "Invoicing per Stage"
+msgstr "فوترة بالمراحل"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_is_follower
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__is_downpayment
+msgid "Is a down payment"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__actual_date
+msgid "Issue Date"
+msgstr "تاريخ الفاتورة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_team__job_id
+msgid "Job"
+msgstr "الوظيفة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_team__project_job
+msgid "Job In Project"
+msgstr "الوظيفة في المشروع"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_account_move
+msgid "Journal Entry"
+msgstr "قيد اليومية"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_account_move_line
+msgid "Journal Item"
+msgstr "عنصر اليومية"
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid "Kindly Enter Planned Issue Date For this Invoice Request"
+msgstr "يرجى إدخال تاريخ الاستحقاق لطلب الفاتورة هذا"
+
+#. module: project_base
+#: code:addons/project_base/models/project.py:0
+#, python-format
+msgid "Kindly Enter project Stage first."
+msgstr "يرجى إدخال مراحل المشروع أولا."
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase____last_update
+#: model:ir.model.fields,field_description:project_base.field_project_category____last_update
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason____last_update
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard____last_update
+#: model:ir.model.fields,field_description:project_base.field_project_invoice____last_update
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line____last_update
+#: model:ir.model.fields,field_description:project_base.field_project_phase____last_update
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type____last_update
+#: model:ir.model.fields,field_description:project_base.field_project_team____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__write_uid
+#: model:ir.model.fields,field_description:project_base.field_project_category__write_uid
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason__write_uid
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard__write_uid
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__write_uid
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__write_uid
+#: model:ir.model.fields,field_description:project_base.field_project_phase__write_uid
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type__write_uid
+#: model:ir.model.fields,field_description:project_base.field_project_team__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__write_date
+#: model:ir.model.fields,field_description:project_base.field_project_category__write_date
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason__write_date
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard__write_date
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__write_date
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__write_date
+#: model:ir.model.fields,field_description:project_base.field_project_phase__write_date
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type__write_date
+#: model:ir.model.fields,field_description:project_base.field_project_team__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_search_form
+msgid "Late Tasks"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__launch_date
+msgid "Launch date"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Lesson Learned"
+msgstr "الدروس المستفادة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__lessons_learned
+msgid "Lessons learned"
+msgstr "الدروس المستفادة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__project_downinv_ids
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__project_invline_ids
+msgid "Lines"
+msgstr "التفاصيل"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Link Task with its associated ticket"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_res_company__module_project_helpdisk_task
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__module_project_helpdisk_task
+msgid "Link with Helpdisk"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Location"
+msgstr "الموقع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_main_attachment_id
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_phase.py:0
+#, python-format
+msgid "Make sure that stage dates is set."
+msgstr "تأكد من تحديد تواريخ المرحلة."
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__man_hours
+msgid "Man hours"
+msgstr "ساعات العمل"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task__maximum_rate
+msgid "Maximum Rate"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_has_error
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_ids
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_category__name
+#: model:ir.model.fields,field_description:project_base.field_project_hold_reason__name
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__name
+#: model:ir.model.fields,field_description:project_base.field_project_phase_type__name
+#: model:ir.model.fields,field_description:project_base.field_project_project__name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__status__new
+msgid "New"
+msgstr "جديد"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__task_count_new
+msgid "New Task Count"
+msgstr "عدد المهام الجديدة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__no_of_invoices
+msgid "No Of Invoices"
+msgstr "عدد الدفعات"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__no_of_paid_invoices
+msgid "No Of Paid Invoices"
+msgstr "المدفعوعات"
+
+#. module: project_base
+#: model_terms:ir.actions.act_window,help:project_base.act_project_project_2_project_task_finished
+#: model_terms:ir.actions.act_window,help:project_base.act_project_project_2_project_task_inprogress
+#: model_terms:ir.actions.act_window,help:project_base.act_project_project_2_project_task_new
+msgid "No tasks found. Let's create one!"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "No.Of Issued Invoices"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "Note"
+msgstr "ملاحظة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__notes
+msgid "Notes"
+msgstr "ملاحظات"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_needaction_counter
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_has_error_counter
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_invoice__message_needaction_counter
+#: model:ir.model.fields,help:project_base.field_project_phase__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_invoice__message_has_error_counter
+#: model:ir.model.fields,help:project_base.field_project_phase__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_invoice__message_unread_counter
+#: model:ir.model.fields,help:project_base.field_project_phase__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Odex25 Projects Management"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_project_filter_inherit
+msgid "Open"
+msgstr "فتح"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__state__confirm
+msgid "PM"
+msgstr "مدير المشروع"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__state__draft
+#: model:res.groups,name:project_base.group_project_department_manager
+msgid "PMO"
+msgstr "مدير المشاريع"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "Paid"
+msgstr "مدفعوعة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__payment_amount
+#: model:ir.model.fields,field_description:project_base.field_project_project__total_invoiced_payment
+msgid "Paid Amount"
+msgstr "المبلغ المدفوع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__parent_id
+msgid "Parent Project"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "Partial"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_inherit
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_project_filter_inherit
+msgid "Partner"
+msgstr "الجهة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__plan_payment_date
+msgid "Payment Date"
+msgstr "تاريخ الدفع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__payment_state
+msgid "Payment Status"
+msgstr "حالة الدفع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__product_uom_qty
+msgid "Percentage"
+msgstr "النسبة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Period"
+msgstr "فترة المشروع"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_phase
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__phase_id
+#: model:ir.model.fields,field_description:project_base.field_project_phase__phase_id
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+msgid "Phase"
+msgstr "المرحلة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__name
+msgid "Phase Name"
+msgstr "اسم المرحالة"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_phase_type
+msgid "Phase Type"
+msgstr "المرحلة"
+
+#. module: project_base
+#: code:addons/project_base/models/project_phase.py:0
+#, python-format
+msgid "Phase dates must be between project dates."
+msgstr "يجب أن تكون تواريخ المرحلة بين تواريخ المشروع"
+
+#. module: project_base
+#: code:addons/project_base/models/project_phase.py:0
+#: code:addons/project_base/wizard/edit_project_phase.py:0
+#, python-format
+msgid "Phase start date must be earlier than Phase end date."
+msgstr "يجب أن يكون تاريخ بدء المرحلة أقدم من تاريخ انتهاء المرحلة."
+
+#. module: project_base
+#: model:ir.ui.menu,name:project_base.menu_project_phase
+msgid "Phases"
+msgstr "المراحل"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Planned"
+msgstr "المخطط"
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid "Planned Collection date cannot be earlier than Planned Issue date."
+msgstr "لا يمكن أن يكون تاريخ الدفع أقدم من تاريخ الإستحقاق."
+
+#. module: project_base
+#: code:addons/project_base/models/project.py:0
+#, python-format
+msgid "Please be sure to enter all planned issue dates for invoices."
+msgstr "يرجى التأكد من إدخال جميع تواريخ الإستحقاق  للفواتير."
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid "Please define an accounting sales journal for the company %s (%s)."
+msgstr ""
+
+#. module: project_base
+#: model:ir.actions.report,name:project_base.action_project_invoice_report
+msgid "Print invoice"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__product_id
+msgid "Product"
+msgstr "المنتج"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__progress
+#: model:ir.model.fields,field_description:project_base.field_project_project__progress
+msgid "Progress"
+msgstr "نسبة الانجاز"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_project
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__project_id
+#: model:ir.model.fields,field_description:project_base.field_project_phase__project_id
+#: model:ir.model.fields,field_description:project_base.field_project_team__project_id
+#: model:ir.model.fields.selection,name:project_base.selection__project_task_type__stage_for__project
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_invoice_filter
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid ""
+"Project\n"
+"                                                    Charter"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Project #:"
+msgstr "رقم المشروع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_res_company__module_project_budget
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__module_project_budget
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Project Budget"
+msgstr ""
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.open_project_category_form
+#: model:ir.model.fields,field_description:project_base.field_project_project__category_id
+#: model_terms:ir.ui.view,arch_db:project_base.project_category_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.project_category_tree
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_project_filter_inherit
+msgid "Project Category"
+msgstr "تصنيف المشروع"
+
+#. module: project_base
+#: model:ir.actions.report,name:project_base.report_project_detail
+msgid "Project Charter"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_res_company__module_project_customer_team
+#: model:ir.model.fields,field_description:project_base.field_res_company__module_project_scrum_agile
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__module_project_customer_team
+msgid "Project Customer Team"
+msgstr ""
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.open_project_hold_reason_form
+#: model_terms:ir.ui.view,arch_db:project_base.project_hold_reason_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.project_hold_reason_tree_view
+msgid "Project Hold Reason"
+msgstr "اسباب تعليق المشروع"
+
+#. module: project_base
+#: code:addons/project_base/wizard/project_hold_reason.py:0
+#, python-format
+msgid "Project Hold for %s"
+msgstr "تعليق المشروع لسبب %s"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "Project Info"
+msgstr "معلومات المشروع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_account_bank_statement_line__project_invoice_id
+#: model:ir.model.fields,field_description:project_base.field_account_move__project_invoice_id
+#: model:ir.model.fields,field_description:project_base.field_account_payment__project_invoice_id
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__project_invoice_id
+msgid "Project Invoice"
+msgstr "دفعة المشروع"
+
+#. module: project_base
+#: code:addons/project_base/models/project.py:0
+#, python-format
+msgid "Project Invoice Creation"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_invoice_line
+msgid "Project Invoice Line"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_invoice
+msgid "Project Invoice Request"
+msgstr "طلب فاتورة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_sale_order__project_invoice_count
+#: model_terms:ir.ui.view,arch_db:project_base.project_view_order_form
+msgid "Project Invoices"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "Project Location Info"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_res_company__module_project_metrics
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__module_project_metrics
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Project Metrics"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Project Name"
+msgstr "اسم المشروع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__project_no
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_project_filter_inherit
+msgid "Project Number"
+msgstr "رقم المشروع"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "Project Overview"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task__phase_id
+msgid "Project Phase"
+msgstr ""
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.open_project_phase_type_form
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_type_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_type_tree_view
+msgid "Project Phase Type"
+msgstr ""
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.open_project_phase_form
+#: model:ir.model.fields,field_description:project_base.field_project_project__project_phase_ids
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_tree
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Project Phases"
+msgstr "مراحل المشروع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_res_company__module_project_risk_register
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__module_project_risk_register
+msgid "Project Risk Register"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "Project Schedule Duration"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_detail_qweb_report
+msgid "Project Stages"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__project_team_ids
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Project Team"
+msgstr "فريق المشروع"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Project Type"
+msgstr "نوع المشروع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_res_company__module_project_variation_order
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__module_project_variation_order
+msgid "Project Variation Order"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Project invoicing method."
+msgstr ""
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.create_tast_proj
+msgid "Project's tasks"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Project:"
+msgstr ""
+
+#. module: project_base
+#: model:ir.actions.server,name:project_base.ir_cron_project_invoice_ir_actions_server
+#: model:ir.cron,cron_name:project_base.ir_cron_project_invoice
+#: model:ir.cron,name:project_base.ir_cron_project_invoice
+msgid "Project: Send Invoice Issue Notification"
+msgstr ""
+
+#. module: project_base
+#: model:ir.actions.server,name:project_base.ir_cron_project_status_ir_actions_server
+#: model:ir.cron,cron_name:project_base.ir_cron_project_status
+#: model:ir.cron,name:project_base.ir_cron_project_status
+msgid "Project: Update Project Status"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/sale_order.py:0
+#, python-format
+msgid "Projects Invoices"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Purchase"
+msgstr "المشتريات"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_sale_order_line__phase_qty
+msgid "Quantity"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Re Open"
+msgstr "اعادة فتح"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__edit_reasone
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard__reason
+#: model:ir.model.fields,field_description:project_base.field_project_hold_wizard__reason_id
+msgid "Reason"
+msgstr "الاسباب"
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.action_project_hold
+msgid "Reason for Project Hold"
+msgstr "سبب تعليق المشروع"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_hold_wizard
+msgid "Reason for the Project Hold"
+msgstr "سبب تعليق المشروع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__reason
+#: model:ir.model.fields,field_description:project_base.field_project_phase__reason
+msgid "Reason/Justification"
+msgstr "الاسباب/ المبررات"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__state_id
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Region"
+msgstr "المنطقة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__residual_amount
+#: model:ir.model.fields,field_description:project_base.field_project_project__residual_amount
+msgid "Remaining Amount"
+msgstr "المبلغ المتبقي"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_form_view
+msgid "Reopen"
+msgstr "إعادة فتح"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "Request"
+msgstr "طلب"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_invoice__state__request
+msgid "Requested"
+msgstr "قدم الطلب"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_res_company
+msgid "Res Company SMS Configuration"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_calendar_inherited
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_tree
+msgid "Responsible"
+msgstr "المسؤول"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__activity_user_id
+msgid "Responsible User"
+msgstr "المسؤول"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__type__revenue
+#: model:ir.model.fields.selection,name:project_base.selection__res_company__type__revenue
+msgid "Revenue"
+msgstr "ايرادي"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+msgid "Reversed"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_phase__state__open
+#: model:ir.model.fields.selection,name:project_base.selection__project_project__status__open
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Running"
+msgstr "قيد التنفيذ"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_has_sms_error
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__sale_order_amount
+msgid "SO Total Amount"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_account_bank_statement_line__sale_order_id
+#: model:ir.model.fields,field_description:project_base.field_account_move__sale_order_id
+#: model:ir.model.fields,field_description:project_base.field_account_payment__sale_order_id
+msgid "Sale"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__order_line_id
+msgid "Sale Line"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "فاتورة الدفعة المقدمة للمبيعات"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_sale_order
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__sale_order_id
+msgid "Sales Order"
+msgstr "أمر البيع"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "بند أمر المبيعات"
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_invoice__sale_order_id
+msgid "Sales order to which the project is linked."
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__module_project_scrum_agile
+msgid "Scrum Agile"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_invoice_filter
+msgid "Search Project Invoice"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__sequence
+msgid "Sequence"
+msgstr "متسلسل"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Set to Draft"
+msgstr "ارجاع لمسودة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__signature_date
+msgid "Signature Date"
+msgstr "تاريخ توقيع العقد"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__phase_id
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_form2
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_search_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_tree
+msgid "Stage"
+msgstr "المرحلة"
+
+#. module: project_base
+#: code:addons/project_base/models/project_phase.py:0
+#, python-format
+msgid "Stage Dates has been updated"
+msgstr "تم تحديث تواريخ المرحلة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task_type__stage_for
+msgid "Stage For"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_edit_project_phase__start_date
+#: model:ir.model.fields,field_description:project_base.field_project_phase__start_date
+#: model:ir.model.fields,field_description:project_base.field_project_project__start
+#: model_terms:ir.ui.view,arch_db:project_base.view_phase_search_form
+msgid "Start Date"
+msgstr "تاريخ البداية"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__state
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_calendar_inherited
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_search_form
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_tree
+msgid "State"
+msgstr "الحالة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__state
+#: model:ir.model.fields,field_description:project_base.field_project_phase__state
+#: model:ir.model.fields,field_description:project_base.field_project_project__status
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_project_filter_inherit
+msgid "Status"
+msgstr "الحالة"
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_phase__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__street
+msgid "Street"
+msgstr "الشارع"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Street 2..."
+msgstr "الحي..."
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "Street..."
+msgstr "الشارع ..."
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__street2
+msgid "Street2"
+msgstr "الحي"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__sub_project_id
+msgid "Sub-Project"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Subject-Deliverable(s)"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__price_subtotal
+msgid "Subtotal"
+msgstr "الاجمالي"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Summery"
+msgstr "ملخص"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__tag_ids
+msgid "Tags"
+msgstr "وسوم"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_task
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "Task"
+msgstr "مهمة"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task__task_progress
+msgid "Task Progress"
+msgstr "نسبة الانجاز"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_task_type
+msgid "Task Stage"
+msgstr "مرحلة المهمة"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_form2
+msgid "Task Title..."
+msgstr "اسم المهمة ..."
+
+#. module: project_base
+#: model:ir.actions.act_window,name:project_base.act_project_project_2_project_task_finished
+#: model:ir.actions.act_window,name:project_base.act_project_project_2_project_task_inprogress
+#: model:ir.actions.act_window,name:project_base.act_project_project_2_project_task_new
+#: model:ir.model.fields,field_description:project_base.field_project_phase__task_count
+#: model:ir.model.fields,field_description:project_base.field_project_phase__task_ids
+#: model:ir.model.fields.selection,name:project_base.selection__project_task_type__stage_for__tasks
+#: model_terms:ir.ui.view,arch_db:project_base.project_phase_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid "Tasks"
+msgstr "المهام"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_new_project_kanban
+msgid ""
+"Tasks\n"
+"                                                    Analysis"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__type_ids
+msgid "Tasks Stages"
+msgstr "مراحل المهام"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__tax_id
+msgid "Taxes"
+msgstr "الضرائب"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__tax_amount
+msgid "Taxes Amount"
+msgstr "مبلغ الضريبة"
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_project__invoice_ids
+msgid "The Details of invoice"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_phase.py:0
+#, python-format
+msgid "The Stage %s Dates for project %s Edit ,edit invoice dates accordingly"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project.py:0
+#, python-format
+msgid "The project %s was automatically Closed by system"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_task.py:0
+#, python-format
+msgid "The task progress must be between 0 and 100."
+msgstr "يجب أن تتراوح نسبة انجاز المهمة بين 0 و100."
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid ""
+"The total amount of Downpayment must not exceed it's amount in contract "
+"item: %s "
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid ""
+"The total quantities/Amounts of project invoices must be equal "
+"quantities/Amounts in contract item: %s "
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_task.py:0
+#, python-format
+msgid "The total weights of the tasks for the stage must not exceed 100"
+msgstr "يجب ألا يتجاوز إجمالي أوزان المهام للمرحلة 100"
+
+#. module: project_base
+#: code:addons/project_base/models/project_task.py:0
+#, python-format
+msgid "The weight must be between 0 and 100."
+msgstr "يجب أن يكون الوزن بين 0 و 100."
+
+#. module: project_base
+#: code:addons/project_base/models/project.py:0
+#, python-format
+msgid "This invoice is due and must be issue %s"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__to_invoice
+msgid "To Invoice"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.actions.act_window,help:project_base.act_project_project_2_project_task_finished
+#: model_terms:ir.actions.act_window,help:project_base.act_project_project_2_project_task_inprogress
+#: model_terms:ir.actions.act_window,help:project_base.act_project_project_2_project_task_new
+msgid ""
+"To get things done, use activities and status on tasks.<br>\n"
+" Chat in real time or\n"
+"                by email to collaborate efficiently."
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__to_invoice
+msgid "To invoice"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_tree_view
+msgid "Total"
+msgstr "الاجمالي"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__contract_value
+msgid "Total Contract Value"
+msgstr "إجمالي قيمة العقد"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__total_invoiced_amount
+msgid "Total Invoiced Amount"
+msgstr "المبلغ الاجمالي"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Total Of Collected Invoices"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Total Of Issued Invoices"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__price_tax
+msgid "Total Tax"
+msgstr "الضريبة"
+
+#. module: project_base
+#: code:addons/project_base/models/project_task.py:0
+#, python-format
+msgid ""
+"Total planned hours for all tasks in stage %s must not exceed Total stage "
+"hours %s"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Total residual to collect"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__price_total
+msgid "Total with Taxes"
+msgstr "الإجمالي مع الضرائب"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__project_type
+#: model:ir.model.fields,field_description:project_base.field_project_project__type
+#: model:ir.model.fields,field_description:project_base.field_res_company__type
+#: model:ir.model.fields,field_description:project_base.field_res_config_settings__type
+msgid "Type"
+msgstr "النوع"
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_phase__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__price_unit
+msgid "Unit Price"
+msgstr "المبلغ"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice_line__product_uom
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_unread
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__message_unread_counter
+#: model:ir.model.fields,field_description:project_base.field_project_phase__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "Use Scrum Agile Methodology in your Projects"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.print_project_invoice
+msgid "Variance Days"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_invoice__invoice_type__project
+msgid "Project"
+msgstr "دفعة مشروع"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_invoice__invoice_type__variation_order
+msgid "Variation Order"
+msgstr "دفعة طلب تغير"
+
+#. module: project_base
+#: model:ir.model.fields.selection,name:project_base.selection__project_invoice__invoice_type__consultant
+msgid "Consultant"
+msgstr "دفعة مستشار"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__website_message_ids
+#: model:ir.model.fields,field_description:project_base.field_project_phase__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_invoice__website_message_ids
+#: model:ir.model.fields,help:project_base.field_project_phase__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__weight
+#: model:ir.model.fields,field_description:project_base.field_project_task__weight
+msgid "Weight"
+msgstr "الوزن"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__resource_calendar_id
+msgid "Working Time"
+msgstr "فترة العمل"
+
+#. module: project_base
+#: model:ir.model.fields,help:project_base.field_project_project__resource_calendar_id
+msgid "Working Time used in this project"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project.py:0
+#, python-format
+msgid "You Have been assign As project manger"
+msgstr "لقد تم تعيينك كمدير للمشروع"
+
+#. module: project_base
+#: code:addons/project_base/models/project.py:0
+#, python-format
+msgid ""
+"You Have been assign as a manger for The project %s kindly complete project "
+"data"
+msgstr ""
+
+#. module: project_base
+#: code:addons/project_base/models/project_invoice.py:0
+#, python-format
+msgid "You cannot Request Invoice for Project that is not in Open status!"
+msgstr "لا يمكنك طلب فاتورة لمشروع ليس في حالة مفتوح!"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "ZIP"
+msgstr "الرمز البريدي"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__zip
+msgid "Zip"
+msgstr "الرمز البريدي"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_config_settings_form
+msgid "days"
+msgstr "ايام"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_edit_project_phase
+msgid "edit.project.phase"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_inherit_form
+msgid "estimated_hours"
+msgstr ""
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.view_edit_project_phase_wizard
+#: model_terms:ir.ui.view,arch_db:project_base.view_project_hold_wizard
+msgid "or"
+msgstr "او"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_tree_view
+msgid "payment_amount"
+msgstr "المبلغ الدفوع"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_task__phase_hours
+msgid "phase total hours"
+msgstr ""
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_category
+msgid "project.category"
+msgstr "تصنيف المشروع"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_hold_reason
+msgid "project.hold.reason"
+msgstr "سبب تعليق المشروع"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_hold_wizard
+msgid "project.hold.wizard"
+msgstr "سبب تعليق المشروع"
+
+#. module: project_base
+#: model:ir.model,name:project_base.model_project_team
+msgid "project.team"
+msgstr "فريق المشروع"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_tree_view
+msgid "residual_amount"
+msgstr "المبلغ المتبقي"
+
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__allowed_internal_user_ids
+#: model:ir.model.fields,field_description:project_base.field_project_phase__allowed_internal_user_ids
+#: model:ir.model.fields,field_description:project_base.field_project_project__allowed_internal_user_ids
+#: model:ir.model.fields,field_description:project_base.field_project_task__allowed_internal_user_ids
+msgid "Allowed Internal Users"
+msgstr "المستخدميين الداخليين المسموح لهم"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_invoice__allowed_portal_user_ids
+#: model:ir.model.fields,field_description:project_base.field_project_phase__allowed_portal_user_ids
+#: model:ir.model.fields,field_description:project_base.field_project_project__allowed_portal_user_ids
+#: model:ir.model.fields,field_description:project_base.field_project_task__allowed_portal_user_ids
+msgid "Allowed Portal Users"
+msgstr "المستخدميين البوابة المسموح لهم"
+
+#. module: project_base
+#: model_terms:ir.ui.view,arch_db:project_base.project_invoice_form_view
+#: model_terms:ir.ui.view,arch_db:project_base.view_task_form2
+msgid "Settings Allowed Users"
+msgstr "اعداد صلاحية المستخدمين"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_phase__estimated_hours
+msgid "Allocated By"
+msgstr "ساعات العمل"
+
+#. module: project_base
+#: model:ir.model.fields,field_description:project_base.field_project_project__launch_date
+msgid "Launch date"
+msgstr "تاريخ التسليم"
diff --git a/odex25_project/project_base/models/__init__.py b/odex25_project/project_base/models/__init__.py
new file mode 100644
index 000000000..a16531abf
--- /dev/null
+++ b/odex25_project/project_base/models/__init__.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from . import res_config_setting
+from . import res_company
+from . import project
+from . import project_invoice
+from . import project_phase
+from . import project_task
+from . import sale_order
diff --git a/odex25_project/project_base/models/project.py b/odex25_project/project_base/models/project.py
new file mode 100644
index 000000000..5607aad92
--- /dev/null
+++ b/odex25_project/project_base/models/project.py
@@ -0,0 +1,563 @@
+# -*- coding: utf-8 -*-
+import ast
+import calendar
+from datetime import datetime, time, timedelta
+from dateutil import relativedelta
+from odoo.addons.resource.models.resource import float_to_time, HOURS_PER_DAY
+from odoo.osv import expression
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+    _order = "project_no desc"
+
+    def _get_task_type(self):
+        """
+        :return:  project task type if it default
+        """
+        type_ids = self.env['project.task.type'].search([('is_default', '=', True)])
+        return type_ids
+
+    name = fields.Char("Name", index=True, tracking=True, required=False)
+    project_no = fields.Char("Project Number", default=lambda self: self._get_next_projectno(), tracking=True,
+                             copy=False)
+    category_id = fields.Many2one('project.category', string='Project Category', tracking=True)
+    parent_id = fields.Many2one('project.project', index=True, string='Parent Project', tracking=True)
+    sub_project_id = fields.One2many('project.project', 'parent_id', string='Sub-Project', tracking=True)
+    department_id = fields.Many2one('hr.department', string='Department')
+    consultant_id = fields.Many2one('res.partner', string='Consultant')
+    beneficiary_id = fields.Many2one('res.partner', string='Beneficiary')
+    lessons_learned = fields.Html(string='Lessons learned')
+    launch_date = fields.Datetime("Launch date", tracking=True)
+    start = fields.Date(string="Start Date", index=True, tracking=True)
+    date = fields.Date(string='End Date', index=True, tracking=True)
+    project_phase_ids = fields.One2many('project.phase', 'project_id', string="Project Phases")
+    tag_ids = fields.Many2many('project.tags', string='Tags')
+    type_ids = fields.Many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id',
+                                string='Tasks Stages', default=_get_task_type)
+    priority = fields.Selection([('0', 'Normal'),('1', 'Important'),], default='0', index=True, string="Priority")
+    # address fields
+    street = fields.Char()
+    street2 = fields.Char()
+    zip = fields.Char(change_default=True)
+    country_id = fields.Many2one('res.country', string='Country', default=lambda self: self.env.company.country_id,
+                                 ondelete='restrict', tracking=True)
+    state_id = fields.Many2one("res.country.state", string='Region', ondelete='restrict')
+    city = fields.Char()
+    # Contract fields
+    contract_number = fields.Char(string="Contract Number", tracking=True)
+    signature_date = fields.Date(string="Signature Date", tracking=True)
+    contract_value = fields.Float("Total Contract Value")
+    tax_amount = fields.Float("Taxes Amount")
+    contract_value_untaxed = fields.Float("Contract Value")
+    state = fields.Selection([
+        ('draft', 'PMO'),
+        ('confirm', 'PM'),
+        ('done', 'Done')], string='State', copy=False, default='draft', required=True, tracking=True)
+    status = fields.Selection([
+        ('new', 'New'), ('open', 'Running'),
+        ('hold', 'Hold'), ('close', 'Closed')], string='Status', copy=False, default='new', tracking=True)
+    hold_reason = fields.Text(string="Hold Reason")
+    close_reason = fields.Text(string="Close Reason")
+    project_team_ids = fields.One2many('project.team', 'project_id', string="Project Team")
+    invoice_ids = fields.One2many('project.invoice', 'project_id', "Invoice", copy=False, help="The Details of invoice")
+    total_invoiced_amount = fields.Float('Total Invoiced Amount', compute='compute_total_invoiced_amount')
+    no_of_invoices = fields.Integer(compute='compute_total_invoiced_payment')
+    no_of_paid_invoices = fields.Integer(compute='compute_total_invoiced_payment')
+    total_invoiced_payment = fields.Float('Paid Amount', compute='compute_total_invoiced_payment')
+    residual_amount = fields.Float('Remaining Amount', compute='compute_residual_amount')
+    back_log_amount = fields.Float('Back Log Amount', compute='compute_back_log_amount')
+    # TODO check if this fields needed
+    is_down_payment = fields.Boolean('Down Payment')
+    to_invoice = fields.Boolean(compute="compute_to_invoice", store=True)
+    invoice_method = fields.Selection([
+        ('per_stage', 'Invoicing Per Phase'),
+        ('per_period', 'Invoicing Per Period'),
+    ], string='Invoicing Method', default=lambda self: self.env.company.invoice_method, )
+    invoice_period = fields.Integer(string="Invoicing Every", default=lambda self: self.env.company.invoice_period)
+    resource_calendar_id = fields.Many2one('resource.calendar', string='Working Time',
+                                           default=lambda self: self.env.company.resource_calendar_id, related=False,
+                                           help="Working Time used in this project")
+    sale_order_amount = fields.Monetary("SO Total Amount", tracking=True)
+    type = fields.Selection([
+        ('revenue', 'Revenue'),
+        ('expense', 'Expense'),
+        ('internal', 'Internal')], default=lambda self: self.env.company.type, string='Type')
+    man_hours = fields.Boolean('Man hours', default=False)
+    progress = fields.Float(compute="get_progress", store=True, string="Progress")
+    task_count_all = fields.Integer(compute='_compute_task_count_all', string="All Task Count")
+    task_count_finished = fields.Integer(compute='_compute_task_count_finished', string="Finished Task Count")
+    task_count_new = fields.Integer(compute='_compute_task_count_new', string="New Task Count")
+    task_count_inprogress = fields.Integer(compute='_compute_task_count_inprogress', string="In progress Task Count")
+
+    privacy_visibility = fields.Selection([
+            ('followers', 'Invited internal users'),
+            ('employees', 'All internal users'),
+            ('portal', 'Invited portal users and all internal users'),
+        ],
+        string='Visibility', required=False,
+        default='portal',
+        help="People to whom this project and its tasks will be visible.\n\n"
+            "- Invited internal users: when following a project, internal users will get access to all of its tasks without distinction. "
+            "Otherwise, they will only get access to the specific tasks they are following.\n "
+            "A user with the project > administrator access right level can still access this project and its tasks, even if they are not explicitly part of the followers.\n\n"
+            "- All internal users: all internal users can access the project and all of its tasks without distinction.\n\n"
+            "- Invited portal users and all internal users: all internal users can access the project and all of its tasks without distinction.\n"
+            "When following a project, portal users will get access to all of its tasks without distinction. Otherwise, they will only get access to the specific tasks they are following.")
+
+    allowed_internal_user_ids = fields.Many2many('res.users', 'project_allowed_internal_users_rel',
+                                                 string="Allowed Internal Users", default=lambda self: self.env.user, domain=[('share', '=', False)])
+    allowed_portal_user_ids = fields.Many2many('res.users', 'project_allowed_portal_users_rel', string="Allowed Portal Users", domain=[('share', '=', True)])
+    
+    def get_attached_domain(self):
+        return ['|','|','|',
+            '&',('res_model', '=', 'project.project'),
+            ('res_id', 'in', self.ids),
+            '&',('res_model', '=', 'project.task'),
+            ('res_id', 'in', self.task_ids.ids),
+            '&',('res_model', '=', 'project.invoice'),
+            ('res_id', 'in', self.invoice_ids.ids),
+            '&',('res_model', '=', 'project.phase'),
+            ('res_id', 'in', self.project_phase_ids.ids),
+        ]
+        
+    def _compute_attached_docs_count(self):
+        Attachment = self.env['ir.attachment']
+        for project in self:
+            project.doc_count = Attachment.search_count(self.get_attached_domain())
+    
+    def attachment_tree_view(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('base.action_attachment')
+        action['domain'] = str(self.get_attached_domain())
+        action['context'] = "{'default_res_model': '%s','default_res_id': %d}" % (self._name, self.id)
+        return action
+    def _compute_task_count_all(self):
+        task_data = self.env['project.task'].read_group([('project_id', 'in', self.ids)], ['project_id'],
+                                                        ['project_id'])
+        result = dict((data['project_id'][0], data['project_id_count']) for data in task_data)
+        for project in self:
+            project.task_count_all = result.get(project.id, 0)
+
+    def _compute_task_count_finished(self):
+        task_data = self.env['project.task'].read_group([('project_id', 'in', self.ids),
+                                                         ('stage_id.is_closed', '=', True)], ['project_id'],
+                                                        ['project_id'])
+        result = dict((data['project_id'][0], data['project_id_count']) for data in task_data)
+        for project in self:
+            project.task_count_finished = result.get(project.id, 0)
+
+    def _compute_task_count_new(self):
+        task_data = self.env['project.task'].read_group([('project_id', 'in', self.ids),
+                                                         ('stage_id.sequence', '=', 0)], ['project_id'], ['project_id'])
+        result = dict((data['project_id'][0], data['project_id_count']) for data in task_data)
+        for project in self:
+            project.task_count_new = result.get(project.id, 0)
+
+    def _compute_task_count_inprogress(self):
+        task_data = self.env['project.task'].read_group(
+            [('project_id', 'in', self.ids), ('stage_id.is_closed', '=', False),
+             ('stage_id.fold', '=', False), ('stage_id.sequence', '!=', 0)], ['project_id'], ['project_id'])
+        result = dict((data['project_id'][0], data['project_id_count']) for data in task_data)
+        for project in self:
+            project.task_count_inprogress = result.get(project.id, 0)
+
+    @api.depends('project_phase_ids', 'project_phase_ids.weight', 'project_phase_ids.progress')
+    def get_progress(self):
+        for rec in self:
+            progress = 0.0
+            for phase in rec.project_phase_ids:
+                progress += phase.weight * phase.progress / 100
+            rec.progress = progress
+
+    def compute_total_invoiced_amount(self):
+        for rec in self:
+            rec.total_invoiced_amount = sum(rec.invoice_ids.mapped('amount'))
+
+    def compute_total_invoiced_payment(self):
+        for rec in self:
+            rec.total_invoiced_payment = 0
+            rec.no_of_invoices = 0
+            rec.no_of_paid_invoices = 0
+            if rec.invoice_ids:
+                rec.no_of_invoices = len(rec.invoice_ids)
+                rec.no_of_paid_invoices = len(rec.invoice_ids.sudo().filtered(lambda x: x.invoice_id))
+                rec.total_invoiced_payment = sum(rec.invoice_ids.mapped("payment_amount"))
+
+    @api.depends('total_invoiced_amount', 'total_invoiced_payment')
+    def compute_residual_amount(self):
+        for rec in self:
+            rec.residual_amount = rec.total_invoiced_amount - rec.total_invoiced_payment
+
+    @api.depends('total_invoiced_amount', 'contract_value')
+    def compute_back_log_amount(self):
+        for rec in self:
+            rec.back_log_amount = rec.contract_value - rec.total_invoiced_amount
+
+    @api.model
+    def _get_next_projectno(self):
+        next_sequence = "/ "
+        sequence = self.env['ir.sequence'].search(
+            ['|', ('company_id', '=', self.env.company[0].id), ('company_id', '=', False),
+             ('code', '=', 'project.project')], limit=1)
+        if sequence:
+            next_sequence = sequence.get_next_char(sequence.number_next_actual)
+        return next_sequence
+
+    @api.model
+    def create(self, vals):
+        company_id = vals.get('company_id', self.default_get(['company_id'])['company_id'])
+        self_comp = self.with_company(company_id)
+        if not vals.get('project_no', False):
+            vals['project_no'] = self_comp.env['ir.sequence'].next_by_code('project.project') or '/'
+        return super().create(vals)
+
+    def write(self, vals):
+        """
+        If invoice method=per_stage when add stage create project invoice
+        """
+        line_ids = []
+        res = super(Project, self).write(vals)
+        if self.type != 'internal' and vals.get('project_phase_ids') and self.invoice_method == 'per_stage':
+            phase_ids = self.invoice_ids.mapped('phase_id').ids
+            for line in self.sudo().sale_order_id.order_line:
+                line_ids.append(
+                    (0, 0,
+                     {'order_line_id': line.id, 'product_id': line.product_id.id, 'product_uom': line.product_uom.id,
+                      'price_unit': line.price_unit, 'discount': line.discount, 'tax_id': [(6, 0, line.tax_id.ids)]}))
+            self.invoice_ids = [(0, 0,
+                                 {'name': phase.display_name, 'phase_id': phase.id, 'project_invline_ids': line_ids})
+                                for phase in
+                                self.project_phase_ids.filtered(lambda x: x.id not in phase_ids)]
+        return res
+
+    def name_get(self):
+        res = []
+        for record in self:
+            if record.project_no:
+                res.append((record.id, ("[" + record.project_no + "] " + (record.name or " "))))
+            else:
+                res.append((record.id, record.name))
+        return res
+
+    @api.model
+    def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
+        args = args or []
+        if operator == 'ilike' and not (name or '').strip():
+            domain = []
+        else:
+            connector = '&' if operator in expression.NEGATIVE_TERM_OPERATORS else '|'
+            domain = [connector, ('project_no', operator, name), ('name', operator, name)]
+        return self._search(expression.AND([domain, args]), limit=limit, access_rights_uid=name_get_uid)
+
+    # State funtions
+    def action_draft(self):
+        return self.write({'state': 'draft'})
+
+    def action_confirm(self):
+        for record in self:
+            # Send Notification to Project manger
+            if record.user_id:
+                users = [record.user_id]
+                notification_ids = [(0, 0, {
+                    'res_partner_id': user.partner_id.id,
+                    'notification_type': 'inbox'}) for user in users if user.partner_id]
+                if notification_ids:
+                    self.env['mail.message'].create({
+                        'message_type': "notification",
+                        'body': _(
+                            "You Have been assign as a manger for The project %s kindly complete project data") % record.display_name,
+                        'subject': _("You Have been assign As project manger"),
+                        'partner_ids': [(4, user.partner_id.id) for user in users if users],
+                        'model': record._name,
+                        'res_id': record.id,
+                        'notification_ids': notification_ids,
+                        'author_id': self.env.user.partner_id and self.env.user.partner_id.id})
+            if record.type != 'internal':
+                record.create_project_invoice()
+        return self.write({'state': 'confirm'})
+
+    def action_done(self):
+        for record in self:
+            line_ids = []
+            # check project Stages
+            if record.type != 'internal':
+                if not record.project_phase_ids and record.invoice_method == 'per_stage':
+                    raise ValidationError(_("Kindly Enter project Stage first."))
+        return self.write({'state': 'done'})
+
+    def create_project_invoice(self):
+        """
+        Create Project Invoice in confirm base on invoice_method = per_period 
+        """
+        for record in self:
+            line_ids = []
+            if record.invoice_ids:
+                return True
+            if (record.date and record.start) and record.invoice_method == 'per_period':
+                for line in record.sudo().sale_order_id.order_line.filtered(lambda x: not x.is_downpayment):
+                    line_ids.append(
+                        (0, 0, {'order_line_id': line.id, 'product_id': line.product_id.id,
+                                'product_uom': line.product_uom.id,
+                                'price_unit': line.price_unit, 'discount': line.discount,
+                                'tax_id': [(6, 0, line.tax_id.ids)]}))
+                diff = record.date - record.start
+                project_days = diff.days
+                period = project_days / record.invoice_period
+                invoice_date = record.start + relativedelta.relativedelta(days=record.invoice_period)
+                for rec in range(int(period)):
+                    record.invoice_ids = [(0, 0, {'project_invline_ids': line_ids, 'plan_date': invoice_date})]
+                    invoice_date = invoice_date + relativedelta.relativedelta(days=record.invoice_period)
+
+    def action_view_tasks_analysis(self):
+        """ return the action to see the tasks analysis report of the project """
+        action = self.env['ir.actions.act_window']._for_xml_id('project.action_project_task_user_tree')
+        action_context = ast.literal_eval(action['context']) if action['context'] else {}
+        action_context['search_default_project_id'] = self.id
+        return dict(action, context=action_context)
+
+    def action_creat_tasks(self):
+        action = self.with_context(active_id=self.id, active_ids=self.ids) \
+            .env.ref('project_base.create_tast_proj') \
+            .sudo().read()[0]
+        action['display_name'] = self.name
+        return action
+
+    def action_view_finished_tasks(self):
+        action = self.with_context(active_id=self.id, active_ids=self.ids) \
+            .env.ref('project_base.act_project_project_2_project_task_finished') \
+            .sudo().read()[0]
+        action['display_name'] = self.name
+        return action
+
+    def action_view_inprogress_tasks(self):
+        action = self.with_context(active_id=self.id, active_ids=self.ids) \
+            .env.ref('project_base.act_project_project_2_project_task_inprogress') \
+            .sudo().read()[0]
+        action['display_name'] = self.name
+        return action
+
+    def action_view_new_tasks(self):
+        action = self.with_context(active_id=self.id, active_ids=self.ids) \
+            .env.ref('project_base.act_project_project_2_project_task_new') \
+            .sudo().read()[0]
+        action['display_name'] = self.name
+        return action
+
+    # Status funtions
+    def action_open(self):
+        for rec in self:
+            # check that all invoice planned issue dates is entred
+            invoice_ids = self.invoice_ids.filtered(lambda x: x.plan_date == False)
+            if invoice_ids:
+                raise ValidationError(_('Please be sure to enter all planned issue dates for invoices.'))
+        return self.write({'status': 'open'})
+
+    def action_reopen(self):
+        return self.write({'status': 'open', 'close_reason': False})
+
+    def action_hold(self):
+        return self.write({'status': 'hold'})
+
+    def action_close(self):
+        return self.write({'status': 'close'})
+
+    def action_project_invoice(self):
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.invoice",
+            "name": "project Invoice",
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            "context": {"create": True, "project_id": self.id, 'search_default_project': 1},
+            "domain": [('project_id', '=', self.id)]
+        }
+        return action_window
+
+    def action_paid_invoice(self):
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.invoice",
+            "name": "project Invoice",
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            "context": {"create": True, "project_id": self.id, 'search_default_project': 1},
+            "domain": [('project_id', '=', self.id), ('state', '=', 'done')]
+        }
+        return action_window
+
+    def action_view_expense(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "hr.expense",
+            "name": "Expenses",
+            "views": [[False, "tree"]],
+            "context": {"create": False},
+            "domain": [('analytic_account_id', '=', self.analytic_account_id.id)]
+        }
+        return action_window
+
+    def action_view_purchase(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "purchase.order",
+            "name": "Purchase",
+            "views": [[False, "tree"]],
+            "context": {"create": False},
+            "domain": [('project_id', '=', self.id)]
+        }
+        return action_window
+
+    @api.model
+    def update_project_status(self):
+        """ 
+        this funtion call by cron to close the project if end date come
+        """
+        projects = self.env['project.project'].search([('status', '=', 'open'), ('date', '<=', fields.Date.today())])
+        for record in projects:
+            close_reason = "The Project Auto Closed by system because reach end date %s" % (record.date)
+            record.write({'status': 'close', 'close_reason': close_reason, 'state': 'confirm'})
+            users = [record.user_id]
+            notification_ids = []
+            if users:
+                notification_ids = [(0, 0,
+                                     {
+                                         'res_partner_id': user.partner_id.id,
+                                         'notification_type': 'inbox'
+                                     }
+                                     ) for user in users if user.partner_id]
+            if notification_ids:
+                self.env['mail.message'].create({
+                    'message_type': "notification",
+                    'body': close_reason,
+                    'subject': _("The project %s was automatically Closed by system") % record.display_name,
+                    'partner_ids': [(4, user.partner_id.id) for user in users if users],
+                    'model': record._name,
+                    'res_id': record.id,
+                    'notification_ids': notification_ids,
+                    'author_id': self.env.user.partner_id and self.env.user.partner_id.id
+                })
+
+    @api.model
+    def project_invoice_notification(self):
+        """
+           send notification to PM in invoice date
+        """
+        projects = self.env['project.invoice'].search([])
+        for record in projects:
+            if record.plan_date == datetime.now().date() and not record.invoice_id:
+                record.to_invoice = True
+                user_ids = self.env.ref('project.group_project_manager').users
+                self.env['mail.message'].create({'message_type': "notification",
+                                                 'body': _('This invoice is due and must be issue %s' % (record.name)),
+                                                 'subject': _("Project Invoice Creation"),
+                                                 'partner_ids': [(6, 0, user_ids.mapped('partner_id').ids)],
+                                                 'notification_ids': [(0, 0, {'res_partner_id': user.partner_id.id,
+                                                                              'notification_type': 'inbox'})
+                                                                      for user in user_ids if user_ids],
+                                                 'model': self._name,
+                                                 'res_id': record.project_id.id,
+                                                 })
+            else:
+                record.to_invoice = False
+
+    def create_invoice(self):
+        self.ensure_one()
+        line_id = self.env['project.invoice'].search(
+            [('project_id', '=', self.id), ('to_invoice', '=', True)], limit=1)
+        return {
+            'name': _('Invoices'),
+            'res_model': 'project.invoice',
+            'type': 'ir.actions.act_window',
+            'res_id': line_id.id,
+            'view_mode': 'form',
+        }
+
+    def update_invoices(self, is_down_payment):
+        InvLine = self.env['project.invoice.line']
+        for record in self:
+            if is_down_payment:
+                downpayment_line = record.sale_order_id.mapped('order_line').filtered(lambda l: l.is_downpayment)
+                for line in downpayment_line:
+                    for inv in record.invoice_ids:
+                        if not inv.has_downpayment:
+                            values = {'project_invoice_id': inv.id, 'order_line_id': line.id,
+                                      'product_id': line.product_id.id, 'product_uom': line.product_uom.id,
+                                      'price_unit': line.price_unit, 'product_uom_qty': 0}
+                            InvLine.create(values)
+
+    def create_down_payment(self):
+        ''' Opens a wizard to create down payment '''
+        self.ensure_one()
+        ctx = {
+            'active_model': 'sale.order',
+            'active_ids': self.sale_order_id.ids,
+            'active_id': self.sale_order_id.id,
+            'project_id': self.id,
+        }
+        return {
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'res_model': 'sale.advance.payment.inv',
+            'views': [(False, 'form')],
+            'view_id': False,
+            'target': 'new',
+            'context': ctx,
+        }
+
+    @api.depends('invoice_ids', 'invoice_ids.to_invoice')
+    def compute_to_invoice(self):
+        for rec in self:
+            invoice_id = rec.invoice_ids.filtered(lambda x: x.to_invoice == True)
+            if invoice_id:
+                rec.to_invoice = True
+            else:
+                rec.to_invoice = False
+
+
+class ProjectCategory(models.Model):
+    _name = "project.category"
+
+    name = fields.Char(string="Name")
+    company_id = fields.Many2one('res.company', string="Company", default=lambda self: self.env.user.company_id)
+
+
+class ProjectHoldReason(models.Model):
+    _name = "project.hold.reason"
+
+    name = fields.Char(string="Name")
+    company_id = fields.Many2one('res.company', string="Company", default=lambda self: self.env.user.company_id)
+
+
+class Stage(models.Model):
+    _inherit = 'project.task.type'
+
+    color_gantt = fields.Char(
+        string="Color Task Bar",
+        help="Choose your color for Task Bar",
+        default="rgba(170,170,13,0.53)")
+    stage_for = fields.Selection(
+        string='',
+        selection=[('project', 'Project'),
+                   ('tasks', 'Tasks'), ],
+        required=True, default='project')
+    company_id = fields.Many2one('res.company', string="Company", default=lambda self: self.env.user.company_id)
+    is_default = fields.Boolean(string="Default in new project")
+
+
+class ProjectTeam(models.Model):
+    _name = "project.team"
+
+    employee_id = fields.Many2one('hr.employee', string="Employee")
+    project_id = fields.Many2one('project.project', string="Project")
+    department_id = fields.Many2one('hr.department', related="employee_id.department_id", string="Department")
+    job_id = fields.Many2one('hr.job', related="employee_id.job_id", string="Job")
+    project_job = fields.Char(string="Job In Project")
+
+    @api.onchange('job_id')
+    def _onchange_job(self):
+        if not self.project_job:
+            self.project_job = self.job_id and self.job_id.name or ''
diff --git a/odex25_project/project_base/models/project_invoice.py b/odex25_project/project_base/models/project_invoice.py
new file mode 100644
index 000000000..6708ed10d
--- /dev/null
+++ b/odex25_project/project_base/models/project_invoice.py
@@ -0,0 +1,395 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class ProjectInvoice(models.Model):
+    _name = "project.invoice"
+    _inherit = ['mail.thread']
+    _description = "Project Invoice Request"
+
+    name = fields.Char(string='Description',tracking=True,)
+    phase_id = fields.Many2one('project.phase', string="Stage")
+    invoice_id = fields.Many2one('account.move', string="Invoice")
+    amount = fields.Float(string="Invoice Amount", compute="compute_amount", store=True,tracking=True,)
+    to_invoice = fields.Boolean(string="To invoice", default=False)
+    project_id = fields.Many2one('project.project', string="Project")
+    sale_order_id = fields.Many2one('sale.order', related='project_id.sale_order_id', store=True)
+    company_id = fields.Many2one(related='project_id.company_id', string='Company', store=True, readonly=True)
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('confirm', 'Confirmed'),
+        ('request', 'Requested'),
+        ('done', 'Done'),
+        ('cancel', 'Cancelled'),
+    ],tracking=True, string='Status', readonly=True, copy=False, index=True, default='draft')
+    plan_date = fields.Date(string='Due Date',tracking=True,)
+    # related to invoice_date
+    actual_date = fields.Date(string='Issue Date', compute_sudo=True , compute='_compute_indo_invoice_id')
+    plan_payment_date = fields.Date(string='Payment Date',tracking=True,)
+    # related date of first payment created from invoice
+    actual_payment_date = fields.Date(string='Actual Payment date', compute='get_first_payment_date')
+    project_invline_ids = fields.One2many('project.invoice.line', 'project_invoice_id', string='Lines',
+        domain=[('is_downpayment', '=', False)])
+    project_downinv_ids = fields.One2many('project.invoice.line', 'project_invoice_id', string='Lines',
+        domain=[('is_downpayment', '=', True)])
+    currency_id = fields.Many2one(related="project_id.currency_id", store=True)
+    payment_amount = fields.Monetary(string='Paid Amount', compute="_compute_payment_amount")
+    residual_amount = fields.Monetary('Remaining Amount', compute_sudo=True , compute='_compute_indo_invoice_id')
+    invoice_type = fields.Selection([('project', 'Project'), ('consultant','Consultant'),
+        ('variation_order', 'Variation Order')], string='Invoice Type', default='project')
+    has_downpayment = fields.Boolean(compute="_check_downpayment")
+    payment_state = fields.Selection(selection=[
+        ('not_paid', 'Not Paid'),
+        ('in_payment', 'In Payment'),
+        ('paid', 'Paid'),
+        ('partial', 'Partially Paid'),
+        ('reversed', 'Reversed'),
+        ('invoicing_legacy', 'Invoicing App Legacy')],compute_sudo=True , compute='_compute_indo_invoice_id')
+    project_type = fields.Selection(related='project_id.type')
+
+
+    allowed_internal_user_ids = fields.Many2many('res.users', 'project_invoice_allowed_internal_users_rel',
+                                                 string="Allowed Internal Users", default=lambda self: self.env.user, domain=[('share', '=', False)])
+    allowed_portal_user_ids = fields.Many2many('res.users', 'project_invoice_allowed_portal_users_rel', string="Allowed Portal Users", domain=[('share', '=', True)])
+   
+    @api.depends('invoice_id')
+    def _compute_indo_invoice_id(self):
+        for record in self:
+            record.actual_date = record.invoice_id.invoice_date
+            record.residual_amount = record.invoice_id.amount_residual
+            record.payment_state = record.invoice_id.payment_state
+            
+    @api.depends('project_id', 'project_id.is_down_payment', 'project_downinv_ids')
+    def _check_downpayment(self):
+        for rec in self:
+            rec.has_downpayment = False
+            if rec.project_downinv_ids:
+                rec.has_downpayment = True
+            if rec.project_id and rec.project_id.is_down_payment:
+                rec.has_downpayment = True
+
+    @api.constrains('plan_date', 'plan_payment_date')
+    def _check_plan_dates(self):
+        for rec in self:
+            if rec.plan_date and rec.plan_payment_date:
+                if rec.plan_payment_date < rec.plan_date:
+                    raise ValidationError(_("Planned Collection date cannot be earlier than Planned Issue date."))
+
+    def name_get(self):
+        result = []
+        for record in self.sudo():
+            name = '%s' % (record.name and record.name or record.phase_id.name or '/')
+            result.append((record.id, name))
+        return result
+
+    @api.onchange('phase_id')
+    def _onchange_phase(self):
+        for rec in self:
+            if not rec.name:
+                rec.name = rec.phase_id.display_name
+
+    def get_first_payment_date(self):
+        invoice_payments = []
+        payment = self.env['account.payment'].sudo().search([])
+        for rec in self:
+            payment = payment.filtered(lambda x: rec.invoice_id.id in x.reconciled_invoice_ids.ids)
+
+            if payment:
+                payment_date = payment.mapped('date')
+
+                rec.actual_payment_date = min(payment_date)
+            else:
+                rec.actual_payment_date = False
+
+    @api.depends('invoice_id', 'invoice_id.amount_residual', 'invoice_id.invoice_payments_widget')
+    def _compute_payment_amount(self):
+        for rec in self:
+            rec.payment_amount = rec.invoice_id.amount_total - rec.residual_amount
+
+    def create_invoice(self):
+        action = self.env["ir.actions.actions"]._for_xml_id("account.action_move_out_invoice_type")
+        form_view = [(self.env.ref('account.view_move_form').id, 'form')]
+
+        # if self.invoice_type == 'project':
+        #     for line in self.project_invline_ids:
+        #         line.order_line_id.phase_qty = line.product_uom_qty
+        #     for line in self.project_downinv_ids:
+        #         line.order_line_id.phase_qty = line.product_uom_qty > 0 and (line.product_uom_qty*-1) or line.product_uom_qty
+        #     invoice_id = self.project_id.sale_order_id.\
+        #                 with_context(due_date=self.plan_payment_date, analytic_account_id=self.project_id.analytic_account_id.id).\
+        #                 _create_invoices(final=False)
+        # else:
+        invoice_vals = self.with_company(self.company_id)._prepare_invoice()
+        invoice_line_vals = []
+        for line in self.project_invline_ids:
+            invoice_line_vals.append(
+                (0, 0, line._prepare_invoice_line()
+                 ))
+        invoice_vals['invoice_line_ids'] = invoice_line_vals
+        invoice_id = self.env['account.move'].sudo().with_context(default_move_type='out_invoice').create(invoice_vals)
+        if abs(sum(self.project_downinv_ids.mapped('price_total'))) > abs(
+                sum(self.project_invline_ids.mapped('price_total'))):
+            raise ValidationError(_("Downpayment amount can't be greater than invoiced amount"))
+        self.invoice_id = invoice_id.id
+        # self.project_id.purchase_order_id.invoice_id = invoice_id.id
+        # if self.project_id.type == 'expense' and self.project_id.purchase_order_id:
+        #     self.project_id.purchase_order_id.invoice_ids |= invoice_id
+            # self.project_id.purchase_order_id.invoice_ids | = [4,invoice_id.id]
+        self.state = 'done'
+        action['views'] = form_view
+        action['res_id'] = invoice_id.id
+        return action
+
+    def _prepare_invoice(self):
+        """
+        Prepare the dict of values to create the new invoice for a variation order. This method may be
+        overridden to implement custom invoice generation (making sure to call super() to establish
+        a clean extension chain).
+        """
+        invoice_vals = {}
+        self.ensure_one()
+        journal = self.env['account.move'].sudo().with_context(default_move_type='out_invoice')._get_default_journal()
+        if not journal:
+            raise UserError(_('Please define an accounting sales journal for the company %s (%s).') % (
+                self.company_id.name, self.company_id.id))
+        if self.project_id.type == 'revenue':
+            journal = self.env['account.move'].sudo().with_context(default_move_type='out_invoice')._get_default_journal()
+            invoice_vals = {
+                'move_type': 'out_invoice',
+                'currency_id': self.currency_id.id,
+                'partner_id': self.invoice_type == 'consultant' and self.project_id.consultant_id.id or self.project_id.partner_id.id ,
+                'partner_shipping_id': self.project_id.partner_id.id,
+                'partner_bank_id': self.company_id.partner_id.bank_ids.filtered(
+                    lambda bank: bank.company_id.id in (self.company_id.id, False))[:1].id,
+                'journal_id': journal.id,
+                'invoice_line_ids': [],
+                'company_id': self.company_id.id,
+                'invoice_date_due': self.plan_payment_date,
+            }
+        elif self.project_id.type == 'expense':
+            journal = self.env['account.move'].sudo().with_context(default_move_type='in_invoice')._get_default_journal()
+            invoice_vals = {
+                'move_type': 'in_invoice',
+                'currency_id': self.currency_id.id,
+                'partner_id': self.invoice_type == 'consultant' and self.project_id.consultant_id.id or self.project_id.partner_id.id ,
+                'partner_shipping_id': self.project_id.partner_id.id,
+                'partner_bank_id': self.company_id.partner_id.bank_ids.filtered(
+                    lambda bank: bank.company_id.id in (self.company_id.id, False))[:1].id,
+                'journal_id': journal.id,
+                'invoice_line_ids': [],
+                'purchase_id': self.invoice_type== 'consultant' and False or self.project_id.purchase_order_id.id ,
+                'company_id': self.company_id.id,
+                'invoice_date_due': self.plan_payment_date,
+            }
+        return invoice_vals
+
+
+
+
+    def action_confirm(self):
+        self.ensure_one()
+        self._set_qty_invoiced()
+        if not self.plan_date:
+            raise UserError(_("Kindly Enter Planned Issue Date For this Invoice Request"))
+        self.state = 'confirm'
+        # for rec in self:
+        #     return rec.message_post(body=f'Invoice Data /: {rec.name},{rec.state}')
+
+
+
+
+
+    def action_request(self):
+        self.ensure_one()
+        if self.project_id.status not in ['open']:
+            raise ValidationError(_("You cannot Request Invoice for Project that is not in Open status!"))
+        self._set_qty_invoiced()
+        self.state = 'request'
+        user_ids = self.env.ref('account.group_account_manager').users
+        self.env['mail.message'].create({
+            'message_type': "notification",
+            'body': _("Invoice request created for project %s  and need your action") % self.project_id.project_no,
+            'subject': _("Invoice Request "),
+            'partner_ids': [(6, 0, user_ids.mapped('partner_id').ids)],
+            'notification_ids': [(0, 0, {'res_partner_id': user.partner_id.id, 'notification_type': 'inbox'})
+                                 for user in user_ids if user_ids],
+            'model': self._name,
+            'res_id': self.id,
+            'author_id': self.env.user.partner_id and self.env.user.partner_id.id
+        })
+
+
+    def _set_qty_invoiced(self):
+        for rec in self:
+            for line in rec.project_invline_ids:
+                line.qty_invoiced = line.order_line_id.qty_invoiced
+
+    def action_cancel(self):
+        self.ensure_one()
+        self.state = 'cancel'
+
+    def action_set_to_draft(self):
+        self.ensure_one()
+        self.state = 'draft'
+
+    def action_get_invoice(self):
+        self.ensure_one()
+        view_id = False
+        if self.invoice_type == 'variation_order':
+            view_id = self.env.ref('project_base.project_invoice_vo_form_view').id
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.invoice",
+            "name": "Invoice",
+            'view_mode': 'form',
+            'view_id': view_id,
+            'res_id': self.id,
+            "context": {"create": False, 'active_id': self.id, 'active_ids': self.ids, 'id': self.id},
+            "target": 'new',
+        }
+        return action_window
+
+    @api.depends('project_invline_ids', 'project_invline_ids.product_uom_qty', 'project_downinv_ids',
+                 'project_downinv_ids.product_uom_qty')
+    def compute_amount(self):
+        for rec in self:
+            rec.amount = sum(rec.project_invline_ids.mapped('price_total')) - abs(
+                sum(rec.project_downinv_ids.mapped('price_total')))
+
+
+class ProjectInvoiceLine(models.Model):
+    _name = "project.invoice.line"
+    _description = "Project Invoice Line"
+    _rec_name = "product_id"
+
+    project_invoice_id = fields.Many2one('project.invoice', string='Project Invoice', required=True, ondelete='cascade',
+                                         index=True, copy=False)
+    product_id = fields.Many2one('product.product', string='Product')
+    product_uom_qty = fields.Float(string='Percentage', digits='Product Unit of Measure', required=True, default=0.0)
+    amount = fields.Monetary("Amount")
+    product_uom = fields.Many2one('uom.uom', string='Unit of Measure', )
+    price_unit = fields.Float('Unit Price', digits='Project  Amount', compute="get_price_unit_value")
+    discount = fields.Float(string='Discount (%)', digits='Discount')
+    price_subtotal = fields.Monetary(string='Subtotal', compute="_compute_amount", store=True)
+    price_tax = fields.Float(string='Total Tax', compute="_compute_amount", store=True)
+    price_total = fields.Monetary('Total with Taxes', compute="_compute_amount", store=True)
+    tax_id = fields.Many2many('account.tax', string='Taxes')
+    currency_id = fields.Many2one('res.currency', string='Currency', related="project_invoice_id.currency_id",
+                                  store=True)
+    order_line_id = fields.Many2one('sale.order.line', string="Sale Line")
+    is_downpayment = fields.Boolean(related="order_line_id.is_downpayment", string="Is a down payment", store=True)
+    qty_invoiced = fields.Float(string='Invoiced Quantity', readonly=True, digits='Product Unit of Measure')
+    name = fields.Char()
+    account_id = fields.Many2one(comodel_name='account.account')
+
+    @api.depends("project_invoice_id")
+    def get_price_unit_value(self):
+        for rec in self:
+            rec.price_unit = rec.project_invoice_id.project_id.contract_value_untaxed
+            
+    @api.onchange("price_unit")
+    def get_project_invoice_id(self):
+        for rec in self:
+            rec.product_id = rec.project_invoice_id.project_id.purchase_line_id.product_id
+            rec.tax_id = rec.project_invoice_id.project_id.purchase_line_id.taxes_id
+
+    @api.onchange('amount')
+    def _onchange_amount(self):
+        if self.amount:
+            if self.price_unit > 0:
+                self.product_uom_qty = self.amount / self.price_unit
+            else:
+                self.product_uom_qty = 0
+
+    @api.onchange('product_uom_qty')
+    def _onchange_qty(self):
+        if self.product_uom_qty:
+            self.amount = self.product_uom_qty * self.price_unit
+
+    @api.onchange('order_line_id')
+    def _onchange_order_line_id(self):
+        ''' set all invoice line field.
+        '''
+        if self.order_line_id:
+            self.product_id = self.order_line_id.product_id.id
+            self.product_uom_qty = 1
+            self.product_uom = self.order_line_id.product_uom.id
+            self.price_unit = self.project_invoice_id.project_id.sale_order_amount
+            self.tax_id = self.order_line_id.tax_id.ids
+            self.qty_invoiced = self.order_line_id.qty_invoiced
+
+    @api.depends('product_uom_qty', 'discount', 'price_unit', 'tax_id')
+    def _compute_amount(self):
+        """
+        Compute the amounts of the IV line.
+        """
+        for line in self:
+            price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+            taxes = line.tax_id.compute_all(price, line.currency_id, line.product_uom_qty, product=line.product_id)
+            line.update({
+                'price_tax': sum(t.get('amount', 0.0) for t in taxes.get('taxes', [])),
+                'price_total': taxes['total_included'],
+                'price_subtotal': taxes['total_excluded'],
+            })
+
+    def _prepare_invoice_line(self, **optional_values):
+        """
+        Prepare the dict of values to create the new invoice line for a project invoice line.
+
+        :param qty: float quantity to invoice
+        :param optional_values: any parameter that should be added to the returned invoice line
+        """
+        self.ensure_one()
+        res = {
+            'name': self.name,
+            'account_id': self.account_id.id,
+            'product_id': self.product_id.id,
+            'product_uom_id': self.product_uom.id,
+            'quantity': self.product_uom_qty,
+            'discount': self.discount,
+            'price_unit': self.price_unit,
+            'tax_ids': [(6, 0, self.tax_id.ids)],
+            'analytic_account_id': self.project_invoice_id.project_id.analytic_account_id.id
+        }
+        if self.project_invoice_id.project_id.purchase_order_id and self.project_invoice_id.project_id.type == 'expense'  :
+            res['analytic_account_id'] =  self.project_invoice_id.project_id.purchase_line_id.account_analytic_id.id
+            res['purchase_line_id'] = self.project_invoice_id.project_id.purchase_line_id.id
+            # res['account_id'] = self.project_invoice_id.project_id.purchase_line_id.id
+        return res
+
+    @api.constrains('product_id', 'product_uom_qty', 'amount')
+    def check_product_uom_qty(self):
+        for rec in self.filtered(lambda l: not l.is_downpayment):
+            total_qty = sum(rec.order_line_id.project_invoiceline_ids.mapped('product_uom_qty'))
+            total_amount = sum(rec.order_line_id.project_invoiceline_ids.mapped('amount'))
+            if total_qty > rec.order_line_id.product_uom_qty:
+                if total_amount > rec.order_line_id.price_subtotal:
+                    raise ValidationError(
+                        _("The total quantities/Amounts of project invoices must be equal quantities/Amounts in contract item: %s ") % (
+                            rec.order_line_id.name))
+        for rec in self.filtered(lambda l: l.is_downpayment):
+            total_amount = 0.0
+            for line in rec.order_line_id.project_invoiceline_ids:
+                total_amount += abs(line.amount)
+            if total_amount > rec.order_line_id.price_unit:
+                raise ValidationError(
+                    _("The total amount of Downpayment must not exceed it's amount in contract item: %s ") % (
+                        rec.order_line_id.name))
+
+
+class AccountMove(models.Model):
+    _inherit = "account.move"
+
+    project_invoice_id = fields.Many2one('project.project', string='Project Invoice')
+    sale_order_id = fields.Many2one('sale.order', 'Sale')
+
+
+class AccountMove(models.Model):
+    _inherit = "account.move.line"
+
+    @api.onchange('product_id')
+    def onchange_product_downpayment(self):
+        downpayment_line = self.move_id.sale_order_id.mapped('order_line').filtered(lambda l: l.is_downpayment)
+        if downpayment_line and self.product_id == downpayment_line.product_id:
+            self.sale_line_ids = [(4, downpayment_line.id)]
diff --git a/odex25_project/project_base/models/project_phase.py b/odex25_project/project_base/models/project_phase.py
new file mode 100644
index 000000000..d5d551b2f
--- /dev/null
+++ b/odex25_project/project_base/models/project_phase.py
@@ -0,0 +1,196 @@
+# -*- coding: utf-8 -*-
+
+from datetime import timedelta
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+class ProjectPhaseType(models.Model):
+    _name = "project.phase.type"
+    _description = 'Phase Type'
+
+    name = fields.Char(string="Name")
+    company_id = fields.Many2one('res.company', string="Company", default=lambda self: self.env.user.company_id)
+    
+    
+class ProjectPhase(models.Model):
+    _name = 'project.phase'
+    _description = 'Phase'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+    _order = 'project_id,start_date'
+
+    name = fields.Char(string='Phase Name', compute='_compute_name', store=True)
+    phase_id = fields.Many2one('project.phase.type', string="Phase")
+    sequence = fields.Integer(string='Sequence')
+    project_id = fields.Many2one('project.project', string='Project',ondelete="restrict",
+                                 default=lambda self: self.env.context.get('default_project_id'))
+    start_date = fields.Date(string='Start Date', copy=True)
+    end_date = fields.Date(string='End Date', copy=True)
+    estimated_hours = fields.Float("Allocated By",copy=False)
+    company_id = fields.Many2one('res.company', related="project_id.company_id", string='Company')
+    task_count = fields.Integer(compute="get_task", string='Tasks')
+    task_ids = fields.One2many("project.task",'phase_id',string='Tasks')
+    weight = fields.Float(string="Weight")
+    progress = fields.Float(compute="get_progress", store=True, string="Progress")
+    notes = fields.Text(string='Notes',copy=False)
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('open', 'Running'),
+        ('close', 'Closed')], string='Status',
+        copy=False, default='draft', required=True, readonly=True, tracking=True)
+    # phase_id = fields.Many2one('project.phase', string="Stage")
+
+    allowed_internal_user_ids = fields.Many2many('res.users', 'project_phase_allowed_internal_users_rel',
+                                                 string="Allowed Internal Users", default=lambda self: self.env.user, domain=[('share', '=', False)])
+    allowed_portal_user_ids = fields.Many2many('res.users', 'project_phase_allowed_portal_users_rel', string="Allowed Portal Users", domain=[('share', '=', True)])
+    # allowed_user_ids = fields.Many2many('res.users', compute='_compute_allowed_users', inverse='_inverse_allowed_user')
+    
+    # @api.depends('allowed_internal_user_ids', 'allowed_portal_user_ids')
+    # def _compute_allowed_users(self):
+    #     for project in self:
+    #         users = project.allowed_internal_user_ids | project.allowed_portal_user_ids
+    #         project.allowed_user_ids = users
+
+    # def _inverse_allowed_user(self):
+    #     for project in self:
+    #         allowed_users = project.allowed_user_ids
+    #         project.allowed_portal_user_ids = allowed_users.filtered('share')
+    #         project.allowed_internal_user_ids = allowed_users - project.allowed_portal_user_ids
+
+    def write(self, values):
+        if 'start_date' in values or 'end_date' in values:
+            #send notification to pm to edit ivoice date
+            if self.project_id.user_id:
+                users = [self.project_id.user_id]
+                notification_ids = [(0, 0,
+                                     {
+                                         'res_partner_id': user.partner_id.id,
+                                         'notification_type': 'inbox'
+                                     }
+                                     ) for user in users if user.partner_id]
+
+                if notification_ids:
+                    self.env['mail.message'].create({
+                        'message_type': "notification",
+                        'body': _(
+                            "The Stage %s Dates for project %s Edit ,edit invoice dates accordingly") % (self.display_name,self.project_id.display_name),
+                        'subject': _("Stage Dates has been updated"),
+                        'partner_ids': [(4, user.partner_id.id) for user in users if users],
+                        'model': self._name,
+                        'res_id': self.id,
+                        'notification_ids': notification_ids,
+                        'author_id': self.env.user.partner_id and self.env.user.partner_id.id
+                    })
+        if self._context.get('open_from',False):
+            if self._context.get('open_from',False) == 'vo':
+                vo_id = self._context.get('vo_id',[])
+                vo = self.env['project.variation.order'].browse(vo_id)
+                message = str('from ' + (vo and vo.name or "VO"))
+                if self._context.get('edit_reasone',False):
+                    message = message + _(" For Reasone: %s"%(self._context.get('edit_reasone'," ")))
+            else:
+                message = _("From Project For Reasone: %s"%(self._context.get('edit_reasone'," ")))
+                
+            body = _("<p style='color: #FF0000;'><b>Project Phase updated %s</b></p><ul>"%( message ))
+            fields = self.fields_get()
+            old_values = self.read(values.keys())[0]
+            for k, v in values.items():
+                field = fields.get(k)
+                if field['type'] == 'selection':
+                    val = dict(field['selection'])[v]
+                    old_val = dict(field['selection'])[old_values[k]]
+                elif field['type'] == 'many2one':
+                    val = self.env[field['relation']].sudo().browse(v).name_get()[0][1]
+                    old_val = old_values[k][1]
+                elif field['type'] == 'many2many':
+                    val = ""
+                    old_val = ""
+                    for mv in v:
+                        val += self.env[field['relation']].sudo().browse(mv).name_get()[0][1] +"  "
+                else:
+                    val = v
+                    old_val = old_values[k]
+                body += "<li>%s: %s -> %s</li>" % (field['string'], old_val, val)
+            body += "</ul>"
+            self.env['mail.message'].create({
+                'body': body,
+                'model': 'project.phase',
+                'res_id': self.id,
+                'subtype_id': '2',
+            })
+        return super(ProjectPhase, self).write(values)
+
+    def unlink(self):
+        for rec in self:
+            invoice_ids = self.env['project.invoice'].search([('phase_id','=',rec.id), ('project_id', '=', rec.project_id.id)])
+            invoice_ids.unlink()
+        super(ProjectPhase, self).unlink()
+
+    @api.depends('task_ids.weight', 'task_ids.task_progress','task_ids')        
+    def get_progress(self):
+        for rec in self:
+            progress = 0.0
+            if rec.task_ids:
+                done_task = self.env['project.task'].search([('phase_id', '=', rec.id)])
+                # import pdb
+                # pdb.set_trace()
+                progress =  ((sum([x.weight * x.task_progress for x in done_task]))  / 100)
+                # progress = round(100.0 * float((len(done_task) / len(rec.task_ids))), 2)
+            rec.progress = progress
+            
+    @api.constrains('start_date', 'end_date')
+    def _check_dates(self):
+        for rec in self:
+            if rec.filtered(lambda c: c.end_date and c.start_date > c.end_date):
+                raise ValidationError(_('Phase start date must be earlier than Phase end date.'))
+            if rec.project_id.start and rec.project_id.date and (rec.start_date < rec.project_id.start or rec.start_date > rec.project_id.date) or \
+               (rec.end_date < rec.project_id.start or rec.end_date > rec.project_id.date):
+                raise ValidationError(_('Phase dates must be between project dates.'))
+
+    def action_draft(self):
+        return self.write({'state': 'draft'})
+
+    def action_confirm(self):
+        for rec in self:
+            if not rec.start_date or not rec.end_date:
+                raise ValidationError(_('Make sure that stage dates is set.'))
+        return self.write({'state': 'open'})
+
+    def action_close(self):                
+        return self.write({'state': 'close'})
+
+    def action_reopen(self):
+        return self.write({'state': 'open'})
+
+    @api.depends('phase_id')
+    def _compute_name(self):
+        for rec in self:
+            rec.name = rec.phase_id.name
+
+    def action_project_phase_task(self):
+        self.ensure_one()
+        return {
+            'name': 'Tasks',
+            'type': 'ir.actions.act_window',
+            'view_mode': 'tree,form',
+            'res_model': 'project.task',
+            'domain': [('phase_id', '=', self.id)],
+        }
+
+    def action_view_project_invoice(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.invoice",
+            "name": "Invoice Requests",
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            "context": {"create": False, "edit": False},
+            "domain": [('phase_id', '=', self.id), ('project_id', '=', self.project_id.id)]
+        }
+        return action_window
+
+    def get_task(self):
+        for rec in self:
+            records = self.env['project.task'].search([('phase_id', '=', rec.id)])
+            rec.task_count = len(records)
+
diff --git a/odex25_project/project_base/models/project_task.py b/odex25_project/project_base/models/project_task.py
new file mode 100644
index 000000000..ac9fe59d3
--- /dev/null
+++ b/odex25_project/project_base/models/project_task.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+from datetime import datetime, time, timedelta
+from dateutil import relativedelta
+from odoo.addons.resource.models.resource import float_to_time, HOURS_PER_DAY
+from odoo.osv import expression
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError ,Warning
+
+
+class ProjectTask(models.Model):
+    _inherit = "project.task"
+
+    
+    phase_id = fields.Many2one('project.phase', string='Project Phase', domain="[('project_id','=',project_id)]")
+    phase_hours = fields.Float("phase total hours",related="phase_id.estimated_hours")
+    user_ids = fields.Many2many('res.users', 'project_task_users',
+                                'task_id', 'users_id', string="Employees")
+    weight = fields.Float(string='Weight', )
+    task_progress = fields.Float(string='Task Progress')
+    maximum_rate = fields.Float(string='Maximum Rate', default=1)
+    
+    allowed_internal_user_ids = fields.Many2many('res.users', 'project_task_allowed_internal_users_rel',
+                                                 string="Allowed Internal Users", default=lambda self: self.env.user, domain=[('share', '=', False)])
+    allowed_portal_user_ids = fields.Many2many('res.users', 'project_task_allowed_portal_users_rel', string="Allowed Portal Users", domain=[('share', '=', True)])
+   
+
+    @api.constrains('task_progress' , 'weight')
+    def _check_task_weight_progress(self):
+        for record in self:
+            if record.task_progress < 0 or record.task_progress > 100:
+                raise ValidationError(_("The task progress must be between 0 and 100."))
+            if record.weight < 0 or record.weight > 100:
+                raise ValidationError(_("The weight must be between 0 and 100."))
+
+    @api.onchange('weight')
+    def _onchange_weight(self):
+        done_task = self.env['project.task'].search([('phase_id', '=', self.phase_id.id),('id','!=',self._origin.id)])
+        weight_done = done_task.mapped('weight')
+        sum_weight = sum(weight_done) + self.weight
+        if sum_weight > 100:
+            raise ValidationError(_("The total weights of the tasks for the stage must not exceed 100"))
+                
+    
+    
+    @api.onchange('project_id')
+    def _onchange_project_id(self):
+        for task in self:
+            self.phase_id = False
+
+    @api.constrains("phase_hours", "planned_hours")
+    def _check_dept_hours(self):
+        for record in self:
+            plan_hours = sum(record.phase_id.mapped("task_ids").mapped("planned_hours"))
+            if plan_hours > record.phase_hours:
+                raise ValidationError(
+                    _("Total planned hours for all tasks in stage %s must not exceed Total stage hours %s") % (
+                        record.phase_id.display_name, record.phase_hours))
+
+
+
+
+
+
diff --git a/odex25_project/project_base/models/res_company.py b/odex25_project/project_base/models/res_company.py
new file mode 100644
index 000000000..a57eb30f8
--- /dev/null
+++ b/odex25_project/project_base/models/res_company.py
@@ -0,0 +1,22 @@
+from odoo import models, fields, _
+
+
+class ResCompany(models.Model):
+    _inherit = 'res.company'
+
+    invoice_method = fields.Selection([
+        ('per_stage', 'Invoicing per Stage'),
+        ('per_period', 'Invoicing per Period'),
+        ], default='per_stage', string='Invoicing Method')
+    invoice_period = fields.Integer(string="Invoicing Period",default=30)
+    module_project_risk_register = fields.Boolean(string="Project Risk Register")
+    module_project_customer_team = fields.Boolean(string="Project Customer Team")
+    module_project_scrum_agile = fields.Boolean(string="Project Customer Team")
+    module_project_helpdisk_task = fields.Boolean(string="Link with Helpdisk")
+    module_project_variation_order = fields.Boolean(string="Project Variation Order")
+    module_project_metrics = fields.Boolean(string="Project Metrics")
+    module_project_budget = fields.Boolean(string="Project Budget")
+    type = fields.Selection([('revenue', 'Revenue'),
+                             ('expense', 'Expense'),
+                             ('internal', 'Internal')], default='revenue',string='Type')
+
diff --git a/odex25_project/project_base/models/res_config_setting.py b/odex25_project/project_base/models/res_config_setting.py
new file mode 100644
index 000000000..6ec7b0f6b
--- /dev/null
+++ b/odex25_project/project_base/models/res_config_setting.py
@@ -0,0 +1,17 @@
+from odoo import models, fields, _, api
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    invoice_method = fields.Selection(string='Invoicing Method',related='company_id.invoice_method',readonly=False)
+    invoice_period = fields.Integer(string="Invoicing Period",related='company_id.invoice_period',readonly=False)
+    module_project_risk_register = fields.Boolean(string="Project Risk Register",related='company_id.module_project_risk_register',readonly=False)
+    module_project_customer_team = fields.Boolean(string="Project Customer Team",related='company_id.module_project_customer_team',readonly=False)
+    module_project_scrum_agile = fields.Boolean(string="Scrum Agile",related='company_id.module_project_scrum_agile',readonly=False)
+    module_project_helpdisk_task = fields.Boolean(string="Link with Helpdisk",related='company_id.module_project_helpdisk_task',readonly=False)
+    module_project_variation_order = fields.Boolean(string="Project Variation Order",related='company_id.module_project_variation_order',readonly=False)
+    module_project_metrics = fields.Boolean(string="Project Metrics",related='company_id.module_project_metrics',readonly=False)
+    module_project_budget = fields.Boolean(string="Project Budget",related='company_id.module_project_budget',readonly=False)
+    type = fields.Selection([('revenue', 'Revenue'),
+                             ('expense', 'Expense')], string='Type',related='company_id.type',readonly=False)
diff --git a/odex25_project/project_base/models/sale_order.py b/odex25_project/project_base/models/sale_order.py
new file mode 100644
index 000000000..f5e4240e9
--- /dev/null
+++ b/odex25_project/project_base/models/sale_order.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+
+
+class SaleOrder(models.Model):
+    _inherit = "sale.order"
+
+    project_invoice_count = fields.Integer(string='Project Invoices', compute='_compute_project_inv_ids')
+
+
+    def _prepare_invoice(self):
+        self.ensure_one()
+        invoice_vals = super(SaleOrder, self)._prepare_invoice()
+        if self.project_ids.type == 'revenue':
+            invoice_vals['journal_id'] = self.env['account.move'].with_context(default_move_type='out_invoice')._get_default_journal().id
+            invoice_vals['move_type'] =  'out_invoice'
+        elif self.project_ids.type == 'expense':
+            invoice_vals['journal_id'] = self.env['account.move'].with_context(default_move_type='in_invoice')._get_default_journal().id
+            invoice_vals['move_type'] = 'in_invoice'
+        invoice_vals['invoice_date_due'] = self._context.get('due_date')
+        invoice_vals['sale_order_id'] = self.id
+        return invoice_vals
+
+    @api.depends('project_ids')
+    def _compute_project_inv_ids(self):
+        for order in self:
+            project_invoice_count = self.env['project.invoice'].sudo().search([('project_id', 'in', order.project_ids.ids)])
+            order.project_invoice_count = len(project_invoice_count)
+
+    def action_view_project_invoice(self):
+        self.ensure_one()
+        action = {
+            'type': 'ir.actions.act_window',
+            'domain': [('project_id', 'in', self.project_ids.ids)],
+            'context': {'create': False},
+            'view_mode': 'tree,form',
+            'name': _('Projects Invoices'),
+            'res_model': 'project.invoice',
+        }
+        return action
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    phase_qty = fields.Float(string='Quantity', digits='Product Unit of Measure')
+
+    project_invoiceline_ids = fields.One2many('project.invoice.line', 'order_line_id', 'Invoice Line')
+
+    def _prepare_invoice_line(self, **optional_values):
+
+        vals = super(SaleOrderLine, self)._prepare_invoice_line()
+        vals['quantity'] = self.phase_qty if self.is_downpayment == False else self.qty_to_invoice
+        vals['analytic_account_id'] = self._context.get('analytic_account_id')
+        return vals
diff --git a/odex25_project/project_base/report/project_invoice_report_templates.xml b/odex25_project/project_base/report/project_invoice_report_templates.xml
new file mode 100644
index 000000000..91343185c
--- /dev/null
+++ b/odex25_project/project_base/report/project_invoice_report_templates.xml
@@ -0,0 +1,156 @@
+<odoo>
+
+
+    <template id="print_project_invoice">
+        <t t-call="web.html_container">
+            <t t-foreach="docs" t-as="o">
+                <t t-call="web.external_layout">
+                <t t-set="o" t-value="o.with_context(lang=lang)"/>
+                <div class="page">
+                    <h2>Invoices Report</h2>
+                    <h2>Project: <span t-field="o.display_name"/></h2>
+                    <div style="margin-bottom:20px;margin-top:20px;">
+                        <sapn>Summery</sapn>
+                    </div>
+                    <table style="width:80%;margin-bottom:25px;margin-left:25px;">
+                        <tr>
+                            <td style="width:50%;">
+                                <sapn>No.Of Issued Invoices</sapn>
+                            </td>
+                            <td style="border: 1px solid gray;width:30%;text-align: center;">
+                                <span t-field="o.no_of_invoices"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="">
+                                <sapn>Total Of Issued Invoices</sapn>
+                            </td>
+                            <td style="border: 1px solid gray;text-align: center">
+                                <span t-field="o.total_invoiced_amount"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="">
+                                <sapn>Total Of Collected Invoices</sapn>
+                            </td>
+                            <td style="border: 1px solid gray;text-align: center;">
+                                <span t-field="o.total_invoiced_payment"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="">
+                                <sapn>Total residual to collect</sapn>
+                            </td>
+                            <td style="border: 1px solid gray;text-align: center;">
+                                <span t-field="o.residual_amount"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="">
+                                <sapn>Contract Amount</sapn>
+                            </td>
+                            <td style="border: 1px solid gray;text-align: center;">
+                                <span t-field="o.sale_order_amount"/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="">
+                                <sapn>Back Log Amount</sapn>
+                            </td>
+                            <td style="border: 1px solid gray;text-align: center;">
+                                <span t-field="o.back_log_amount"/>
+                            </td>
+                        </tr>
+                    </table>
+                    <table style="width=100%"  class="table table-sm">
+                        <thead>
+                            <tr>
+                                <th style="width:5%">
+                                    <sapn>Invoice No</sapn>
+                                </th>
+                                <th style="width:15%">
+                                    <sapn>Subject-Deliverable(s)</sapn>
+                                </th>
+                                <th style="width:15%">
+                                    <sapn>Planned</sapn>
+                                </th>
+                                <th style="width:15%">
+                                    <sapn>Actual Forcast-Issue</sapn>
+                                </th>
+                                <th style="width:10%">
+                                    <sapn>Variance Days</sapn>
+                                </th>
+                                <th style="width:15%">
+                                    <span>Status</span>
+                                </th>
+                                <th style="width:10%">
+                                    <span>Amount</span>
+                                </th>
+                                <th style="width:15%">
+                                    <sapn>Expected Collection Date</sapn>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <t t-set="counter" t-value="1"/>
+                            <t t-foreach="o.invoice_ids" t-as="record">
+                                <tr t-att-style="record.invoice_type == 'variation_order' and 'color:#0000FF' or None">
+                                    <td style="text-align:center">
+                                        <t t-esc="counter"/>
+                                    </td>
+                                    <td style="text-align:center">
+                                        <t t-if="record.phase_id">
+                                            <t t-esc="record.phase_id.name"/>
+                                        </t>
+                                        <t t-if="record.name">
+                                            <t t-esc="record.name"/>
+                                        </t>
+                                    </td>
+                                    <td style="text-align:center">
+                                        <t t-esc="record.plan_date"/>
+                                    </td>
+                                    <td style="text-align:center">
+                                        <t t-esc="record.actual_date"/>
+                                    </td>
+                                    <td style="text-align:center">
+                                        <t t-if="record.actual_date">
+                                            <t t-set="from_date"
+                                               t-value="datetime.datetime.strptime(str(record.plan_date), '%Y-%m-%d').date()"/>
+                                            <t t-set="date_to"
+                                               t-value="datetime.datetime.strptime(str(record.actual_date), '%Y-%m-%d').date()"/>
+                                            <t t-esc="(date_to - from_date).days"/>
+                                        </t>
+                                    </td>
+                                    <td style="text-align:center">
+                                        <t t-if="record.invoice_id">
+                                            <span>
+                                                Yes
+                                            </span>
+                                        </t>
+                                        <t t-else="">
+                                            <span>
+                                                No
+                                            </span>
+                                        </t>
+                                    </td>
+                                    <td style="text-align:center">
+                                        <span t-field="record.amount"/>
+                                    </td>
+                                    <td style="text-align:center">
+                                        <span t-field="record.plan_payment_date"/>
+                                    </td>
+                                </tr>
+                                <t t-set="counter" t-value="counter + 1"/>
+                            </t>
+                        </tbody>
+                    </table>
+                    <br/><br/>
+                </div>
+            </t>
+        </t>
+        </t>
+
+    </template>
+
+
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_base/report/project_report_templates.xml b/odex25_project/project_base/report/project_report_templates.xml
new file mode 100644
index 000000000..ca3015e53
--- /dev/null
+++ b/odex25_project/project_base/report/project_report_templates.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+<template id="project_detail_qweb_report" name="project_detail_qweb_report">
+    <t t-call="web.html_container">
+    <t t-foreach="docs" t-as="e">
+        <t t-call="web.external_layout">
+            <div class="page">
+                <form>
+                    <div class="container">
+                        <tr class="text-center">
+                            <th>
+                                <t t-if="e.name">
+                                    <h2 class="text-center">
+                                        <b>
+                                            <span t-field="e.project_no"/>
+                                        </b>
+                                        -
+                                        <b>
+                                            <span t-field="e.name"/>
+                                        </b>
+                                    </h2>
+                                </t>
+                            </th>
+                        </tr>
+                        <table class="table table-borderless">
+                                <tr>
+                                    <td colspan="4" class="text-muted"><h4>Project Info</h4></td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b>Sale Order</b>
+                                    </td>
+                                    <td>
+                                        <span t-field="e.sale_order_id.name"/>
+                                    </td>
+                                    <td>
+                                        <b>Project Manager</b>
+                                    </td>
+                                    <td>
+                                        <span t-field="e.user_id.name"/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b>Customer</b>
+                                    </td>
+                                    <td>
+                                        <div t-field="e.partner_id" t-options="{&quot;widget&quot;: &quot;contact&quot;, &quot;fields&quot;: [&quot;address&quot;, &quot;name&quot;], &quot;no_marker&quot;: True}"/>
+                                    </td>
+                                </tr>
+
+                                <tr>
+                                    <h2>
+                                        <b>
+                                            <td colspan="4" class="text-muted"><h4>Project Location Info</h4></td>
+                                        </b>
+                                    </h2>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b>Country</b>
+                                    </td>
+                                    <td>
+                                        <span t-field="e.country_id.name"/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b>Project Category</b>
+                                    </td>
+                                    <td>
+                                        <t t-if="e.category_id">
+                                            <span t-field="e.category_id.name"/>
+                                        </t>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <h2>
+                                        <b>
+                                            <td colspan="4" class="text-muted"><h4>Project Schedule Duration</h4></td>
+                                        </b>
+                                    </h2>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b>Start Date</b>
+                                    </td>
+                                    <td>
+                                        <span t-field="e.start"/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b>Finish Date</b>
+                                    </td>
+                                    <td>
+                                        <span t-field="e.date"/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <b>Kick-Off Date</b>
+                                    </td>
+                                    <td>
+                                        <span t-field="e.launch_date"/>
+                                    </td>
+                                    <td>
+                                        
+                                    </td>
+                                    <td>
+                                        
+                                    </td>
+                                </tr>
+                            </table>
+                             <p style="page-break-before:always;"> </p>
+                            <table class="table table-bordered">
+                                 <tr>
+                                    <h2>
+                                        <b>
+                                            <td colspan="4" class="text-muted"><h4>Project Stages</h4></td>
+                                        </b>
+                                    </h2>
+                                </tr>
+                                <tr>
+                                    <td colspan="2">
+                                        <b>#</b>
+                                    </td>
+                                    <td colspan="2">
+                                        <b>stage</b>
+                                    </td>
+                                </tr>
+                                <t t-set="counter" t-value="0"/>
+                                 <t t-foreach="e.project_phase_ids" t-as="p">
+                                    <t  t-set="counter" t-value="counter + 1"/>
+                                    <tr>
+                                        <td colspan="2">
+                                            <span t-esc="counter"/>
+                                        </td>
+                                        <td colspan="2">
+                                            <span t-esc="p.name"/>
+                                        </td>
+                                    </tr>
+                                </t>
+                            </table>
+                            <table class="table table-borderless">
+                                <tr>
+                                    <h2>
+                                        <b>
+                                            <td colspan="4" class="text-muted"><h4>Description</h4></td>
+                                        </b>
+                                    </h2>
+                                </tr>
+                                <tr rowspan="4">
+                                    <td colspan="4">
+                                        <span t-field="e.description"/>
+                                    </td>
+                                </tr>
+                        </table>
+                        
+                    </div>
+                </form>
+            </div>
+        </t>
+    </t>
+    </t>
+</template>
+</odoo>
diff --git a/odex25_project/project_base/report/project_reports.xml b/odex25_project/project_base/report/project_reports.xml
new file mode 100644
index 000000000..4f43a6cdf
--- /dev/null
+++ b/odex25_project/project_base/report/project_reports.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <report id="report_project_detail"
+            model="project.project"
+            report_type="qweb-pdf"
+            name="project_base.project_detail_qweb_report"
+            file="project_base.project_detail_qweb_report"
+            string="Project Charter"/>
+
+    <record id="paperformat_project_invoice" model="report.paperformat">
+        <field name="name">A4 for E-Invoice</field>
+        <field name="default" eval="False"/>
+        <field name="format">A4</field>
+        <field name="orientation">Portrait</field>
+        <field name="margin_top">0</field>
+        <field name="margin_bottom">5</field>
+        <field name="margin_left">7</field>
+        <field name="margin_right">7</field>
+        <field name="header_line" eval="False"/>
+        <field name="header_spacing">10</field>
+    </record>
+    <record id="action_project_invoice_report" model="ir.actions.report">
+        <field name="name">Print invoice</field>
+        <field name="model">project.project</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">project_base.print_project_invoice</field>
+        <field name="report_file">project_base.print_project_invoice</field>
+        <field name="paperformat_id" ref="project_base.paperformat_project_invoice"/>
+        <field name="binding_type">report</field>
+    </record>
+
+
+</odoo>
diff --git a/odex25_project/project_base/security/ir.model.access.csv b/odex25_project/project_base/security/ir.model.access.csv
new file mode 100644
index 000000000..94ec82da6
--- /dev/null
+++ b/odex25_project/project_base/security/ir.model.access.csv
@@ -0,0 +1,23 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_category,project.category,model_project_category,project.group_project_user,1,1,1,1
+access_project_phase_manager,project.phase.manager,model_project_phase,project.group_project_user,1,1,1,1
+access_project_phase_user,project.phase.internal.user,model_project_phase,project.group_project_user,1,1,1,1
+access_project_phase_int_user,project.phase.user,model_project_phase,base.group_user,1,0,0,0
+access_project_invoice,project.invoice,model_project_invoice,project.group_project_user,1,1,1,1
+access_project_invoice_line,project.invoice.line,model_project_invoice_line,project.group_project_user,1,1,1,1
+access_project_hold_reason,project.hold.reason,model_project_hold_reason,,1,1,1,1
+access_project_hold_wizard,project.hold.wizard,model_project_hold_wizard,,1,1,1,1
+access_edit_project_phase,edit.project.phase,model_edit_project_phase,project.group_project_user,1,1,1,1
+access_project_tasks_department_manager,project.tasks.department.manager,model_project_task,project_base.group_project_department_manager,1,1,1,1
+sale_advance_payment_inv_account,sale.advance.payment.inv,sale.model_sale_advance_payment_inv,account.group_account_manager,1,1,1,1
+project.access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,0,0
+access_project_project_super_user,project.project,model_project_project,project_base.group_project_department_manager,1,1,1,1
+access_project_team_user,project.team,model_project_team,project.group_project_user,1,1,1,1
+access_project_phase_type_manager,project.phase.type.manager,model_project_phase_type,project.group_project_manager,1,1,1,1
+access_project_phase_type_user,project.phase.internal.type.user,model_project_phase_type,project.group_project_user,1,1,1,0
+access_project_phase_type_int_user,project.phase.type.user,model_project_phase_type,base.group_user,1,0,0,0
+
+
+access_account_move_manager,project.account.move.manager,account.model_account_move,project.group_project_manager,1,1,1,0
+access_account_move_line_manager,project.account.move.line.manager,account.model_account_move_line,project.group_project_manager,1,1,1,0
+access_account_partial_reconcile_manager,project.account.partial.reconcile.manager,account.model_account_partial_reconcile,project.group_project_manager,1,1,1,0
\ No newline at end of file
diff --git a/odex25_project/project_base/security/ir_rule_allow_users.xml b/odex25_project/project_base/security/ir_rule_allow_users.xml
new file mode 100644
index 000000000..659378e0e
--- /dev/null
+++ b/odex25_project/project_base/security/ir_rule_allow_users.xml
@@ -0,0 +1,63 @@
+<odoo>
+    <data noupdate="0">
+        <!--  (project.project) -->
+        <record id="project_project_rule_internal_users" model="ir.rule">
+            <field name="name">Project: Internal Users Access</field>
+            <field name="model_id" ref="project.model_project_project"/>
+            <field name="domain_force">[('allowed_internal_user_ids', 'in', user.ids)]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+        <record id="project.project_project_rule_portal" model="ir.rule">
+            <field name="name">Project: Portal Users Access</field>
+            <field name="model_id" ref="project.model_project_project"/>
+            <field name="domain_force">[('allowed_portal_user_ids', 'in', user.ids)]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        </record>
+
+        <!--  (project.phase) -->
+        <record id="project_phase_rule_internal_users" model="ir.rule">
+            <field name="name">Phase: Internal Users Access</field>
+            <field name="model_id" ref="project_base.model_project_phase"/>
+            <field name="domain_force">[('allowed_internal_user_ids', 'in', user.ids)]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+        <record id="project_phase_rule_portal_users" model="ir.rule">
+            <field name="name">Phase: Portal Users Access</field>
+            <field name="model_id" ref="project_base.model_project_phase"/>
+            <field name="domain_force">[('allowed_portal_user_ids', 'in', user.ids)]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        </record>
+
+        <!--  (project.invoice) -->
+        <record id="project_invoice_rule_internal_users" model="ir.rule">
+            <field name="name">Invoice: Internal Users Access</field>
+            <field name="model_id" ref="project_base.model_project_invoice"/>
+            <field name="domain_force">[('allowed_internal_user_ids', 'in', user.ids)]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+        <record id="project_invoice_rule_portal_users" model="ir.rule">
+            <field name="name">Invoice: Portal Users Access</field>
+            <field name="model_id" ref="project_base.model_project_invoice"/>
+            <field name="domain_force">[('allowed_portal_user_ids', 'in', user.ids)]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        </record>
+
+        <!--  (project.task) -->
+        <record id="project_task_rule_internal_users" model="ir.rule">
+            <field name="name">Task: Internal Users Access</field>
+            <field name="model_id" ref="project.model_project_task"/>
+            <field name="domain_force">[('allowed_internal_user_ids', 'in', user.ids)]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+        <record id="project.project_task_rule_portal" model="ir.rule">
+            <field name="name">Task: Portal Users Access</field>
+            <field name="model_id" ref="project.model_project_task"/>
+            <field name="domain_force">[('allowed_portal_user_ids', 'in', user.ids)]</field>
+            <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        </record>
+    </data>
+</odoo>
diff --git a/odex25_project/project_base/security/project_security.xml b/odex25_project/project_base/security/project_security.xml
new file mode 100644
index 000000000..ebed91541
--- /dev/null
+++ b/odex25_project/project_base/security/project_security.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!-- Project Group -->
+        <record id="group_project_department_manager" model="res.groups">
+            <field name="name">PMO</field>
+            <field name="implied_ids" eval="[(4, ref('project.group_project_manager'))]"/>
+            <field name="category_id" ref="base.module_category_services_project"/>
+        </record>
+
+        <!-- configration multi company rule -->
+        <record id="project_task_type_multi_company_rule" model="ir.rule">
+            <field name="name">Project Task Type multi company rule</field>
+            <field name="model_id" ref="model_project_task_type"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+        </record>
+
+        <record id="project_category_multi_company_rule" model="ir.rule">
+            <field name="name">project category multi company rule</field>
+            <field name="model_id" ref="model_project_category"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+        </record>
+
+        <record id="project_hold_reason_multi_company_rule" model="ir.rule">
+            <field name="name">project hold reason multi company rule</field>
+            <field name="model_id" ref="model_project_hold_reason"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+        </record>
+
+        <!-- TODO:Review Delete Unneeded rules -->
+        <delete model="ir.rule" id="project.project_project_manager_rule"/>
+        <delete model="ir.rule" id="project.project_public_members_rule"/>
+        <delete model="ir.rule" id="project.project_manager_all_project_tasks_rule"/>
+
+        <!-- project rules -->
+        <record id="project_manager_rule" model="ir.rule">
+            <field name="name">Project Manager rule</field>
+            <field name="model_id" ref="model_project_project"/>
+            <field name="groups" eval="[(4, ref('project.group_project_manager'))]"/>
+            <field name="domain_force">[('user_id','=', user.id)]</field>
+        </record>
+
+        <record id="project_department_manager_rule" model="ir.rule">
+            <field name="name">Project PMO rule</field>
+            <field name="model_id" ref="model_project_project"/>
+            <field name="groups" eval="[(4, ref('project_base.group_project_department_manager'))]"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+        </record>
+        <!-- TODO:Review edit base on new team model
+        <record id="rule_team_member_project" model="ir.rule">
+            <field name="name">Project Team Member</field>
+            <field name="model_id" ref="model_project_project"/>
+            <field name="domain_force">['|',('employee_ids.user_id','in',
+                [user.id]),'|',('resource_allocation_line_ids.employee_id.user_id','in',[user.id]),('dummy_project','=',True)]
+            </field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="perm_create" eval="False"/>
+        </record>-->
+
+        <!--Stage rules -->
+        <record id="project_stage_multi_company_rule" model="ir.rule">
+            <field name="name">Project stage Multi Company rule</field>
+            <field name="model_id" ref="model_project_phase"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id', '=',False),('company_id', 'in', company_ids)]</field>
+        </record>
+        <!-- TODO:Review sub-project stages -->
+        <record id="project_phase_manager_rule" model="ir.rule">
+            <field name="name">Project Phase Manager rule</field>
+            <field name="model_id" ref="model_project_phase"/>
+            <field name="groups" eval="[(4, ref('project.group_project_manager'))]"/>
+            <field name="domain_force">[('project_id.user_id','=', user.id)]</field>
+        </record>
+
+        <record id="project_phase_department_rule" model="ir.rule">
+            <field name="name">Phase PMO rule</field>
+            <field name="model_id" ref="model_project_phase"/>
+            <field name="groups" eval="[(4, ref('project_base.group_project_department_manager'))]"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+        </record>
+
+        <!-- TODO:Review team member phase rule
+        <record id="rule_team_member_project_phase" model="ir.rule">
+            <field name="name">Project Stage Team Member</field>
+            <field name="model_id" ref="model_project_phase"/>
+            <field name="domain_force">[('department_ids','in', [user.department_id.id])]
+            </field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="perm_create" eval="False"/>
+        </record>-->
+
+        <!-- Project Tasks Rule -->
+        <!-- TODO:Review get also the flower of the tasks-->
+        <record model="ir.rule" id="project.task_visibility_rule">
+            <field name="domain_force">[('user_id','=',user.id)]</field>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+            <field name="perm_create" eval="True"/>
+        </record>
+
+        <!-- TODO:Review sub-project-->
+        <record model="ir.rule" id="project_manager_project_tasks_rule">
+            <field name="name">Project/Task: project manager: see his project tasks</field>
+            <field name="model_id" ref="model_project_task"/>
+            <field name="domain_force">[('project_id.user_id','in',[user.id])]</field>
+            <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
+        </record>
+
+        <record id="task_project_department_manager" model="ir.rule">
+            <field name="name">Task PMO rule</field>
+            <field name="model_id" ref="model_project_task"/>
+            <field name="groups" eval="[(4, ref('project_base.group_project_department_manager'))]"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+        </record>
+
+        <!-- Project invoice rules -->
+        <record id="project_invoice_multi_company_rule" model="ir.rule">
+            <field name="name">Project Invoice Multi Company rule</field>
+            <field name="model_id" ref="model_project_invoice"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id', '=',False),('company_id', 'in', company_ids)]</field>
+        </record>
+
+        <record model="ir.rule" id="project_manager_invoice_request_rule">
+            <field name="name">Invoice Request Project Manager</field>
+            <field name="model_id" ref="model_project_invoice"/>
+            <field name="domain_force">[('project_id.user_id','in',[user.id])]</field>
+            <field name="groups" eval="[(4, ref('project.group_project_manager'))]"/>
+        </record>
+
+        <record model="ir.rule" id="department_manager_invoice_request_rule">
+            <field name="name">Project Invoice PMO rule</field>
+            <field name="model_id" ref="model_project_invoice"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('project_base.group_project_department_manager'))]"/>
+        </record>
+
+        <record model="ir.rule" id="project_invoice_group_account_manager_rule">
+            <field name="name">Invoice Request account manager: see all</field>
+            <field name="model_id" ref="model_project_invoice"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('account.group_account_manager'))]"/>
+        </record>
+
+
+
+        
+
+    </data>
+</odoo>
diff --git a/odex25_project/project_base/static/src/css/progress_bar_color.css b/odex25_project/project_base/static/src/css/progress_bar_color.css
new file mode 100644
index 000000000..f81ee552b
--- /dev/null
+++ b/odex25_project/project_base/static/src/css/progress_bar_color.css
@@ -0,0 +1,16 @@
+.o_progressbar .o_progress .o_progressbar_complete.o_progress_red {
+    background-color: #FF0000;
+    height: 100%;
+  }
+  .o_progressbar .o_progress .o_progressbar_complete.o_progress_yellow {
+    background-color: #FFFF00;
+    height: 100%;
+  }
+  .o_progressbar .o_progress .o_progressbar_complete.o_progress_light_green {
+    background-color: #00FF00;
+    height: 100%;
+  }
+  .o_progressbar .o_progress .o_progressbar_complete.o_progress_green {
+    background-color: #008000;
+    height: 100%;
+  }
\ No newline at end of file
diff --git a/odex25_project/project_base/static/src/js/progress_bar_color.js b/odex25_project/project_base/static/src/js/progress_bar_color.js
new file mode 100644
index 000000000..e254c833d
--- /dev/null
+++ b/odex25_project/project_base/static/src/js/progress_bar_color.js
@@ -0,0 +1,48 @@
+odoo.define('module_name.progress_bar_color', function (require) {
+    "use strict";
+    var core = require('web.core');
+    var utils = require('web.utils');
+    var Widget = require('web.Widget');
+    var FieldRegistry = require('web.field_registry');
+    var FieldProgressBar = require('web.basic_fields').FieldProgressBar;
+    FieldProgressBar.include({
+        _render_value: function (v) {
+            var value = this.value;
+            var max_value = this.max_value;
+            if (!isNaN(v)) {
+                if (this.edit_max_value) {
+                    max_value = v;
+                } else {
+                    value = v;
+                }
+            }
+            value = value || 0;
+            max_value = max_value || 0;
+            var widthComplete;
+            if (value <= max_value) {
+                widthComplete = value / max_value * 100;
+            } else {
+                widthComplete = 100;
+            }
+            this.$('.o_progress').toggleClass('o_progress_overflow', value > max_value)
+                .attr('aria-valuemin', '0')
+                .attr('aria-valuemax', max_value)
+                .attr('aria-valuenow', value);
+            //        this.$('.o_progressbar_complete').css('width', widthComplete + '%');
+            this.$('.o_progressbar_complete').toggleClass('o_progress_red', widthComplete > 0 && widthComplete <= 40).css('width', widthComplete + '%');
+            this.$('.o_progressbar_complete').toggleClass('o_progress_yellow', widthComplete > 40 && widthComplete <= 70).css('width', widthComplete + '%');
+            this.$('.o_progressbar_complete').toggleClass('o_progress_light_green', widthComplete > 70 && widthComplete <= 90).css('width', widthComplete + '%');
+            this.$('.o_progressbar_complete').toggleClass('o_progress_green', widthComplete > 90 && widthComplete <= 100).css('width', widthComplete + '%');
+            if (!this.write_mode) {
+                if (max_value !== 100) {
+                    this.$('.o_progressbar_value').text(utils.human_number(value) + " / " + utils.human_number(max_value));
+                } else {
+                    this.$('.o_progressbar_value').text(utils.human_number(value) + "%");
+                }
+            } else if (isNaN(v)) {
+                this.$('.o_progressbar_value').val(this.edit_max_value ? max_value : value);
+                this.$('.o_progressbar_value').focus().select();
+            }
+        },
+    });
+});
\ No newline at end of file
diff --git a/odex25_project/project_base/views/asset.xml b/odex25_project/project_base/views/asset.xml
new file mode 100644
index 000000000..65a3a4784
--- /dev/null
+++ b/odex25_project/project_base/views/asset.xml
@@ -0,0 +1,11 @@
+<odoo>
+    <template id="assets_backend" inherit_id="web.assets_backend"
+     name="Progress bar">
+         <xpath expr="." position="inside">
+              <link rel="stylesheet" type="text/scss"
+               href="/project_base/static/src/css/progress_bar_color.css"/>
+              <script type="text/javascript"
+               src="/project_base/static/src/js/progress_bar_color.js"/>
+         </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_base/views/project_invoice_views.xml b/odex25_project/project_base/views/project_invoice_views.xml
new file mode 100644
index 000000000..7386cf1b1
--- /dev/null
+++ b/odex25_project/project_base/views/project_invoice_views.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="project_invoice_form_view" model="ir.ui.view">
+        <field name="name">project.invoice.form</field>
+        <field name="model">project.invoice</field>
+        <field name="arch" type="xml">
+            <form string="Invoice Request" create="false">
+                <header>
+                    <button name="action_confirm" type="object" string="Confirm" class="btn btn-primary" states="draft" groups="project.group_project_manager"/>
+                    <button name="action_request" type="object" string="Request" class="btn btn-primary" states="confirm" groups="project.group_project_manager"/>
+                    <button name="create_invoice" type="object" string="Create Invoice" class="btn btn-primary" states="request" groups="project_base.group_project_department_manager"/>
+                    <button name="action_cancel" type="object" string="Cancel" class="btn btn-primary" states="confirm,request" groups="project.group_project_manager"/>
+                    <button name="action_set_to_draft" type="object" string="Set to Draft" class="btn btn-primary" states="cancel" groups="project.group_project_manager"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
+                </header>
+                <sheet>
+                    <field name="payment_state" invisible="1" force_save="1"/>
+
+                    <widget name="web_ribbon" title="Paid" attrs="{'invisible': [('payment_state', '!=', 'paid'),]}"/>
+                    <widget name="web_ribbon" title="In Payment" attrs="{'invisible': [('payment_state', '!=', 'in_payment')]}"/>
+                    <widget name="web_ribbon" title="Partial" attrs="{'invisible': [('payment_state', '!=', 'partial'),]}"/>
+                    <widget name="web_ribbon" title="Reversed" bg_color="bg-danger" attrs="{'invisible': [('payment_state', '!=', 'reversed')]}"/>
+                    <widget name="web_ribbon" text="Invoicing App Legacy" bg_color="bg-info" attrs="{'invisible': [('payment_state', '!=', 'invoicing_legacy')]}" tooltip="This entry has been generated through the Invoicing app, before installing Accounting. It has been disabled by the 'Invoicing Switch Threshold Date' setting so that it does not impact your accounting."/>
+                    <group>
+                        <field name="invoice_type" widget="radio" options="{'horizontal': true}"/>
+                    </group>
+                    <group>
+                        <group>
+                            <!-- TODO depend on invoice method on setting -->
+                            <field name="name"/>
+                            <field name="phase_id" domain="[('project_id', '=', project_id)]" attrs="{'readonly':[('state', '!=', 'draft')]}"/>
+                            <field name="project_id" readonly="1" force_save="1"/>
+                            <!-- <field name="invoice_type" invisible="1"/> -->
+                            <field name="has_downpayment" invisible="1"/>
+                            <field name="sale_order_id" invisible="1"/>
+                            <field name="currency_id" invisible="1"/>
+                            <field name="project_type" invisible="1"/>
+                        </group>
+                        <group>
+                            <field name="plan_date" attrs="{'readonly':[('state', '!=', 'draft')]}" required="1"/>
+                            <field name="plan_payment_date" required="1"/>
+                            <field name="actual_date" readonly="1"/>
+                            <field name="actual_payment_date" readonly="1"/>
+                            <field name="invoice_id" readonly="1" options="{'no_open': True}" attrs="{'invisible': [('invoice_id', '=', False)]}"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Invoice Lines" name="invoice_lines">
+                            <field name="project_invline_ids" attrs="{'readonly': [('state', '=', 'done')]}">
+                                <tree editable="bottom">
+                                    <field name="order_line_id" string="Contract Item" domain="[('order_id','=',parent.sale_order_id),('is_downpayment','=',False)]" attrs="{'column_invisible':[('parent.project_type', '!=', 'revenue')]}" invisible="1"/>
+                                    <field name="product_id" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')],'column_invisible':[('parent.project_type', '=', 'internal')]}" force_save="1"/>
+                                    <field name="name"/>
+                                    <field name="account_id"/>
+                                    <field name="product_uom_qty" force_save="1"/>
+                                    <field name="qty_invoiced" decoration-info="(qty_invoiced)" decoration-bf="(qty_invoiced)" force_save="1" optional="hide"/>
+                                    <field name="product_uom" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')]}" optional="hide" force_save="1"/>
+                                    <field name="price_unit" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')]}" force_save="1"/>
+                                    <field name="price_subtotal"/>
+                                    <field name="tax_id" widget="many2many_tags" options="{'no_create': True}" attrs="{'readonly': [ ('parent.state', '!=', 'draft')]}" force_save="1"/>
+                                    <field name="price_tax"/>
+
+                                    <field name="price_total"/>
+                                </tree>
+                            </field>
+                            <separator string="DowmPayment" attrs="{'invisible':[('has_downpayment', '!=', True)]}"/>
+                            <field name="project_downinv_ids" string="DowmPayment" attrs="{'readonly': [('state', '=', 'done')],'invisible':[('has_downpayment', '!=', True)]}">
+                                <tree editable="bottom">
+                                    <field name="order_line_id" string="Contract Item" domain="[('order_id','=',parent.sale_order_id),('is_downpayment','=',True)]" attrs="{'column_invisible':[('parent.invoice_type', '=', 'variation_order')]}"/>
+                                    <field name="product_id" required="1" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')],'column_invisible':[('parent.invoice_type', '=', 'project')]}" force_save="1"/>
+                                    <field name="amount" attrs="{'column_invisible':[('parent.invoice_type', '=', 'variation_order')]}" force_save="1"/>
+                                    <field name="product_uom_qty" force_save="1"/>
+                                    <field name="qty_invoiced" decoration-info="(qty_invoiced)" decoration-bf="(qty_invoiced)" force_save="1" optional="show"/>
+                                    <field name="product_uom" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')]}" optional="hide" force_save="1"/>
+                                    <field name="price_unit" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')]}" force_save="1"/>
+                                    <!--                                     <field name="tax_id" widget="many2many_tags" options="{'no_create': True}" attrs="{'readonly': ['|', ('parent.state', '!=', 'draft'), ('parent.invoice_type', '=', 'project')]}" force_save="1"/>
+                                                                        <field name="price_tax"/>
+                                     -->
+                                    <field name="price_subtotal"/>
+                                    <!-- <field name="price_total"/> -->
+                                </tree>
+                            </field>
+
+                            <group name="note_group" col="6" class="mt-2 mt-md-0">
+                                <group colspan="4">
+                                </group>
+                                <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
+                                    <field name="amount" force_save="1"/>
+
+                                    <!--                                    <field name="amount_tax" widget="monetary" options="{'currency_field': 'currency_id'}"/>-->
+                                    <div class="oe_subtotal_footer_separator oe_inline o_td_label">
+                                        <label for="payment_amount"/>
+                                    </div>
+                                    <field name="payment_amount" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+
+                                    <div class="oe_subtotal_footer_separator oe_inline o_td_label">
+                                        <label for="residual_amount"/>
+                                    </div>
+                                    <field name="residual_amount" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                </group>
+                                <div class="oe_clear"/>
+                            </group>
+                        </page>
+                        <page string="Note">
+                            <field name="name" nolabel="1" attrs="{'required':[('phase_id', '=', False)]}" placeholder="Enter Description For invoice"/>
+                        </page>
+                        <page string="Settings Allowed Users" groups="project.group_project_manager">
+                            <group>
+                                <field name="allowed_internal_user_ids" widget="many2many_tags" groups="project.group_project_manager"/>
+                                <field name="allowed_portal_user_ids" widget="many2many_tags" options="{'no_create': True}" groups="project.group_project_manager" />
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="name" widget="mail_followers"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_invoice_tree_view" model="ir.ui.view">
+        <field name="name">project.invoice.tree</field>
+        <field name="model">project.invoice</field>
+        <field name="arch" type="xml">
+            <tree string="Invoice Request" expand="1" decoration-danger="state != 'done' and plan_date &lt; current_date">
+                <field name="name" optional="show"/>
+                <field name="project_id" optional="show"/>
+                <field name="plan_date" width="100px" optional="show"/>
+                <field name="amount" sum="Total" width="100px"/>
+                <field name="payment_amount" sum="payment_amount" width="100px"/>
+                <field name="residual_amount" sum="residual_amount" width="100px"/>
+                <field name="actual_date" width="100px" optional="show"/>
+                <field name="plan_payment_date" width="100px" optional="show"/>
+                <field name="actual_payment_date" width="100px" optional="show"/>
+                <field name="payment_state" widget="badge" decoration-danger="payment_state == 'not_paid'" decoration-warning="payment_state in ('partial', 'in_payment')" decoration-success="payment_state in ('paid', 'reversed')" attrs="{'invisible': [('payment_state', 'in', ('invoicing_legacy'))]}"/>
+
+                <field name="state" widget="badge" optional="show"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_project_invoice_filter" model="ir.ui.view">
+        <field name="name">project.invoice.search</field>
+        <field name="model">project.invoice</field>
+        <field name="arch" type="xml">
+            <search string="Search Project Invoice">
+                <field name="plan_date"/>
+                <filter string="Date" name="plan_date" date="plan_date"/>
+                <separator/>
+                <group expand="0" string="Group By">
+                    <filter string="Project" name="project" domain="[]" context="{'group_by': 'project_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="project_view_order_form" model="ir.ui.view">
+        <field name="name">sale.order.form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='%(sale.action_view_sale_advance_payment_inv)d'][1]" position="attributes">
+                <attribute name="attrs">{'invisible': ['|',('project_ids', '!=', []),('invoice_status', '!=', 'to invoice')]}
+                </attribute>
+            </xpath>
+            <xpath expr="//button[@name='%(sale.action_view_sale_advance_payment_inv)d'][2]" position="attributes">
+                <attribute name="attrs">{'invisible': ['|','|',('project_ids', '!=', []),('invoice_status', '!=',
+                    'no'),('state', '!=', 'sale')]}
+                </attribute>
+            </xpath>
+            <xpath expr="//button[@name='action_view_invoice']" position="before">
+                <button type="object" name="action_view_project_invoice" class="oe_stat_button" icon="fa-tasks" attrs="{'invisible': [('project_invoice_count', '=', 0)]}">
+                    <field name="project_invoice_count" widget="statinfo" string="Project Invoices"/>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="action_project_invoice" model="ir.actions.act_window">
+        <field name="name">Invoice Request</field>
+        <field name="res_model">project.invoice</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_project': 1}}</field>
+    </record>
+
+    <menuitem action="action_project_invoice" id="menu_project_invoice" name="Invoice Request" parent="project.menu_main_pm" sequence="9" groups="account.group_account_manager,project.group_project_manager,project_base.group_project_department_manager"/>
+</odoo>
diff --git a/odex25_project/project_base/views/project_phase_view.xml b/odex25_project/project_base/views/project_phase_view.xml
new file mode 100644
index 000000000..04fed7b9f
--- /dev/null
+++ b/odex25_project/project_base/views/project_phase_view.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Phase Search -->
+    <record id="view_phase_search_form" model="ir.ui.view">
+        <field name="name">project.phase.search.form</field>
+        <field name="model">project.phase</field>
+        <field name="arch" type="xml">
+            <search string="Phase">
+                <field name="name" string="Stage"/>
+                <field name="project_id"/>
+                <separator/>
+                <filter string="Draft" name="draft" domain="[('state', 'in', ['draft'])]"/>
+                <filter string="Open" name="open" domain="[('state', 'in', ['open'])]"/>
+                <filter string="Closed" name="close" domain="[('state', '=', 'close')]"/>
+                <separator/>
+                <filter string="Start Date" name="group_date_start" context="{'group_by': 'start_date'}"/>
+                <filter string="End Date" name="group_date_end" context="{'group_by': 'end_date'}"/>
+                <group expand="0" string="Group By">
+                    <filter string="Project" name="project" context="{'group_by': 'project_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- Project Phase -->
+    <record id="project_phase_form_view" model="ir.ui.view">
+        <field name="name">project.phase.form</field>
+        <field name="model">project.phase</field>
+        <field name="arch" type="xml">
+            <form string="Project Phases" create="0" edit="1">
+                <header>
+                    <button name="action_confirm" string="Confirm" type="object" attrs="{'invisible':[('state','not in',['draft'])]}" class="oe_highlight" groups="project.group_project_manager"/>
+                    <button name="action_close" string="Close" type="object" attrs="{'invisible':[('state','not in',['open'])]}" class="oe_highlight" groups="project.group_project_manager"/>
+                    <button name="action_reopen" string="Reopen" type="object" attrs="{'invisible':[('state','not in',['close'])]}" groups="project.group_project_manager"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box" groups="base.group_user">
+                        <button class="oe_stat_button" name="action_project_phase_task" string='Tasks' type="object" icon="fa-tasks">
+                        </button>
+                        <button class="oe_stat_button" name="action_view_project_invoice" string='Invoices' type="object" icon="fa-edit"/>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="name" attrs="{'readonly':[('state','not in',['draft'])]}"  invisible="1"/>
+                            <field name="phase_id" attrs="{'readonly':[('state','not in',['draft'])]}" required="1"/>
+                            <field name="project_id" attrs="{'readonly':[('state','not in',['draft'])]}" required="1"/>
+                            <field name="weight" attrs="{'readonly':[('state','not in',['draft'])]}" />
+                            <field name="estimated_hours" attrs="{'readonly':[('state','not in',['draft'])]}" required="1" />
+                        </group>    
+                        <group>
+                            <field name="start_date" attrs="{'readonly':[('state','not in',['draft'])]}" required="1"/>
+                            <field name="end_date" attrs="{'readonly':[('state','not in',['draft'])]}" required="1"/>
+                            <field name="allowed_internal_user_ids" widget="many2many_tags" groups="project.group_project_manager" />
+                            <field name="allowed_portal_user_ids" widget="many2many_tags" groups="project.group_project_manager" options="{'no_create': True}" />
+                        </group>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" groups="base.group_user"/>
+                    <field name="activity_ids"/>
+                    <field name="message_ids"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_phase_tree" model="ir.ui.view">
+        <field name="name">project.phase.tree</field>
+        <field name="model">project.phase</field>
+        <field name="arch" type="xml">
+            <tree string="Project Phases" create="0" edit="0" expand="1" decoration-danger="state != 'close' and end_date &lt; current_date">
+                <field name="name"/>
+                <field name="project_id"/>
+                <field name="start_date"/>
+                <field name="end_date"/>
+                <field name="estimated_hours"  widget="float_time" invisible="1"/>
+                <field name="weight" />
+                <field name="progress" widget="progressbar"/>
+                <field name="state" />
+                <field name="task_count" />
+                <button class="d-none d-md-inline oe_stat_button" type="object" name="action_project_phase_task" icon="fa-tasks">
+                    <field name="task_ids" attrs="{'invisible': True}"/>
+                </button>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_project_phase_kanban" model="ir.ui.view">
+        <field name="name">project.phase.kanban</field>
+        <field name="model">project.phase</field>
+        <field name="arch" type="xml">
+            <kanban class="o_kanban_mobile" sample="1">
+                <field name="name"/>
+                <field name="notes"/>
+                <field name="start_date"/>
+                <field name="end_date"/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <div class="oe_kanban_content">
+                            <div t-attf-class="oe_kanban_card oe_kanban_global_click">
+                                <div class="o_kanban_record_top mb8">
+                                    <div class="o_kanban_record_headings ml-1">
+                                        <strong class="o_kanban_record_title">
+                                            <t t-esc="record.name.value"/>
+                                        </strong>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="o_kanban_record_bottom" t-if="!selection_mode">
+                                <div class="oe_kanban_bottom_left">
+                                    <t t-esc="record.end_date.value and record.end_date.value.split(' ')[0] or False"/>
+                                </div>
+                                <div class="oe_kanban_bottom_right">
+                                    <t t-esc="record.end_date.value and record.end_date.value.split(' ')[0] or False"/>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="open_project_phase_form" model="ir.actions.act_window">
+        <field name="name">Project Phases</field>
+        <field name="res_model">project.phase</field>
+        <field name="view_mode">tree,form,kanban</field>
+        <field name="view_id" ref="project_phase_tree"/>
+        <field name="context">{'search_default_project': 1}</field>
+    </record>
+
+    <menuitem action="open_project_phase_form" id="menu_project_phase" groups="project.group_project_manager,project_base.group_project_department_manager" name="Phases" parent="project.menu_main_pm" sequence="3"/>
+
+    <!-- Project Hold Reason -->
+    <record id="project_phase_type_form_view" model="ir.ui.view">
+        <field name="name">project.phase.type.form</field>
+        <field name="model">project.phase.type</field>
+        <field name="arch" type="xml">
+            <form string="Project Phase Type">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name" required="1"/>
+                            <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_phase_type_tree_view" model="ir.ui.view">
+        <field name="name">project.phase.type.tree</field>
+        <field name="model">project.phase.type</field>
+        <field name="arch" type="xml">
+            <tree string="Project Phase Type">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="open_project_phase_type_form" model="ir.actions.act_window">
+        <field name="name">Project Phase Type</field>
+        <field name="res_model">project.phase.type</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="project_phase_type_tree_view"/>
+    </record>
+</odoo>
diff --git a/odex25_project/project_base/views/project_task_views.xml b/odex25_project/project_base/views/project_task_views.xml
new file mode 100644
index 000000000..333a1f3eb
--- /dev/null
+++ b/odex25_project/project_base/views/project_task_views.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Project Tasks from inherite-->
+    <record id="view_task_tree2_inherited" model="ir.ui.view">
+        <field name="name">project.task.tree</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="hr_timesheet.view_task_tree2_inherited" />
+        <field name="arch" type="xml">
+            <field name="progress" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </field>
+            <field name="total_hours_spent" position="after">
+                <field name="weight" widget="" class="mr-3" required="1" />
+                <field name="task_progress" widget="progressbar" class="mr-3" required="1" />
+            </field>
+        </field>
+    </record>
+
+    <!-- Project Tasks from inherite-->
+    <record id="view_task_form2" model="ir.ui.view">
+        <field name="name">project.task.form</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="weight" widget="" class="mr-3" required="1" />
+
+                <field name="task_progress" widget="progressbar" options="{'max_value': 'maximum_rate', 'editable': True}" readonly="0" class="mr-3"/>
+            </xpath>
+            <xpath expr="//field[@name='parent_id']" position="attributes">
+                <attribute name="domain">[('project_id','=',project_id),('phase_id','=',phase_id)]</attribute>
+                <attribute name="attrs">{'invisible' : [('allow_subtasks', '=', False)]}</attribute>
+                <attribute name="force_save">1</attribute>
+            </xpath>
+            <xpath expr="//h1[hasclass('justify-content-between')]" position="replace">
+                <h1 class="d-flex flex-row">
+                    <field name="priority" widget="priority" class="mr-3"/>
+                    <field name="name" class="o_task_name text-truncate" placeholder="Task Title..." default_focus="1"/>
+                </h1>
+            </xpath>
+            <xpath expr="//field[@name='project_id']" position="after">
+                <field name="phase_id" required="1" string="Stage" domain="[('project_id','=',project_id)]"/>
+            </xpath>
+            <xpath expr="//field[@name='user_id']" position="after">
+                <field name="user_ids" widget="many2many_tags"/>
+            </xpath>
+
+            <xpath expr="//notebook" position="inside">
+                <page string="Settings Allowed Users" groups="project.group_project_manager">
+                    <group>
+                        <field name="allowed_internal_user_ids" widget="many2many_tags"  groups="project.group_project_manager"/>
+                        <field name="allowed_portal_user_ids" widget="many2many_tags" groups="project.group_project_manager" options="{'no_create': True}" />
+                    </group>
+                </page>
+            </xpath>
+
+        </field>
+    </record>
+
+    <!-- Project Task tree Inherit-->
+    <record id="view_task_tree" model="ir.ui.view">
+        <field name="name">project.task.tree</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_tree2" />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="expand">1</attribute>
+            </xpath>
+            <field name="project_id" position="after">
+                <field name="phase_id" string="Stage"/>
+            </field>
+            <field name="partner_id" position="replace"/>
+            <field name="kanban_state" position="replace"/>
+            <field name="user_id" position="attributes">
+                <attribute name="string">Responsible</attribute>
+            </field>
+            <field name="stage_id" position="attributes">
+                <attribute name="string">State</attribute>
+                <attribute name="optional">hide</attribute>
+            </field>
+            <field name="company_id" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </field>
+        </field>
+    </record>
+
+
+
+
+    <!-- Project Task calendar inherit-->
+    <record id="view_task_calendar_inherited" model="ir.ui.view">
+        <field name="name">calendar2.inherited</field>
+        <field name="model">project.task</field>
+        <field eval="2" name="priority"/>
+        <field name="inherit_id" ref="project.view_task_calendar" />
+        <field name="arch" type="xml">
+            <field name="user_id" position="attributes">
+                <attribute name="string">Responsible</attribute>
+            </field>
+            <field name="stage_id" position="attributes">
+                <attribute name="string">State</attribute>
+            </field>
+        </field>
+    </record>
+
+    <!-- Project Task search view Inherit-->
+    <record id="view_task_search_form" model="ir.ui.view">
+        <field name="name">project.task.filter</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_search_form" />
+        <field name="arch" type="xml">
+            <field name="project_id" position="after">
+                <field name="phase_id" />
+            </field>
+            <filter name="project" position="after">
+                <filter string="Stage" name="group_phase_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'phase_id'}" />
+                <filter string="State" name="state" context="{'group_by': 'stage_id'}" />
+                <separator/>
+            </filter>
+            <filter name="message_needaction" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </filter>
+            <filter name="my_followed_tasks" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </filter>
+            <filter name="late" position="replace">
+                <filter string="Late Tasks" name="late" domain="[('date_end', '&lt;', context_today().strftime('%Y-%m-%d')) , ('is_closed','=',False)]" />
+            </filter>
+            <filter name="group_create_date" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </filter>
+            <filter name="stage" position="replace">
+            </filter>
+        </field>
+    </record>
+
+    <!-- Task Gragh-->
+    <record id="view_project_task_graph" model="ir.ui.view">
+        <field name="name">project.task.pivot</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_project_task_graph" />
+        <field name="arch" type="xml">
+            <field name="stage_id" position="replace">
+                <field name="phase_id"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- inherit action to remove default filter-->
+    <record id="project.action_view_all_task" model="ir.actions.act_window">
+        <field name="context">{'all_task':0,'search_default_project':1}</field>
+    </record>
+    <!-- Inherit Form View to Modify it -->
+    <record id="project_task_type_inherit" model="ir.ui.view">
+        <field name="name">project.task.type.inherit</field>
+        <field name="model">project.task.type</field>
+        <field name="inherit_id" ref="project.task_type_edit"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='sequence']" position="after">
+                <field name="is_default"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_base/views/project_views.xml b/odex25_project/project_base/views/project_views.xml
new file mode 100644
index 000000000..4ceeb0e61
--- /dev/null
+++ b/odex25_project/project_base/views/project_views.xml
@@ -0,0 +1,728 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Project Project -->
+    <record id="view_edit_project_inherit_form" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project" />
+        <field name="arch" type="xml">
+            <xpath expr="//header" position="inside">
+                <button class="btn btn-primary" type="object" name="create_invoice" string="Create Invoice" attrs="{'invisible':['|', '|', ('sale_order_id', '=', False), ('state', '!=', 'done'),('to_invoice', '=', False)]}" />
+            </xpath>
+            <xpath expr="//sheet" position="before">
+                <div class="alert alert-danger" role="alert" style="margin-bottom:0px;" attrs="{'invisible':['|',('status', 'not in', ('close')),('close_reason', '=', False)]}">
+                    <field name="close_reason" attrs="{'readonly': True}" />
+                </div>
+            </xpath>
+            <div class="oe_button_box" position="inside">
+                <!-- TODO : open if use sub-project 
+                <button class="d-none d-md-inline oe_stat_button" type="object" name="action_view_subproject" icon="fa-code-fork" attrs="{'invisible': [('sub_project_id', '=', [])]}" string="Sub-Projects">
+                    <field name="sub_project_id" attrs="{'invisible': True}"/>
+                </button>-->
+                <button type="object" name="action_project_invoice" icon="fa-edit" context="{'default_project_id':active_id}">
+                    <div class="o_form_field o_stat_info">
+                        <span class="o_stat_value">
+                            <field name="total_invoiced_amount" />
+                        </span>
+                        <span class="o_stat_text">Invoices</span>
+                    </div>
+                </button>
+                <button class="d-none d-md-inline oe_stat_button" type="object" name="action_view_expense" icon="fa-dollar" string="Expenses">
+                </button>
+                <button class="d-none d-md-inline oe_stat_button" type="object" name="action_view_purchase" icon="fa-credit-card" string="Purchase">
+                </button>
+            </div>
+
+            <!-- Project status -->
+            <xpath expr="//widget[@name='web_ribbon']" position="before">
+                <widget name="web_ribbon" title="Running" bg_color="bg-info" attrs="{'invisible': [('status', '!=', 'open')]}" />
+                <widget name="web_ribbon" title="Hold" bg_color="bg-danger" attrs="{'invisible': [('status', '!=', 'hold')]}" />
+                <widget name="web_ribbon" title="Closed" attrs="{'invisible': [('status', '!=', 'close')]}" />
+            </xpath>
+
+            <xpath expr="//button[@name='%(portal.portal_share_action)d']" position="attributes">
+                <attribute name="attrs">{'invisible':True}</attribute>
+            </xpath>
+            <xpath expr="//header" position="inside">
+                <button name="action_confirm" string="Confirm" type="object" attrs="{'invisible':[('state','not in',['draft'])]}" class="oe_highlight" groups="project_base.group_project_department_manager" />
+                <button name="action_done" string="Done" type="object" attrs="{'invisible':[('state','not in',['confirm'])]}" class="oe_highlight" groups="project.group_project_manager" />
+                <button name="action_draft" string="Set to Draft" type="object" icon="fa-rotate-right" attrs="{'invisible':[('state','in',['draft'])]}" groups="project.group_project_manager" />
+
+
+                <button name="action_open" string="Open" type="object" attrs="{'invisible':['|',('state','not in',['done']),('status','in',['open','hold','pending','close'])]}" groups="project.group_project_manager" class="btn-info" icon="fa-caret-right" />
+                <button name="action_reopen" string="Re Open" type="object" attrs="{'invisible':['|',('state','not in',['done']),('status','not in',['hold','pending','close'])]}" groups="project.group_project_manager" class="btn-info" icon="fa-rotate-right" />
+                <button name="%(project_base.action_project_hold)d" string="Hold" type="action" attrs="{'invisible':[('status','not in',['open'])]}" groups="project.group_project_manager" class="btn-danger" icon="fa-pause" />
+                <button name="action_close" string="Close" type="object" attrs="{'invisible':[('status','not in',['open'])]}" groups="project.group_project_manager" class="btn-success" icon="fa-power-off" />
+                <field name="state" widget="statusbar" statusbar_visible="draft,confirm,approve,review,done" />
+
+            </xpath>
+            <xpath expr="//div[hasclass('oe_title')]" position="replace">
+                <div class="oe_title">
+                    <h1>
+                        <field name="name" placeholder="Project Name" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':True}" />
+                    </h1>
+                    <div name="options_active">
+                        <div>
+                            <label for="project_no" class="oe_inline" string="Project #:" />
+                            <field name="project_no" attrs="{'readonly':True}" />
+                        </div>
+                    </div>
+                </div>
+                <group>
+                    <group>
+                        <field name="to_invoice" invisible="1" />
+                        <field name="status" attrs="{'invisible':[('active','=',True)],'readonly':True}" />
+                        <field name="category_id" options="{'no_create': True}" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':[('state','not in',['draft'])]}" />
+                        <field name="partner_id" string="Partner" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':True}" />
+
+                        <field name="consultant_id" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                        <field name="beneficiary_id" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                        <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
+
+                    </group>
+                    <group>
+                        <field name="department_id" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                        <field name="user_id" widget="many2one_avatar_user" attrs="{'readonly':[('state','not in',['draft'])],'required':True}" />
+                        <label for="start" string="Period" />
+                        <div name="dates" class="o_row">
+                            <field name="start" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':[('state','not in',['draft'])]}" />
+                            <i class="fa fa-long-arrow-right mx-2 oe_edit_only" aria-label="Arrow icon" title="Arrow" />
+                            <i class="fa fa-long-arrow-right mx-2 oe_read_only" aria-label="Arrow icon" title="Arrow" attrs="{'invisible': [('start', '=', False), ('date', '=', False)]}" />
+                            <field name="date" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':[('state','not in',['draft'])]}" />
+                        </div>
+                        <field name="launch_date" invisible="1"/>
+                        <field name="progress" widget="progressbar" />
+                    </group>
+                </group>
+            </xpath>
+            <xpath expr="//page[@name='settings']" position="attributes">
+                <attribute name="groups">project_base.group_project_department_manager</attribute>
+            </xpath>
+            <xpath expr="//page[@name='settings']/group/group/field[@name='user_id']" position="replace" />
+
+            <xpath expr="//page[@name='settings']/group/group/field[@name='partner_id']" position="replace" />
+
+            <xpath expr="//page[@name='settings']/group/group/field[@name='partner_phone']" position="attributes">
+                <attribute name="attrs">{'invisible':True}</attribute>
+            </xpath>
+            <xpath expr="//page[@name='settings']/group/group/field[@name='partner_email']" position="attributes">
+                <attribute name="attrs">{'invisible':True}</attribute>
+            </xpath>
+            <xpath expr="//page[@name='settings']/group/group/div[@name='alias_def']" position="attributes">
+                <attribute name="attrs">{'invisible':True}</attribute>
+            </xpath>
+            <xpath expr="//page[@name='settings']/group/group/field[@name='alias_contact']" position="attributes">
+                <attribute name="attrs">{'invisible':True}</attribute>
+            </xpath>
+
+
+            <xpath expr="//div[@id='rating_settings']" position="attributes">
+                <attribute name="attrs">{'invisible':True}</attribute>
+            </xpath>
+
+            <xpath expr="//field[@name='active']" position="after">
+
+                <field name="resource_calendar_id" attrs="{'readonly':[('state','not in','draft')]}" />
+                <field name="type" attrs="{'readonly':[('state','not in','draft')]}" />
+
+                <field name="invoice_method" attrs="{'required':True,'readonly':[('state','not in',['draft'])]}" widget="radio" />
+                <label for="invoice_period" attrs="{'invisible':[('invoice_method','!=','per_period')]}" />
+                <div class="oe_inline" style="display: inline;" attrs="{'invisible':[('invoice_method','!=','per_period'),],'required': [('invoice_method','=','per_period')],'readonly':[('state','not in',['draft'])]}">
+                    <field name="invoice_period" class="oe_inline" />
+                    <span class="oe_inline">Days</span>
+                </div>
+                <field name="man_hours" />
+                <field name="type_ids" widget="many2many_tags" />
+            </xpath>
+            <xpath expr="//field[@name='description']" position="attributes">
+                <attribute name="attrs">{'readonly':[('state','not in',['draft','confirm'])]}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="attributes">
+                <attribute name="attrs">{'readonly':True}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='analytic_account_id']" position="attributes">
+                <attribute name="attrs">{'readonly':[('state','not in',['draft','confirm'])]}</attribute>
+            </xpath>
+
+
+            <xpath expr="//page[@name='description_page']" position="before">
+                <page name="project_phase" string="Project Phases">
+                    <field name="project_phase_ids" nolabel="1" attrs="{'readonly':[('state','not in',['confirm'])]}">
+                        <tree>
+
+                            <field name="phase_id" attrs="{'required':True,'readonly':[('state','not in',['draft'])]}" />
+                            <field name="start_date" attrs="{'required':True,'readonly':[('state','not in',['draft'])]}" />
+                            <field name="end_date" attrs="{'required':True,'readonly':[('state','not in',['draft'])]}" />
+                            <field name="weight" />
+                            <field name="progress" widget="progressbar" />
+                            <field name="estimated_hours" attrs="{'required':True,'readonly':[('state','not in',['draft'])],'column_invisible': [('parent.man_hours', '=', False)]}" widget="float_time" sum="estimated_hours" />
+                            <field name="state" />
+                            <button name="action_confirm" string="Open" type="object" class="btn-info" icon="fa-caret-right" attrs="{'invisible':[('state','not in',['draft'])]}" />
+                            <button name="action_close" string="Close" type="object" class="btn-success" icon="fa-power-off" attrs="{'invisible':[('state','not in',['open'])]}" />
+                            <button name="action_reopen" string="Re Open" type="object" class="btn-info" icon="fa-rotate-right" attrs="{'invisible':[('state','not in',['close'])]}" />
+                            <field name="task_count" />
+                            <button class="d-none d-md-inline oe_stat_button" type="object" name="action_project_phase_task" icon="fa-tasks">
+                                <field name="task_ids" attrs="{'invisible': True}" />
+                            </button>
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+            <xpath expr="//page[@name='description_page']" position="after">
+
+                <page name="team" string="Project Team">
+                    <field name="project_team_ids" nolabel="1">
+                        <tree editable="top">
+                            <field name="employee_id" required="1" />
+                            <field name="department_id" optional="hide" />
+                            <field name="job_id" optional="hide" />
+                            <field name="project_job" force_save="1" required="1" />
+                            <field name="project_id" invisible="1" />
+                        </tree>
+                    </field>
+                </page>
+                <page name="invoice" string="Invoicing" attrs="{'invisible':[('type','=','internal')]}">
+                    <group>
+                        <group>
+                            <field name="contract_number" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':False}" />
+                            <field name="signature_date" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                        </group>
+                        <group>
+                            <field name="contract_value_untaxed" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':[('state','not in',['draft','done'])]}" />
+                            <field name="tax_amount" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':[('state','not in',['draft','done'])]}" />
+                            <field name="contract_value" attrs="{'readonly':[('state','not in',['draft','confirm'])],'required':[('state','not in',['draft','done'])]}" />
+                        </group>
+                    </group>
+                    <field name="invoice_ids" nolabel="1">
+                        <tree decoration-info="invoice_type=='variation_order'">
+                            <field name="name" string="Description" />
+                            <field name="phase_id" />
+                            <field name="plan_date" required="1" />
+                            <field name="project_id" invisible="1" />
+                            <field name="invoice_type" invisible="1" />
+                            <field name="amount" sum="Amount" />
+                            <field name="actual_date" />
+                            <field name="plan_payment_date" />
+                            <field name="actual_payment_date" />
+                            <field name="to_invoice" invisible="1" />
+                            <field name="invoice_type" />
+                            <field name="state" />
+                            <!-- <button name="action_confirm" type="object" icon="fa-check" attrs="{'invisible':[('state','not in',['draft'])]}" />
+                            <button name="action_get_invoice" type="object" string="Details" icon="fa-list" /> -->
+                        </tree>
+                    </field>
+
+                    <group name="note_group" col="6" class="mt-2 mt-md-0">
+                        <group colspan="4">
+                        </group>
+                        <group class="oe_subtotal_footer oe_right" colspan="2" name="project_total">
+                            <field name="total_invoiced_amount" widget="monetary" force_save="1" />
+
+                            <div class="oe_subtotal_footer_separator oe_inline o_td_label">
+                                <label for="total_invoiced_payment" />
+                            </div>
+                            <field name="total_invoiced_payment" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}" />
+
+                            <div class="oe_subtotal_footer_separator oe_inline o_td_label">
+                                <label for="residual_amount" />
+                            </div>
+                            <field name="residual_amount" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}" />
+                        </group>
+                        <div class="oe_clear" />
+                    </group>
+
+                </page>
+                <page name="location" string="Location">
+                    <group>
+                        <group>
+                            <span class="o_form_label o_td_label" name="address_name">
+                                <b>Address</b>
+                            </span>
+                            <div class="o_address_format">
+                                <field name="street" placeholder="Street..." class="o_address_street" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                                <field name="street2" placeholder="Street 2..." class="o_address_street" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                                <field name="city" placeholder="City" class="o_address_city" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                                <field name="state_id" class="o_address_state" placeholder="Region" options="{'no_open': True, 'no_quick_create': True}" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}" />
+                                <field name="zip" placeholder="ZIP" class="o_address_zip" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                                <field name="country_id" placeholder="Country" class="o_address_country" options="{&quot;no_open&quot;: True, &quot;no_create&quot;: True}" attrs="{'readonly':[('state','not in',['draft','confirm'])]}" />
+                            </div>
+                        </group>
+                    </group>
+                </page>
+                <page name="lesson_learned" string="Lesson Learned">
+                    <field name="lessons_learned" />
+                </page>
+            </xpath>
+            <xpath expr="//field[@name='message_follower_ids']" position="after">
+                <field name="message_ids" />
+            </xpath>
+            <xpath expr="//field[@name='privacy_visibility']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='allowed_internal_user_ids']" position="attributes">
+                <attribute name="attrs">{}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='allowed_portal_user_ids']" position="attributes">
+                <attribute name="attrs">{}</attribute>
+            </xpath>
+            
+        </field>
+    </record>
+    <!-- Inherit Project Search -->
+    <record id="view_project_project_filter_inherit" model="ir.ui.view">
+        <field name="name">project.project.select</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.view_project_project_filter" />
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='Manager']" position="before">
+                <filter string="Project Category" name="Category" context="{'group_by': 'category_id'}" />
+                <filter string="Status" name="Status" context="{'group_by': 'status'}" />
+            </xpath>
+            <xpath expr="//field[@name='partner_id']" position="replace">
+                <field name="partner_id" string="Partner" filter_domain="[('partner_id', 'child_of', self)]" />
+            </xpath>
+            <xpath expr="//filter[@name='Partner']" position="replace">
+                <filter string="Partner" name="Partner" context="{'group_by': 'partner_id'}" />
+            </xpath>
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="project_no" string="Project Number" />
+            </xpath>
+            <xpath expr="//filter[@name='followed_by_me']" position="replace">
+                <filter string="Open" name="open" domain="[('status','=','open')]" />
+                <filter string="Hold" name="hold" domain="[('status','=','hold')]" />
+                <filter string="Closed" name="closed" domain="[('status','=','closed')]" />
+                <searchpanel>
+                    <field name="category_id" string="Categories" enable_counters="1" />
+                </searchpanel>
+            </xpath>
+
+        </field>
+    </record>
+    <!-- Inherit Form Kanban -->
+    <record id="quick_create_task_inherit_form" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.quick_create_task_form" />
+        <field name="arch" type="xml">
+
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="phase_id" options="{'no_open': True,'no_create': True}"/>
+                <field name="weight"/>
+            </xpath>
+
+        </field>
+    </record>
+    <!-- Project New kanban -->
+    <record model="ir.ui.view" id="view_new_project_kanban">
+        <field name="name">project.project.kanban</field>
+        <field name="model">project.project</field>
+        <field name="arch" type="xml">
+            <kanban string="Project Overview" class="o_emphasize_colors o_kanban_dashboard o_slide_kanban o_slide_channel_kanban" sample="1">
+                <field name="name" />
+                <field name="project_no" />
+                <field name="partner_id" />
+                <field name="color" />
+                <field name="is_favorite" />
+                <field name="analytic_account_id" />
+                <field name="start" />
+                <field name="date" />
+                <field name="doc_count" />
+                <field name="status" />
+                <field name="state" />
+                <field name="progress" />
+                <templates>
+
+                    <t t-name="kanban-box">
+
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div class="o_kanban_card_header">
+
+
+                                <div class="o_kanban_card_header_title mb16">
+                                    <div class="o_primary">
+                                        <a type="edit" class="me-auto">
+                                            <field name="is_favorite" widget="boolean_favorite" nolabel="1" force_save="1" />
+                                            <span> . </span>
+                                            <span>
+                                                <field name="name" class="o_primary" />
+                                            </span>
+                                            <br />
+                                            <span>
+                                                <field name="project_no" class="o_primary" />
+                                            </span>
+                                        </a>
+                                        <br />
+                                        <span class="o_text_overflow text-muted" t-if="record.partner_id.value">
+                                            <span class="fa fa-user mr-2" aria-label="Partner" title="Partner"></span>
+                                            <t t-esc="record.partner_id.value" />
+                                        </span>
+                                    </div>
+                                    <div t-if="record.date.raw_value or record.start.raw_value" class="text-muted o_row">
+                                        <span class="fa fa-clock-o mr-2" title="Dates"></span>
+                                        <field name="start" />
+                                        <i t-if="record.date.raw_value and record.start.raw_value" class="fa fa-long-arrow-right mx-2 oe_read_only" aria-label="Arrow icon" title="Arrow" />
+                                        <field name="date" />
+                                    </div>
+                                    <div t-if="record.tag_ids" class="w-75">
+                                        <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
+                                    </div>
+                                    <field name="status" widget="badge" decoration-success="status == 'close'" decoration-info="status == 'open'" decoration-danger="status in ['hold','pending']" />
+                                </div>
+                                <div class="container o_kanban_card_manage_pane dropdown-menu" role="menu" groups="base.group_user">
+                                    <div class="row">
+                                        <div class="col-6 o_kanban_card_manage_section o_kanban_manage_view">
+                                            <div role="menuitem" class="o_kanban_card_manage_title">
+                                                <span>View</span>
+                                            </div>
+                                            <div role="menuitem">
+                                                <a name="action_view_tasks" type="object">Tasks</a>
+                                            </div>
+                                            <div role="menuitem" t-if="record.doc_count.raw_value">
+                                                <a name="attachment_tree_view" type="object">
+                                                    Documents</a>
+                                            </div>
+                                        </div>
+                                        <div class="col-6 o_kanban_card_manage_section o_kanban_manage_reporting" groups="project.group_project_manager">
+                                            <div role="menuitem" class="o_kanban_card_manage_title">
+                                                <span>Reporting</span>
+                                            </div>
+                                            <div role="menuitem">
+                                                <a name="%(project_base.report_project_detail)d" type="action">Project
+                                                    Charter
+                                                </a>
+                                            </div>
+                                            <div role="menuitem">
+                                                <a name="action_view_tasks_analysis" type="object">Tasks
+                                                    Analysis
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="o_kanban_card_manage_settings row" groups="project.group_project_manager">
+                                        <div role="menuitem" aria-haspopup="true" class="col-8">
+                                            <ul class="oe_kanban_colorpicker" data-field="color" role="popup" />
+                                        </div>
+                                        <div role="menuitem" class="col-4">
+                                            <a class="dropdown-item" role="menuitem" type="edit" name="action_view_kanban_project">Edit
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <a class="o_kanban_manage_toggle_button o_dropdown_kanban" href="#" groups="base.group_user">
+                                    <i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage" />
+                                </a>
+
+                            </div>
+
+                            <div class="container o_kanban_card_content mt1">
+
+                                <div class="row mb16">
+                                    <div class="col-4 o_kanban_primary_left">
+                                        <button class="btn btn-primary" name="action_creat_tasks" type="object">Task</button>
+                                    </div>
+                                    <div class="col-4 ">
+
+                                        <div class="d-flex" name="info_avg_rating" t-if="record.no_of_invoices.raw_value">
+                                            <a name="action_project_invoice" type="object" class="me-auto"> Invoices<field name="no_of_invoices" />
+                                            </a>
+                                        </div>
+                                        <div class="d-flex" name="info_paid" t-if="record.no_of_invoices.raw_value">
+                                            <a name="action_paid_invoice" type="object" class="me-auto"> Paid<field name="no_of_paid_invoices" />
+                                            </a>
+                                        </div>
+
+                                    </div>
+                                    <div class="col-4 o_kanban_primary_right">
+
+                                        <div class="d-flex" name="info_avg_invoiced" t-if="record.no_of_invoices.raw_value">
+                                            <span>
+                                                <field name="total_invoiced_amount" />
+                                            </span>
+                                        </div>
+                                        <div class="d-flex" name="info_total_paid" t-if="record.no_of_invoices.raw_value">
+                                            <span>
+                                                <field name="total_invoiced_payment" />
+                                            </span>
+                                        </div>
+
+                                    </div>
+
+                                </div>
+
+                                <div class="row mt3 o_kanban_card_attendees_buttons">
+                                    <div class="col-3 border-end">
+                                        <a name="action_view_new_tasks" type="object" class="d-flex flex-column align-items-center">
+                                            <field name="task_count_new" class="fw-bold" />
+                                            <span class="text-muted">New</span>
+                                        </a>
+                                    </div>
+                                    <div class="col-3 border-end">
+                                        <a name="action_view_inprogress_tasks" type="object" class="d-flex flex-column align-items-center">
+                                            <field name="task_count_inprogress" class="fw-bold" />
+                                            <span class="text-muted">In progress</span>
+                                        </a>
+                                    </div>
+                                    <div class="col-3 border-end">
+                                        <a name="action_view_finished_tasks" type="object" class="d-flex flex-column align-items-center">
+                                            <field name="task_count_finished" class="fw-bold" />
+                                            <span class="text-muted">Finished</span>
+                                        </a>
+                                    </div>
+                                    <div class="col-3">
+                                        <a name="action_view_tasks" type="object" class="d-flex flex-column align-items-center">
+                                            <field name="task_count_all" class="fw-bold" />
+                                            <span class="text-muted">All</span>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="o_kanban_record_bottom mt-3">
+                                    <div class="oe_kanban_bottom_left">
+                                        <field name="progress" widget="progressbar" />
+                                    </div>
+                                    <div class="oe_kanban_bottom_right">
+                                        <field name="user_id" widget="many2one_avatar_user" />
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="act_project_project_2_project_task_finished" model="ir.actions.act_window">
+        <field name="name">Tasks</field>
+        <field name="res_model">project.task</field>
+        <field name="view_mode">kanban,tree,form,calendar,pivot,graph,activity</field>
+        <field name="domain">[('project_id', '=', active_id),('stage_id.is_closed', '=', True)]</field>
+        <field name="context">{
+            'pivot_row_groupby': ['user_id'],
+            'default_project_id': active_id,
+            }</field>
+        <field name="search_view_id" ref="project.view_task_search_form" />
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                No tasks found. Let's create one!
+            </p>
+            <p> To get things done, use activities and status on tasks.<br />
+ Chat in real time or
+                by email to collaborate efficiently. </p>
+        </field>
+    </record>
+
+    <record id="act_project_project_2_project_task_inprogress" model="ir.actions.act_window">
+        <field name="name">Tasks</field>
+        <field name="res_model">project.task</field>
+        <field name="view_mode">kanban,tree,form,calendar,pivot,graph,activity</field>
+        <field name="domain">[('project_id', '=', active_id),('stage_id.is_closed', '=', False),
+            ('stage_id.fold', '=', False), ('stage_id.sequence', '!=', 0)]</field>
+        <field name="context">{
+            'pivot_row_groupby': ['user_id'],
+            'default_project_id': active_id,
+            }</field>
+        <field name="search_view_id" ref="project.view_task_search_form" />
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                No tasks found. Let's create one!
+            </p>
+            <p> To get things done, use activities and status on tasks.<br />
+ Chat in real time or
+                by email to collaborate efficiently. </p>
+        </field>
+    </record>
+
+    <record id="act_project_project_2_project_task_new" model="ir.actions.act_window">
+        <field name="name">Tasks</field>
+        <field name="res_model">project.task</field>
+        <field name="view_mode">kanban,tree,form,calendar,pivot,graph,activity</field>
+        <field name="domain">[('project_id', '=', active_id),('stage_id.sequence', '=', 0)]</field>
+        <field name="context">{
+            'pivot_row_groupby': ['user_id'],
+            'default_project_id': active_id,
+            }</field>
+        <field name="search_view_id" ref="project.view_task_search_form" />
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                No tasks found. Let's create one!
+            </p>
+            <p> To get things done, use activities and status on tasks.<br />
+ Chat in real time or
+                by email to collaborate efficiently. </p>
+        </field>
+    </record>
+    <record id="create_tast_proj" model="ir.actions.act_window">
+        <field name="res_model">project.task</field>
+        <field name="name">Project's tasks</field>
+        <field name="view_mode">form,tree,calendar,graph,kanban</field>
+        <field name="domain">[('project_id', '=', active_id)]</field>
+        <field name="context">{'project_id':active_id,'default_project_id': active_id}</field>
+    </record>
+
+    <record id="project.open_view_project_all" model="ir.actions.act_window">
+        <field name="view_mode">kanban,tree,form,pivot,graph</field>
+        <field name="view_id" ref="project_base.view_new_project_kanban" />
+    </record>
+
+    <record id="project.open_view_project_all_config" model="ir.actions.act_window">
+        <field name="view_ids" eval="[(5, 0, 0),
+                (0, 0, {'view_mode': 'tree', 'view_id': ref('project.view_project')}),
+                (0, 0, {'view_mode': 'kanban', 'view_id': ref('project_base.view_new_project_kanban')})]" />
+    </record>
+
+
+    <record id="view_project_inherit" model="ir.ui.view">
+        <field name="name">project.project.tree</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.view_project" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="before">
+                <field name="project_no" />
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="progress" widget="progressbar" />
+                <field name="state" widget="badge" decoration-success="state == 'done'" decoration-info="state == 'draft'" optional="show" />
+                <field name="status" widget="badge" decoration-success="status == 'close'" decoration-info="status == 'open'" decoration-danger="status == 'hold'" optional="show" />
+            </xpath>
+            <xpath expr="//field[@name='user_id']" position="before">
+                <field name="start" />
+                <field name="date" />
+                <field name="launch_date" optional="hide"/>
+            </xpath>
+            <xpath expr="//field[@name='partner_id']" position="replace">
+                <field name="partner_id" optional="show" string="Partner" />
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_edit_project_sale_timesheet" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="sale_timesheet.project_project_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='allow_billable_container']" position="attributes">
+                <attribute name="attrs">{'invisible':True}</attribute>
+            </xpath>
+            <xpath expr="//page[@name='billing_employee_rate']" position="attributes">
+                <attribute name="attrs">{'invisible':True}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='sale_order_id']" position="attributes">
+                <attribute name="context">{'no_create': True, 'no_edit': True, 'delete': False}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_project_kanban_inherit">
+        <field name="name">project.project.kanban</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.view_project_kanban" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('o_primary')]" position="inside">
+                <div class="row">
+                    <div class="col-12">
+                        <span class="float-right">
+                            <field name="status" widget="label_selection" options="{'classes': {'open': 'default', 'pending': 'danger','hold': 'danger','close':'success'}}" />
+                        </span>
+                    </div>
+                </div>
+            </xpath>
+            <xpath expr="//div[hasclass('o_project_kanban_boxes')]/a[@name='action_view_tasks']" position="replace">
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Project Category -->
+    <record id="project_category_form_view" model="ir.ui.view">
+        <field name="name">project.category.form</field>
+        <field name="model">project.category</field>
+        <field name="arch" type="xml">
+            <form string="Project Category">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name" required="1" />
+                            <field name="company_id" groups="base.group_multi_company" readonly="1" />
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_category_tree" model="ir.ui.view">
+        <field name="name">project.category.tree</field>
+        <field name="model">project.category</field>
+        <field name="arch" type="xml">
+            <tree string="Project Category">
+                <field name="name" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="open_project_category_form" model="ir.actions.act_window">
+        <field name="name">Project Category</field>
+        <field name="res_model">project.category</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="project_category_tree" />
+    </record>
+
+    <menuitem action="open_project_category_form" id="menu_project_category" name="Category" parent="project.menu_project_config" sequence="4" groups="project_base.group_project_department_manager" />
+
+    <!-- Project Hold Reason -->
+    <record id="project_hold_reason_form_view" model="ir.ui.view">
+        <field name="name">project.hold.reason.form</field>
+        <field name="model">project.hold.reason</field>
+        <field name="arch" type="xml">
+            <form string="Project Hold Reason">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name" required="1" />
+                            <field name="company_id" groups="base.group_multi_company" readonly="1" />
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_hold_reason_tree_view" model="ir.ui.view">
+        <field name="name">project.hold.reason.tree</field>
+        <field name="model">project.hold.reason</field>
+        <field name="arch" type="xml">
+            <tree string="Project Hold Reason">
+                <field name="name" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="open_project_hold_reason_form" model="ir.actions.act_window">
+        <field name="name">Project Hold Reason</field>
+        <field name="res_model">project.hold.reason</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="project_hold_reason_tree_view" />
+    </record>
+
+
+    <menuitem action="open_project_hold_reason_form" id="menu_hold_reason" name="Hold Reason" parent="project.menu_project_config" sequence="5" groups="project_base.group_project_department_manager"/>
+
+
+    <!-- TODO: Create Sub-project Action 
+    <record id="sub-project_project_action" model="ir.actions.server">
+        <field name="name">Create Sub-Project</field>
+        <field name="model_id" ref="project.model_project_project"/>
+        <field name="binding_model_id" ref="project.model_project_project"/>
+        <field name="binding_view_types">form</field>
+        <field name="state">code</field>
+        <field name="code">action = records.create_sub_project()</field>
+    </record> -->
+
+
+    <delete model="ir.ui.menu" id="project.menu_project_report_task_analysis" />
+    <!-- TODO Move to timesheet module -->
+    <!-- <delete model="ir.ui.menu" id="sale_timesheet.menu_project_profitability_analysis"/> -->
+    <delete model="ir.ui.menu" id="project.project_menu_config_activity_type" />
+
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_base/views/res_config_setting.xml b/odex25_project/project_base/views/res_config_setting.xml
new file mode 100644
index 000000000..e39011d96
--- /dev/null
+++ b/odex25_project/project_base/views/res_config_setting.xml
@@ -0,0 +1,122 @@
+<odoo>
+    <record id="view_config_settings_form" model="ir.ui.view">
+        <field name="name">view.config.settings.form</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="project.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='project_time']" position="after">
+                <h2>Odex25 Projects Management</h2>
+                <div class="row mt16 o_settings_container" name="main_currency_setting_container">
+                    <div class="col-12 col-lg-6 o_setting_box" id="project_invoice" title="Project invoicing method.">
+                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_right_pane">
+                            <span class="o_form_label">Project Invoicing Method</span>
+                            <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
+                            <div class="text-muted">
+                                Create Invoice for project per stage or every specific period
+                            </div>
+                             <div class="content-group">
+                                <field name="invoice_method" required="1" class="o_light_label mt16" widget="radio"/>
+                            </div>
+                            <div class="row" attrs="{'invisible': [('invoice_method','!=','per_period')],'required': [('invoice_method','=','per_period')]}">
+                                <label string="Invoice Every" for="invoice_period" class="col-lg-3 o_light_label"/>
+                                <div class="content-group">
+                                    <field name="invoice_period" class="text-center oe_inline"/> days
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box" id="project_budget">
+                        <div class="o_setting_left_pane">
+                            <field name="module_project_budget"/>
+                        </div>
+                        <div class="o_setting_right_pane" name="intrastat_right_pane">
+                            <label for="module_project_budget"/>
+                            <div class="text-muted">
+                                Project Budget
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box" id="risk_register">
+                        <div class="o_setting_left_pane">
+                            <field name="module_project_risk_register"/>
+                        </div>
+                        <div class="o_setting_right_pane" name="intrastat_right_pane">
+                            <label for="module_project_risk_register"/>
+                            <div class="text-muted">
+                                Add Risk Register Log in your Projects
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box" id="customer_team">
+                        <div class="o_setting_left_pane">
+                            <field name="module_project_customer_team"/>
+                        </div>
+                        <div class="o_setting_right_pane" name="intrastat_right_pane">
+                            <label for="module_project_customer_team"/>
+                            <div class="text-muted">
+                                Add Customer Team Details in your Projects
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box" id="scrum_agile">
+                        <div class="o_setting_left_pane">
+                            <field name="module_project_scrum_agile"/>
+                        </div>
+                        <div class="o_setting_right_pane" name="intrastat_right_pane">
+                            <label for="module_project_scrum_agile"/>
+                            <div class="text-muted">
+                                Use Scrum Agile Methodology in your Projects
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box" id="helpdisk_task">
+                        <div class="o_setting_left_pane">
+                            <field name="module_project_helpdisk_task"/>
+                        </div>
+                        <div class="o_setting_right_pane" name="intrastat_right_pane">
+                            <label for="module_project_helpdisk_task"/>
+                            <div class="text-muted">
+                                Link Task with its associated ticket
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box" id="variation_order">
+                        <div class="o_setting_left_pane">
+                            <field name="module_project_variation_order"/>
+                        </div>
+                        <div class="o_setting_right_pane" name="intrastat_right_pane">
+                            <label for="module_project_variation_order"/>
+                            <div class="text-muted">
+                                Add Variation Order to your Projects
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box" id="project_metrics">
+                        <div class="o_setting_left_pane">
+                            <field name="module_project_metrics"/>
+                        </div>
+                        <div class="o_setting_right_pane" name="intrastat_right_pane">
+                            <label for="module_project_metrics"/>
+                            <div class="text-muted">
+                                Project Metrics
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-lg-6 o_setting_box" id="project_type">
+                    <div class="o_setting_left_pane"/>
+                    <div class="o_setting_right_pane">
+                        <span class="o_form_label">Project Type</span>
+                        <div class="text-muted">
+                            Project Type
+                        </div>
+                        <div class="content-group">
+                            <field name="type" class="o_light_label mt16" widget="radio"/>
+                        </div>
+                    </div>
+                </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/odex25_project/project_base/wizard/__init__.py b/odex25_project/project_base/wizard/__init__.py
new file mode 100644
index 000000000..d27f5ba51
--- /dev/null
+++ b/odex25_project/project_base/wizard/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from . import project_hold_reason
+from . import edit_project_phase 
+from . import down_payment_invoice_advance
diff --git a/odex25_project/project_base/wizard/down_payment_invoice_advance.py b/odex25_project/project_base/wizard/down_payment_invoice_advance.py
new file mode 100644
index 000000000..49301cc97
--- /dev/null
+++ b/odex25_project/project_base/wizard/down_payment_invoice_advance.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _
+
+
+class SaleAdvancePaymentInv(models.TransientModel):
+    _inherit = "sale.advance.payment.inv"
+
+
+    advance_down_payment_method = fields.Selection([
+        ('percentage', 'Down payment (percentage)'),
+        ('fixed', 'Down payment (fixed amount)')
+        ], string='Create Down Payment', default='percentage', required=True,
+        help="A standard invoice is issued with all the order lines ready for invoicing, \
+        according to their invoicing policy (based on ordered or delivered quantity).")
+
+    @api.onchange('advance_down_payment_method')
+    def onchange_advance_down_payment_method(self):
+        if self.advance_down_payment_method:
+            self.advance_payment_method = self.advance_down_payment_method
+
+    def create_invoices(self):
+        res = super(SaleAdvancePaymentInv, self).create_invoices()
+        project_id = self.env['project.project'].browse(self._context.get('project_id'))
+        project_id.is_down_payment = True
+        project_id.update_invoices(is_down_payment=True)
+        return res
\ No newline at end of file
diff --git a/odex25_project/project_base/wizard/down_payment_invoice_advance_views.xml b/odex25_project/project_base/wizard/down_payment_invoice_advance_views.xml
new file mode 100644
index 000000000..1c43f796c
--- /dev/null
+++ b/odex25_project/project_base/wizard/down_payment_invoice_advance_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_sale_advance_payment_inv_inherit" model="ir.ui.view">
+        <field name="name">Invoice Orders</field>
+        <field name="model">sale.advance.payment.inv</field>
+        <field name="inherit_id" ref="sale.view_sale_advance_payment_inv"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='advance_payment_method']" position="before">
+                <field name="advance_down_payment_method" class="oe_inline" widget="radio" />
+            </xpath>
+            <xpath expr="//field[@name='advance_payment_method']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_base/wizard/edit_project_phase.py b/odex25_project/project_base/wizard/edit_project_phase.py
new file mode 100644
index 000000000..8f904fde4
--- /dev/null
+++ b/odex25_project/project_base/wizard/edit_project_phase.py
@@ -0,0 +1,43 @@
+from odoo import fields, models,api,_
+from odoo.exceptions import UserError, ValidationError
+
+
+class EditProjectPhase(models.TransientModel):
+
+    _name = "edit.project.phase"
+
+    phase_id = fields.Many2one("project.phase", string="Phase", readonly=False)
+    start_date = fields.Date(string='Start Date')
+    end_date = fields.Date(string='End Date')
+    estimated_hours = fields.Float("Additional Estimated Hours")
+    edit_reasone = fields.Text("Reason")
+    #TODO open in vo module
+    # edit_type = fields.Selection(selection=[('vo','Variation Order'),('other','Other')],string="Edit type")
+    # from_vo = fields.Boolean("From VO")
+
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        res['phase_id'] = self._context.get('active_id', False)
+        phase = self.env['project.phase'].browse(res['phase_id'])
+        res['start_date'] = phase.start_date
+        res['end_date'] = phase.end_date
+        return res
+
+    @api.constrains('start_date', 'end_date')
+    def _check_dates(self):
+        if self.filtered(lambda c: c.end_date and c.start_date > c.end_date):
+            raise ValidationError(_('Phase start date must be earlier than Phase end date.'))
+
+    def edit_phase(self):
+        self.ensure_one()
+        to_write = {}
+        act_close = {"type": "ir.actions.act_window_close"}
+        active_id = self._context.get("active_id")
+        phase = self.env['project.phase'].browse(active_id)
+        if self.estimated_hours:
+            estimated_hours= phase.estimated_hours + self.estimated_hours
+            to_write.update({'estimated_hours':estimated_hours})
+        to_write.update({'start_date':self.start_date,'end_date':self.end_date})
+        phase.write(to_write)
+        return act_close
diff --git a/odex25_project/project_base/wizard/edit_project_phase_view.xml b/odex25_project/project_base/wizard/edit_project_phase_view.xml
new file mode 100644
index 000000000..9dc26afad
--- /dev/null
+++ b/odex25_project/project_base/wizard/edit_project_phase_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_edit_project_phase_wizard" model="ir.ui.view">
+        <field name="name">Edit Project Phase</field>
+        <field name="model">edit.project.phase</field>
+        <field name="arch" type="xml">
+            <form string="Edit Project Phase">
+                <p style="color: #FF0000;">
+                    <b>
+                       Kindly make sure to Save current project stages before edit.
+                   </b>
+                </p>
+                <group>
+                    <group>
+                        <field name="phase_id" readonly="1" force_save="1"/>
+                        <field name="start_date" required="1"/>
+                    </group>
+                    <group>
+                        <!-- <field name="from_vo" invisible="1"/> -->
+                        <!-- <field name="edit_type" required="1" attrs="{'invisible':[('variation_order_id','!=',False)],'readonly':True}" force_save="1"/> -->
+                        <field name="end_date" required="1"/>
+                        <field name="edit_reasone"/>
+                        <field name="estimated_hours"/>
+                    </group>
+                </group>
+                <footer>
+                    <button
+                        name="edit_phase"
+                        string="Edit"
+                        type="object"
+                        class="oe_highlight"
+                    />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_edit_project_phase" model="ir.actions.act_window">
+        <field name="name">Edit Project Phase</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">edit.project.phase</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_edit_project_phase_wizard" />
+        <field name="target">new</field>
+    </record>
+</odoo>
diff --git a/odex25_project/project_base/wizard/project_hold_reason.py b/odex25_project/project_base/wizard/project_hold_reason.py
new file mode 100644
index 000000000..558079e32
--- /dev/null
+++ b/odex25_project/project_base/wizard/project_hold_reason.py
@@ -0,0 +1,27 @@
+from odoo import fields, models,_
+
+
+class ProjectHoldWizard(models.TransientModel):
+
+    _name = "project.hold.wizard"
+
+    reason_id = fields.Many2one("project.hold.reason", string="Reason", required=True)
+    reason = fields.Text(string="Reason")
+
+    def hold_project(self):
+        self.ensure_one()
+        act_close = {"type": "ir.actions.act_window_close"}
+        project_ids = self._context.get("active_ids")
+        if project_ids is None:
+            return act_close
+        project = self.env["project.project"].browse(project_ids)
+        
+        msg1 = _('Project Hold for %s',self.reason_id.name)
+        msg2 = " "
+        if self.reason:
+            msg2 = _(' with Reason: %s',self.reason)
+        msg = msg1 + msg2
+        project.hold_reason = self.reason
+        project.action_hold()
+        project.message_post(body=msg)
+        return act_close
diff --git a/odex25_project/project_base/wizard/project_hold_reason_view.xml b/odex25_project/project_base/wizard/project_hold_reason_view.xml
new file mode 100644
index 000000000..13485e909
--- /dev/null
+++ b/odex25_project/project_base/wizard/project_hold_reason_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_project_hold_wizard" model="ir.ui.view">
+        <field name="name">Reason for the Project Hold</field>
+        <field name="model">project.hold.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Reason for the Project Hold">
+                <p class="oe_grey">
+                    Choose the reason for the project hold.
+                </p>
+                <group>
+                    <field name="reason_id"/>
+                </group>
+                <group>
+                    <field name="reason" nolabel="1"/>
+                </group>
+                <footer>
+                    <button
+                        name="hold_project"
+                        string="Hold"
+                        type="object"
+                        class="oe_highlight"
+                    />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_project_hold" model="ir.actions.act_window">
+        <field name="name">Reason for Project Hold</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.hold.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_project_hold_wizard" />
+        <field name="target">new</field>
+    </record>
+</odoo>
diff --git a/odex25_project/project_budget/__init__.py b/odex25_project/project_budget/__init__.py
new file mode 100644
index 000000000..9a7e03ede
--- /dev/null
+++ b/odex25_project/project_budget/__init__.py
@@ -0,0 +1 @@
+from . import models
\ No newline at end of file
diff --git a/odex25_project/project_budget/__manifest__.py b/odex25_project/project_budget/__manifest__.py
new file mode 100644
index 000000000..532d303b1
--- /dev/null
+++ b/odex25_project/project_budget/__manifest__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+{
+    'name': 'Odex Project Budget Custom For Projects',
+    'version': '1.0',
+    'sequence': 4,
+    'website': 'http://exp-sa.com',
+    'license': 'GPL-3',
+    'author': 'Expert Ltd',
+    'summary': 'Customize Budget for Project',
+    'category': 'Odex25-Project/Odex25-Project',
+    'description': """
+       Add Project Budget
+       - Add Is Timesheet Hours in Budget Post
+       - Hours line that read the counsume hours from timesheet
+    """,
+    'depends': ['project_base', 'account_budget_custom'],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/account_budget_security.xml',
+        'views/view.xml',
+    ],
+}
diff --git a/odex25_project/project_budget/i18n/ar_001.po b/odex25_project/project_budget/i18n/ar_001.po
new file mode 100644
index 000000000..09a81250c
--- /dev/null
+++ b/odex25_project/project_budget/i18n/ar_001.po
@@ -0,0 +1,438 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project_budget
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-05-12 12:18+0000\n"
+"PO-Revision-Date: 2024-05-12 12:18+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_project_financial_form
+msgid ""
+"<span attrs=\"{'invisible': ['|','|',('ready_budget', '=', True),('project_phase_ids','!=',[]),('id','=',False)]}\" class=\"badge badge-warning\">\n"
+"                        The Project Budget Must be Approved First in order to Enter Stages\n"
+"                    </span>"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_project_pivot
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Actual Amount"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_crossovered_budget_lines__planned_amount
+msgid ""
+"Amount you plan to earn/spend. Record a positive amount if it is a revenue "
+"and a negative amount if it is a cost."
+msgstr ""
+"المبلغ الذي تخطط لربحه/إنفاقه. سجله كقيمة موجبة إذا كان ربحًا وسالبة إذا "
+"كانت تكلفة."
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__analytic_account_id
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_crossovered_budget__analytic_account_id
+msgid ""
+"Analytic account to which this project is linked for financial management. "
+"Use an analytic account to record cost and revenue on your project."
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Are you sure you want to edit the Budget?"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_project_financial_form
+msgid "Bill Info"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_project_financial_form
+msgid "Billed Amount"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_project_project__gross_amount
+msgid "Billed amount - Total Cost"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model,name:project_budget.model_crossovered_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_project_financial_form
+msgid "Budget"
+msgstr "الموازنة"
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__project_planned_amount
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_tree
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_project_pivot
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Budget Amount"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_project_project__estimated_hours
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Budget Hours"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_form
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_project_pivot
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Budget Item"
+msgstr ""
+
+#. module: project_budget
+#: code:addons/project_budget/models/account_budget.py:0
+#: model:ir.model,name:project_budget.model_crossovered_budget_lines
+#, python-format
+msgid "Budget Line"
+msgstr "بند الموازنة"
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_form
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_tree
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_project_pivot
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Budget Lines"
+msgstr ""
+
+#. module: project_budget
+#: code:addons/project_budget/models/account_budget.py:0
+#, python-format
+msgid "Budget amount can't be less than actual amount!"
+msgstr "لا يمكن أن يكون  الصرف اكبر من مبلغ الميزانية"
+
+#. module: project_budget
+#: model:ir.model,name:project_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "بند الموازنة"
+
+#. module: project_budget
+#: model:ir.actions.act_window,name:project_budget.project_budget_custom_action
+#: model:ir.ui.menu,name:project_budget.project_budget_custom_main_menu
+msgid "Budgets"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__timesheet_hours
+msgid "Consumed Hours"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_project_financial_form
+msgid "Contract Amount"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_crossovered_budget__projected_profit
+msgid "Contract Value(With VAT & other taxes) - Total Cost"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_project_project__project_cost
+msgid "Cost"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_project_financial_form
+msgid "Cost Info"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Edit"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__date_to
+msgid "End Date"
+msgstr "تاريخ النهاية"
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_project_financial_form
+msgid "Financials"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__fiscalyear_id
+msgid "Fiscal Year"
+msgstr "السنة"
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_project_project__gross_amount
+msgid "Gross Margin"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Hour Cost"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__expensess_line_ids
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__hour_line_ids
+msgid "Hour lines"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Hours"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_account_budget_post__is_timesheet_hours
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__is_timesheet_hours
+msgid "Is Timesheet Hours"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Log"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__man_hours
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__man_hours
+msgid "Man hours"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Man-Hours"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_project_project__project_hours_cost
+msgid "Man-Hours Cost"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Others Expensess"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Percentage"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Period"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__planned_amount
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Planned Amount"
+msgstr "المبلغ المخطط"
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_tree
+msgid "Practical Amount"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model,name:project_budget.model_project_project
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__project_id
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__project_id
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project_budget
+#: code:addons/project_budget/models/project.py:0
+#, python-format
+msgid "Project Allocated hours must not be more than Man-Hours in budget!"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Project Amount"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_project_project__budget_id
+msgid "Project Budget"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_project_project__project_total_cost
+msgid "Project Cost +  Project Man Hours Cost"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_project_project__project_cost
+msgid "Project Cost to date"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_project_project__project_hours_cost
+msgid "Project Man Hours Cost to date"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__project_user_id
+msgid "Project Manager"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__project_no
+msgid "Project Number"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__projected_profit
+msgid "Projected Profit"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__sale_order_id
+msgid "Proposal"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_tree
+msgid "Qty"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_project_financial_form
+msgid "Received Amount"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__project_remaining_amount
+msgid "Remaining Amount"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Sale Order"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_crossovered_budget__sale_order_id
+msgid "Sales order to which the project is linked."
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__date_from
+msgid "Start Date"
+msgstr "تاريخ البداية"
+
+#. module: project_budget
+#: code:addons/project_budget/models/account_budget.py:0
+#, python-format
+msgid "The Budget Total Amount Must Not Exceed Project Sale Value"
+msgstr ""
+
+#. module: project_budget
+#: code:addons/project_budget/models/project.py:0
+#, python-format
+msgid "The Budget must approved from accounting first!"
+msgstr "يجب الموافقة على الميزانية من المالية أولا!"
+
+#. module: project_budget
+#: model:ir.model.fields,help:project_budget.field_crossovered_budget__fiscalyear_id
+msgid ""
+"The fiscalyear\n"
+"                                used for this budget."
+msgstr ""
+
+#. module: project_budget
+#: code:addons/project_budget/models/project.py:0
+#, python-format
+msgid ""
+"There is No enough Man-Hours in project budget %s , please contact your "
+"manager"
+msgstr ""
+
+#. module: project_budget
+#: code:addons/project_budget/models/project.py:0
+#, python-format
+msgid "There is no budget created yet for this project."
+msgstr "لم يتم إنشاء ميزانية لهذا المشروع بعد"
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "Timesheet hours"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__sale_order_amount
+msgid "Total Amount"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget__total_budget_cost
+#: model:ir.model.fields,field_description:project_budget.field_project_project__project_total_cost
+#: model:ir.model.fields,help:project_budget.field_crossovered_budget__total_budget_cost
+msgid "Total Cost"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_tree
+msgid "Unit Cost"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__amount
+msgid "Unit cost"
+msgstr ""
+
+#. module: project_budget
+#: code:addons/project_budget/models/account_budget.py:0
+#, python-format
+msgid "You cannot remove the Budget in %s state."
+msgstr ""
+
+#. module: project_budget
+#: code:addons/project_budget/models/account_budget.py:0
+#, python-format
+msgid ""
+"You have to enter at least a budgetary position or analytic account on a "
+"budget line."
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_project_project__ready_budget
+msgid "project budget is ready"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_view_tree
+msgid "project_budget_tree"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_tree
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "project_remain"
+msgstr ""
+
+#. module: project_budget
+#: model:ir.model.fields,field_description:project_budget.field_crossovered_budget_lines__qty
+msgid "qty/hours"
+msgstr ""
+
+#. module: project_budget
+#: model_terms:ir.ui.view,arch_db:project_budget.crossovered_budget_line_log_tree
+#: model_terms:ir.ui.view,arch_db:project_budget.project_budget_custom_form
+msgid "remain"
+msgstr ""
diff --git a/odex25_project/project_budget/models/__init__.py b/odex25_project/project_budget/models/__init__.py
new file mode 100644
index 000000000..6bfb478db
--- /dev/null
+++ b/odex25_project/project_budget/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import account_budget
+from . import project
\ No newline at end of file
diff --git a/odex25_project/project_budget/models/account_budget.py b/odex25_project/project_budget/models/account_budget.py
new file mode 100644
index 000000000..8ccb3d41c
--- /dev/null
+++ b/odex25_project/project_budget/models/account_budget.py
@@ -0,0 +1,248 @@
+# -*- coding: utf-8 -*-
+from odoo import api, models, fields, tools, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class ProjectBudget(models.Model):
+    _inherit = "crossovered.budget"
+
+    fiscalyear_id = fields.Many2one(required=False)
+    project_id = fields.Many2one('project.project', 'Project', required=False,tracking=True)
+    project_no = fields.Char("Project Number", related="project_id.project_no", tracking=True)
+    sale_order_id = fields.Many2one('sale.order', related="project_id.sale_order_id", string="Proposal")
+    sale_order_amount = fields.Monetary("Total Amount", related="project_id.sale_order_amount",tracking=True)
+    analytic_account_id = fields.Many2one('account.analytic.account', string="Analytic Account",
+                                          related="project_id.analytic_account_id")
+    hour_line_ids = fields.One2many('crossovered.budget.lines', 'crossovered_budget_id', string='Hour lines',
+                                    copy=False,domain=[('is_timesheet_hours', '=', True)])
+    expensess_line_ids = fields.One2many('crossovered.budget.lines', 'crossovered_budget_id', string='Hour lines',
+                                    copy=False,domain=[('is_timesheet_hours', '=', False)])
+
+    project_user_id = fields.Many2one("res.users", related="project_id.user_id", string="Project Manager", store=True)
+
+    total_budget_cost = fields.Monetary('Total Cost', compute='_compute_budget_amounts',
+                                        help="Total Cost", tracking=True)
+    projected_profit = fields.Monetary('Projected Profit', compute='_compute_budget_amounts',
+                                       help="Contract Value(With VAT & other taxes) - Total Cost",
+                                       tracking=True)
+    man_hours = fields.Boolean('Man hours' , related="project_id.man_hours",default=False)
+
+
+    @api.depends("crossovered_budget_line", "crossovered_budget_line.planned_amount",
+                 "crossovered_budget_line.project_planned_amount")
+    def _compute_budget_amounts(self):
+        """
+        Get Total Budget amounts
+        """
+        for rec in self:
+            total_budget_cost = 0.0
+            projected_profit = 0.0
+            if rec.crossovered_budget_line:
+                total_budget_cost = sum(rec.crossovered_budget_line.mapped("project_planned_amount"))
+                projected_profit = rec.sale_order_amount - total_budget_cost
+            rec.total_budget_cost = total_budget_cost
+            rec.projected_profit = projected_profit
+            
+
+    @api.onchange('project_id')
+    def _onchange_project(self):
+        """
+        set budget name by project name
+        """
+        if self.project_id:
+            self.name = self.project_id.display_name or "/"
+            self.date_from = self.project_id.start
+            self.date_to = self.project_id.date
+
+        else:
+            pass
+
+
+    @api.constrains('date_from', 'date_to', 'fiscalyear_id')
+    def _check_dates_fiscalyear(self):
+        """ 
+        pass fiscalyear constrain in case of project budget
+        """
+        if not self.project_id:
+            return super(ProjectBudget, self)._check_dates_fiscalyear()
+        else:
+            pass
+
+    @api.constrains('project_id')
+    def _check_project_id(self):
+        """
+        make sure that the project have just one budget
+        """
+        if self.project_id:
+            projects = self.env['crossovered.budget'].search(
+                [('project_id', '=', self.project_id.id), ('id', '!=', self.id)])
+            if len(projects) > 0:
+                raise ValidationError("The Project Must have just only one budget")
+
+    @api.constrains('project_id','crossovered_budget_line','crossovered_budget_line.qty')
+    def _check_project_hours(self):
+        """
+        Make sure that budget hours not more than project Allocated hours
+        """
+        if self.project_id:
+            project_hours = sum(self.project_id.project_phase_ids.mapped("estimated_hours"))
+            budget_hours = sum(self.hour_line_ids.mapped("qty"))
+            if project_hours > budget_hours:
+                raise ValidationError("Project Allocated hours must not be more than Man-Hours in budget!")
+
+    def action_budget_confirm(self):
+        self._check_project_hours()
+        self.write({'state': 'confirm'})
+
+    def action_budget_approve(self):
+        self._check_project_hours()
+        self.write({'state': 'approve'})
+
+    def action_budget_edit(self):
+        self.write({'state': 'draft'})
+
+    def action_budget_validate(self):
+        self.write({'state': 'validate'})
+
+
+    @api.constrains('sale_order_amount', 'crossovered_budget_line','crossovered_budget_line.project_planned_amount')
+    def budget_total(self):
+        for item in self:
+            if item.project_id and item.project_id.sale_order_id and sum(
+                    item.crossovered_budget_line.mapped('project_planned_amount')) > item.sale_order_amount:
+                raise ValidationError(_('The Budget Total Amount Must Not Exceed Project Sale Value'))
+
+    def open_sale_order(self):
+        return {
+            'name': 'Sale Order',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'sale.order',
+            'type': 'ir.actions.act_window',
+            'domain': [('id', '=', self.project_id.sale_order_id.id)],
+            "res_id": self.project_id.sale_order_id.id,
+        }
+
+    def unlink(self):
+        for record in self:
+            if record.state != 'draft':
+                raise UserError(_('You cannot remove the Budget in %s state.' % (record.state)))
+        return super(ProjectBudget, self).unlink()
+
+
+class ProjectBudgetPost(models.Model):
+    _inherit = "account.budget.post"
+
+    is_timesheet_hours = fields.Boolean(string='Is Timesheet Hours')
+
+    def _check_account_ids(self, vals):
+        # Inherit to pass the check in case of timesheet.
+        if ('is_timesheet_hours' in vals and not vals['is_timesheet_hours']):
+            return super(ProjectBudgetPost, self)._check_account_ids(vals)
+        else:
+            pass
+
+class ProjectBudgetLine(models.Model):
+    _name = "crossovered.budget.lines"
+    _inherit = ["crossovered.budget.lines","mail.thread"]
+
+    project_id = fields.Many2one("project.project", related='crossovered_budget_id.project_id',store=True,string='Project')
+    is_timesheet_hours = fields.Boolean(related='general_budget_id.is_timesheet_hours',string='Is Timesheet Hours')
+    qty = fields.Float(string="qty/hours", tracking=True)
+    amount = fields.Float(string="Unit cost", tracking=True)
+    timesheet_hours = fields.Float(string="Consumed Hours", tracking=True)
+    planned_amount = fields.Monetary('Planned Amount', required=True, tracking=False)
+    project_planned_amount = fields.Monetary('Budget Amount', tracking=True)
+    project_remaining_amount = fields.Monetary('Remaining Amount', compute="_compute_project_remaining_amount",tracking=False)
+    date_from = fields.Date('Start Date', tracking=True)
+    date_to = fields.Date('End Date', tracking=True)
+    man_hours = fields.Boolean('Man hours' , related="project_id.man_hours",default=False)
+
+    @api.onchange('qty', 'amount','practical_amount')
+    def _onchange_budget_amount(self):
+        for rec in self:
+            rec.planned_amount = (rec.qty * rec.amount) * -1
+            rec.project_planned_amount = abs(rec.planned_amount)
+
+    def _compute_project_remaining_amount(self):
+        for rec in self:
+            rec.project_remaining_amount = 0.0
+            rec.planned_amount = (rec.qty  * rec.amount) * -1
+            rec.project_planned_amount = abs(rec.planned_amount)
+            rec.project_remaining_amount = rec.project_planned_amount + rec.practical_amount
+
+    # todo review this funtion
+    def _compute_practical_amount(self):
+        for line in self:
+            if line.general_budget_id.is_timesheet_hours:
+                hours_domain = [('project_id', '=', line.crossovered_budget_id.project_id.id),
+                                         # ('date', '>=', line.date_from),
+                                         # ('date', '<=', line.date_to),
+                                         # ('sheet_id.state', '=', 'done')
+                                         ]
+                total_canceled_hours = sum(
+                    self.env['account.analytic.line'].search(hours_domain).mapped('unit_amount'))
+                line.timesheet_hours = total_canceled_hours
+                line.practical_amount = - (line.timesheet_hours * line.amount)
+            else:
+                # return super(ProjectBudgetLine, self)._compute_practical_amount()
+                acc_ids = line.general_budget_id.account_ids.ids
+                date_to = line.date_to
+                date_from = line.date_from
+                if line.analytic_account_id.id:
+                    analytic_line_obj = self.env['account.analytic.line']
+                    domain = [('account_id', '=', line.analytic_account_id.id),
+                              ('date', '>=', date_from),
+                              ('date', '<=', date_to),
+                              ]
+                    if acc_ids:
+                        domain += [('general_account_id', 'in', acc_ids)]
+
+                    where_query = analytic_line_obj._where_calc(domain)
+                    analytic_line_obj._apply_ir_rules(where_query, 'read')
+                    from_clause, where_clause, where_clause_params = where_query.get_sql()
+                    select = "SELECT SUM(amount) from " + from_clause + " where " + where_clause
+
+                else:
+                    aml_obj = self.env['account.move.line']
+                    domain = [('account_id', 'in',
+                               line.general_budget_id.account_ids.ids),
+                              ('date', '>=', date_from),
+                              ('date', '<=', date_to),
+                              ('move_id.state', '=', 'posted')
+                              ]
+                    where_query = aml_obj._where_calc(domain)
+                    aml_obj._apply_ir_rules(where_query, 'read')
+                    from_clause, where_clause, where_clause_params = where_query.get_sql()
+                    select = "SELECT sum(credit)-sum(debit) from " + from_clause + " where " + where_clause
+                self.env.cr.execute(select, where_clause_params)
+                line.practical_amount = self.env.cr.fetchone()[0] or 0.0
+
+    @api.constrains('project_id','planned_amount','practical_amount')
+    def _check_project_amounts(self):
+        for rec in self:
+            if rec.project_id:
+                if abs(rec.planned_amount) < abs(rec.practical_amount):
+                    raise ValidationError(_("Budget amount can't be less than actual amount!"))
+
+    @api.constrains('general_budget_id', 'analytic_account_id')
+    def _must_have_analytical_or_budgetary_or_both(self):
+        for record in self:
+            if not record.analytic_account_id and not record.general_budget_id:
+                raise ValidationError(
+                    _("You have to enter at least a budgetary position or analytic account on a budget line."))
+
+    def open_line(self):
+        self.ensure_one()
+        return {
+            'name': _('Budget Line'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'crossovered.budget.lines',
+            'res_id': self.id,
+            'views': [(self.env.ref('project_budget.crossovered_budget_line_log_form').id, 'form'), ],
+            'target': 'current',
+            'type': 'ir.actions.act_window',
+        }
+
+
diff --git a/odex25_project/project_budget/models/project.py b/odex25_project/project_budget/models/project.py
new file mode 100644
index 000000000..65b5cc13c
--- /dev/null
+++ b/odex25_project/project_budget/models/project.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+from odoo import api, models, fields, tools, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class ProjectProject(models.Model):
+    _inherit = "project.project"
+
+    budget_id = fields.One2many('crossovered.budget', 'project_id', string="Project Budget")
+    project_cost = fields.Float('Cost',compute="_get_project_costs",help="Project Cost to date")
+    project_hours_cost = fields.Float('Man-Hours Cost',compute="_get_project_costs",help="Project Man Hours Cost to date")
+    project_total_cost = fields.Float('Total Cost',compute="_get_project_costs",help="Project Cost +  Project Man Hours Cost")
+    gross_amount = fields.Float('Gross Margin',compute="_get_project_costs",help="Billed amount - Total Cost")
+    ready_budget = fields.Boolean('project budget is ready',compute="_get_budget_status")
+    estimated_hours = fields.Float("Budget Hours",compute="_get_project_hours",copy=False)
+
+
+    def _get_project_hours(self):
+        for rec in self:
+            estimated_hours = 0
+            for budget in rec.budget_id:
+                estimated_hours = sum(budget.hour_line_ids.mapped("qty"))
+            rec.estimated_hours = estimated_hours
+
+    # @api.depends('budget_id','budget_id.crossovered_budget_line','budget_id.crossovered_budget_line.practical_amount','total_invoiced_amount')
+    def _get_project_costs(self):
+        for rec in self:
+            project_cost = 0.0
+            project_hours_cost = 0.0
+            project_total_cost = 0.0
+            gross_amount = 0.0
+            for budget in rec.budget_id:
+                project_hours_cost = abs(sum(budget.mapped('crossovered_budget_line').filtered(lambda l:l.general_budget_id.is_timesheet_hours).mapped('practical_amount')))
+                project_cost = abs(sum(budget.mapped('crossovered_budget_line').filtered(lambda l:not l.general_budget_id.is_timesheet_hours).mapped('practical_amount')))
+                project_total_cost = project_hours_cost + project_cost
+            rec.project_cost = project_cost
+            rec.project_hours_cost = project_hours_cost
+            rec.project_total_cost = project_total_cost
+            rec.gross_amount = rec.total_invoiced_amount - rec.project_total_cost
+
+    def _get_budget_status(self):
+        for rec in self:
+            ready_budget = False
+            for budget in rec.budget_id:
+                if budget.state == 'done':
+                    ready_budget = True
+            rec.ready_budget = ready_budget
+
+
+    def _check_hour_budget(self, to_add_hours):
+        for rec in self:
+            for budget in rec.budget_id:
+                for line in budget.hour_line_ids:
+                    add_amount = to_add_hours * line.amount
+                    if add_amount > line.project_remaining_amount:
+                        raise ValidationError(
+                            _("There is No enough Man-Hours in project budget %s , please contact your manager") % (
+                                rec.display_name))
+
+    def _check_project_budget(self):
+        for rec in self:
+            if not rec.budget_id:
+                raise ValidationError(_("There is no budget created yet for this project."))
+            for budget in rec.budget_id:
+                if budget.state != 'done':
+                    raise ValidationError(_("The Budget must approved from accounting first!"))
+                budget_hours = sum(budget.hour_line_ids.mapped("qty"))
+                project_hours = sum(rec.project_phase_ids.mapped("estimated_hours"))
+                if project_hours > budget_hours:
+                    raise ValidationError(_("Project Allocated hours must not be more than Man-Hours in budget!"))
+
+    def action_done(self):
+        for record in self:
+            record._check_project_budget()
+        return super().action_done()
+
+    def action_view_budget(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "crossovered.budget",
+            "name": "Budget",
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            "context": {"default_project_id": self.id,"create": False,"edit": False,
+                        'form_view_ref': 'project_budget.project_budget_custom_form',
+                        'tree_view_ref': 'project_budget.project_budget_view_tree'},
+            "domain": [('project_id', '=', self.id)]
+        }
+        return action_window
+
diff --git a/odex25_project/project_budget/security/account_budget_security.xml b/odex25_project/project_budget/security/account_budget_security.xml
new file mode 100644
index 000000000..345dc5f58
--- /dev/null
+++ b/odex25_project/project_budget/security/account_budget_security.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="0">
+
+       <!--  crossovered.budget rules -->
+        <record id="budget_project_manager_rule" model="ir.rule">
+            <field name="name">Budget Project Manager rule</field>
+            <field name="model_id" ref="model_crossovered_budget"/>
+            <field name="groups" eval="[(4, ref('project.group_project_manager'))]"/>
+            <field name="domain_force">
+                ['|',('project_id.parent_id.user_id','child_of',[user.id]),('project_user_id',
+                '=', user.id)]
+            </field>
+        </record>
+
+        <record id="budget_department_rule" model="ir.rule">
+            <field name="name">Budget department manager rule</field>
+            <field name="model_id" ref="model_crossovered_budget"/>
+            <field name="groups" eval="[(4, ref('project_base.group_project_department_manager'))]"/>
+            <field name="domain_force">['|',('department_id.manager_id.user_id','child_of', [user.id]),
+                ('department_id.parent_id.manager_id.user_id','child_of', [user.id])]
+            </field>
+        </record>
+
+        <record model="ir.rule" id="budget_group_account_manager_rule">
+            <field name="name">Budget: account manager: see all</field>
+            <field name="model_id" ref="model_crossovered_budget"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4,ref('account.group_account_manager')),(4, ref('base.group_erp_manager'))]"/>
+        </record>
+
+</odoo>
diff --git a/odex25_project/project_budget/security/ir.model.access.csv b/odex25_project/project_budget/security/ir.model.access.csv
new file mode 100644
index 000000000..9fe90bcbf
--- /dev/null
+++ b/odex25_project/project_budget/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crossovered_budget_project,crossovered.budget.project,model_crossovered_budget,project.group_project_user,1,1,1,0
+access_budget_line_project,crossovered.budget.lines.project,model_crossovered_budget_lines,project.group_project_user,1,1,1,1
+
+
+
diff --git a/odex25_project/project_budget/static/description/icon.png b/odex25_project/project_budget/static/description/icon.png
new file mode 100644
index 000000000..4141f52da
Binary files /dev/null and b/odex25_project/project_budget/static/description/icon.png differ
diff --git a/odex25_project/project_budget/views/view.xml b/odex25_project/project_budget/views/view.xml
new file mode 100644
index 000000000..c6efb1340
--- /dev/null
+++ b/odex25_project/project_budget/views/view.xml
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- project form view inherit -->
+    <record id="project_project_financial_form" model="ir.ui.view">
+        <field name="name">project.project.form</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project_base.view_edit_project_inherit_form"/>
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button class="oe_stat_button" type="object"
+                        name="action_view_budget" string="Budget" icon="fa-balance-scale">
+                </button>
+            </div>
+            <xpath expr="//page[@name='invoice']" position="after">
+                <page name="financial" string="Financials">
+                    <group>
+                        <group string="Bill Info">
+                            <field name="sale_order_amount" string="Contract Amount" readonly="0"/>
+                            <field name="total_invoiced_amount" string="Billed Amount"/>
+                            <field name="total_invoiced_payment" string="Received Amount"/>
+                            <!-- <field name="back_log_amount" string="Remaining of Contract"/> -->
+                        </group>
+                        <group string="Cost Info" attrs="{'invisible': [('man_hours','=',True)]}">
+                            <field name="project_cost"/>
+                            <field name="project_hours_cost"/>
+                            <field name="project_total_cost"/>
+                            <field name="gross_amount" style="font-size:20pt;" decoration-danger="gross_amount &lt; 0.0" decoration-success="gross_amount &gt; 0.0"/>
+                        </group>
+                    </group>
+                </page>
+            </xpath>
+            <xpath expr="//field[@name='active']" position="after">
+<!--                <field name="resource_calendar_id" attrs="{'readonly':[('state','not in','draft')]}"/>-->
+<!--                <field name="type" attrs="{'readonly':[('state','not in','draft')]}"/>-->
+            </xpath>
+            <xpath expr="//group[1]/group[1]" position="before">
+                <field name="ready_budget" invisible="1"/>
+                <div attrs="{'invisible': [('ready_budget', '=', True)]}">
+                    <span attrs="{'invisible': ['|','|',('ready_budget', '=', True),('project_phase_ids','!=',[]),('id','=',False)]}" class="badge badge-warning">
+                        The Project Budget Must be Approved First in order to Enter Stages
+                    </span>
+                </div>
+            </xpath>
+            <xpath expr="//field[@name='project_phase_ids']" position="attributes">
+                <attribute name="attrs">{'readonly':['|',('state','not in',['draft','confirm']),('ready_budget','!=',True)]}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+
+    <!--Tree and form view for Project Budget Custom-->
+    <record id="project_budget_view_tree" model="ir.ui.view">
+        <field name="name">project_budget_view_tree</field>
+        <field name="model">crossovered.budget</field>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <tree string="project_budget_tree">
+                <field name="name"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <field name="user_id"/>
+                <field name="project_id"/>
+                <field name="sale_order_id"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="crossovered_budget_line_log_tree" model="ir.ui.view">
+        <field name="name">crossovered.budget.line.log</field>
+        <field name="model">crossovered.budget.lines</field>
+        <field name="arch" type="xml">
+            <tree string="Budget Lines">
+                <field name="general_budget_id"/>
+                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <field name="qty" string="Qty"/>
+                <field name="amount" string="Unit Cost"/>
+                <field name="project_planned_amount" sum="Budget Amount"/>
+                <field name="practical_amount" sum="Practical Amount"/>
+                <field name="remain" sum="remain" invisible="1"/>
+                <field name="project_remaining_amount" sum="project_remain"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="crossovered_budget_line_log_form" model="ir.ui.view">
+        <field name="name">crossovered.budget.line.log</field>
+        <field name="model">crossovered.budget.lines</field>
+        <field name="arch" type="xml">
+            <form string="Budget Lines" create="0" edit="0">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="currency_id" invisible="1"/>
+                            <field name="general_budget_id" string="Budget Item"/>
+                            <field name="project_planned_amount" force_save="1"/>
+                            <field name="analytic_account_id"
+                                   domain="['|', ('company_id', '=', parent.company_id), ('company_id', '=', False)]"
+                                   groups="analytic.group_analytic_accounting"/>
+                            <field name="project_id"/>
+                        </group>
+                        <group>
+                            <field name="date_from" />
+                            <field name="date_to" />
+                        </group>
+                    </group>
+                </sheet>
+                <!-- Chatter -->
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" groups="base.group_user"/>
+                        <field name="message_ids"/>
+                    </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_budget_custom_form" model="ir.ui.view">
+        <field name="name">project_budget_custom.form</field>
+        <field name="model">crossovered.budget</field>
+        <field name="inherit_id" ref="odex25_account_budget.crossovered_budget_view_form"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_budget_confirm'][1]" position="attributes">
+                <attribute name="groups">project.group_project_manager</attribute>
+            </xpath>
+            <xpath expr="//button[@name='action_budget_validate']" position="attributes">
+                <attribute name="groups">project_base.group_project_department_manager</attribute>
+            </xpath>
+            <xpath expr="//button[@name='action_budget_done']" position="after">
+                <button string="Edit" name="action_budget_edit" states="done" type="object"
+                        groups="project.group_project_manager" confirm="Are you sure you want to edit the Budget?"/>
+            </xpath>
+            <xpath expr="//button[@name='action_budget_done']" position="attributes">
+                <attribute name="groups">account.group_account_manager</attribute>
+            </xpath>
+            <xpath expr="//field[@name='state']" position="replace">
+                <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate,done"/>
+            </xpath>
+            <xpath expr="//label[@for='date_from']" position="replace">
+            </xpath>
+            <xpath expr="//form/sheet/group[1]/group[2]/div" position="replace">
+                    <field name="date_from" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/>
+                    <field name="date_to" class="oe_inline" attrs="{'readonly':[('state','!=','draft')]}"/>
+            </xpath>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="analytic_account_id"/>
+            </xpath>
+            <xpath expr="//form/sheet/div[1]" position="before">
+                <div class="oe_button_box" name="button_box">
+                    <button name="open_sale_order" type="object" class="oe_stat_button" icon="fa-money">
+                            <field name="sale_order_id" widget="statinfo" string="Sale Order"/>
+                    </button>
+                </div>
+            </xpath>
+            <!-- <xpath expr="//field[@name='fiscalyear_id']" position="attributes">
+                <attribute name="required">0</attribute>
+                <attribute name="invisible">1</attribute>
+            </xpath> -->
+            <xpath expr="//label[@for='name']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='name']" position="attributes">
+                <attribute name="required">0</attribute>
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='user_id']" position="after">
+                <field name="project_id" required='1' attrs="{'readonly':[('state','!=','draft')]}"/>
+                <field name="project_no"/>
+                <field name="project_user_id"/>
+                <field name="man_hours" invisible="1"/>
+                <!-- <field name="fiscalyear_id" required="0" invisible="1"/> -->
+                <field name="sale_order_amount"/>
+            </xpath>
+            <xpath expr="//field[@name='crossovered_budget_line']" position="replace">
+                <!-- type Man hours -->
+<!--                <field name="crossovered_budget_line" attrs="{'invisible':[('man_hours','=', False)]}"></field>-->
+                <separator string="Man-Hours" attrs="{'invisible':[('man_hours','=',False)]}"/>
+                <field name="hour_line_ids"
+                       context="{'default_date_from': date_from,'default_date_to': date_to,'default_analytic_account_id':analytic_account_id,'default_crossovered_budget_id':id}"
+                       widget="section_and_note_one2many" attrs="{'readonly':[('state','!=','draft')],'invisible':[('man_hours','=',False)]}">
+                    <tree string="Budget Lines" editable="bottom">
+                        <field name="general_budget_id" string="Budget Item"
+                               required="1"
+                               domain="[('is_timesheet_hours', '=', True)]"/>
+                        <field name="analytic_account_id"
+                               invisible="1"
+                               domain="['|', ('company_id', '=', False), ('company_id', '=', parent.company_id)]"
+                               groups="analytic.group_analytic_accounting"/>
+                        <field name="date_from" />
+                        <field name="date_to" />
+                        <field name="currency_id" invisible="1"/>
+                        <field name="qty" string="Hours"/>
+                        <field name="amount" string="Hour Cost"/>
+                        <field name="planned_amount" sum="Planned Amount" readonly="1" force_save="1" invisible="1"/>
+                        <field name="project_planned_amount" sum="Budget Hours" string="Budget Hours" readonly="1" force_save="1"/>
+                        <field name="timesheet_hours" sum="Timesheet hours" readonly="1" force_save="1"/>
+                        <field name="practical_amount" string="Actual Amount" sum="Actual Amount" force_save="1"/>
+                        <field name="remain" sum="remain" invisible="1"/>
+                        <field name="project_remaining_amount" sum="project_remain"/>
+                        <button type="object" name="open_line" string="Log"
+                                icon="fa-list"/>
+                    </tree>
+                    <form string="Budget Lines">
+                        <group>
+                            <group>
+                                <field name="currency_id" invisible="1"/>
+                                <field name="general_budget_id" string="Budget Item"/>
+                                <field name="planned_amount" force_save="1" invisible="1"/>
+                                <field name="project_planned_amount" readonly="1" force_save="1"/>
+                                <field name="analytic_account_id"
+                                       domain="['|', ('company_id', '=', parent.company_id), ('company_id', '=', False)]"
+                                       groups="analytic.group_analytic_accounting"/>
+                                <field name="project_id"/>
+                            </group>
+                            <group>
+                                <label for="date_from" string="Period"/>
+                                <div>
+                                    <field name="date_from" class="oe_inline"/>
+                                    -
+                                    <field name="date_to" class="oe_inline"/>
+                                </div>
+                                <field name="company_id" options="{'no_create': True}"
+                                       groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                    </form>
+                </field>
+                <!-- type Other Expensess -->
+                <separator string="Others Expensess" />
+                <field name="expensess_line_ids"
+                       context="{'default_date_from': date_from,'default_date_to': date_to,'default_analytic_account_id':analytic_account_id,'default_crossovered_budget_id':id}"
+                       widget="section_and_note_one2many" attrs="{'readonly':[('state','!=','draft')],}">
+                    <tree string="Budget Lines" editable="bottom">
+                        <field name="general_budget_id" string="Budget Item"
+                               required="1"
+                               domain="[('is_timesheet_hours', '=', False)]"/>
+                        <field name="analytic_account_id"
+                               invisible="1"
+                               domain="['|', ('company_id', '=', False), ('company_id', '=', parent.company_id)]"
+                               groups="analytic.group_analytic_accounting"/>
+                        <field name="date_from" />
+                        <field name="date_to"/>
+                        <field name="currency_id" invisible="1"/>
+                        <field name="qty" string="Percentage"/>
+                        <field name="amount" string="Project Amount"/>
+                        <field name="planned_amount" sum="Planned Amount" readonly="1" force_save="1" invisible="1"/>
+                        <field name="project_planned_amount" sum="Budget Amount" readonly="1" force_save="1"/>
+                        <field name="practical_amount" string="Actual Amount" sum="Actual Amount"/>
+                        <field name="remain" sum="remain" invisible="1"/>
+                        <field name="project_remaining_amount" sum="project_remain"/>
+                        <button type="object" name="open_line" string="Log"
+                                icon="fa-list"/>
+                    </tree>
+                    <form string="Budget Lines">
+                        <group>
+                            <group>
+                                <field name="currency_id" invisible="1"/>
+                                <field name="general_budget_id" string="Budget Item"/>
+                                <field name="planned_amount" force_save="1" invisible="1"/>
+                                <field name="project_planned_amount" sum="Budget Amount" readonly="1" force_save="1"/>
+                                <field name="analytic_account_id"
+                                       domain="['|', ('company_id', '=', parent.company_id), ('company_id', '=', False)]"
+                                       groups="analytic.group_analytic_accounting"/>
+                                <field name="project_id"/>
+                            </group>
+                            <group>
+                                <label for="date_from" string="Period"/>
+                                <div>
+                                    <field name="date_from" class="oe_inline"/>
+                                    -
+                                    <field name="date_to" class="oe_inline"/>
+                                </div>
+                                <field name="company_id" options="{'no_create': True}"
+                                       groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                    </form>
+                </field>
+
+                <group>
+                    <label for="projected_profit" class="oe_inline"/>
+                    <div>
+                        <field name="projected_profit" class="oe_inline"/>
+                    </div>
+                </group>
+                <group class="oe_subtotal_footer oe_right" name="budget_total">
+                    <field name="total_budget_cost" class="oe_subtotal_footer_separator"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+    <!--Tree and form view for Account Budget Post Custom-->
+    <record id="project_budget_post_form" model="ir.ui.view">
+        <field name="name">budgetary.positions.form</field>
+        <field name="model">account.budget.post</field>
+        <field name="inherit_id" ref="odex25_account_budget.view_budget_post_form"/>
+        <field name="arch" type="xml">
+            <field name="company_id"/>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="is_timesheet_hours" widget="boolean_toggle"/>
+            </xpath>
+        </field>
+    </record>
+
+    <!--Project Budget Custom Action-->
+    <record model="ir.actions.act_window" id="project_budget_custom_action">
+        <field name="name">Budgets</field>
+        <field name="res_model">crossovered.budget</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('project_id','!=',False)]</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+        (0, 0, {'view_mode': 'tree','view_id':ref('project_budget.project_budget_view_tree')}),
+            (0, 0, {'view_mode': 'form', 'view_id': ref('project_budget.project_budget_custom_form')})]"/>
+    </record>
+
+
+    <record id="crossovered_budget_line_project_pivot" model="ir.ui.view">
+        <field name="name">project_budget_view_pivot</field>
+        <field name="model">crossovered.budget.lines</field>
+        <field name="arch" type="xml">
+        <pivot string="Budget Lines" sample="1">
+                <field name="general_budget_id" string="Budget Item" type="row"/>
+                <field name="project_planned_amount" type="measure" string="Budget Amount"/>
+                <field name="practical_amount" type="measure" string="Actual Amount"/>
+            </pivot>
+        </field>
+    </record>
+
+
+
+    <!--Project Budget Menu-->
+    <menuitem id="project_budget_custom_main_menu" name="Budgets"
+              parent="project.menu_main_pm" groups="account.group_account_manager,project.group_project_manager,project_base.group_project_department_manager" action="project_budget_custom_action" sequence="2"/>
+<!--     <menuitem id="project_budget_custom_menu" name="Budgets"
+              parent="project_budget_custom_main_menu"
+              action="project_budget_custom_action" sequence="1"/>
+ -->
+
+</odoo>
diff --git a/odex25_project/project_customer_team/__init__.py b/odex25_project/project_customer_team/__init__.py
new file mode 100644
index 000000000..50b5fd506
--- /dev/null
+++ b/odex25_project/project_customer_team/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+from . import models
+
+
diff --git a/odex25_project/project_customer_team/__manifest__.py b/odex25_project/project_customer_team/__manifest__.py
new file mode 100644
index 000000000..6782398c7
--- /dev/null
+++ b/odex25_project/project_customer_team/__manifest__.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Odex25 Project Customer Team",
+    'summary': """Odex25 Project Customer Team""",
+    'description': """
+       Add Customer team details in project
+
+    """,
+    'category': 'Odex25-Project/Odex25-Project',
+    'version': '1.0',
+    'depends': ['project_base'],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/project_views.xml',
+        
+    ],
+}
diff --git a/odex25_project/project_customer_team/i18n/ar_001.po b/odex25_project/project_customer_team/i18n/ar_001.po
new file mode 100644
index 000000000..2771f48f5
--- /dev/null
+++ b/odex25_project/project_customer_team/i18n/ar_001.po
@@ -0,0 +1,92 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project_customer_team
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-05-12 12:13+0000\n"
+"PO-Revision-Date: 2024-05-12 12:13+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: project_customer_team
+#: model_terms:ir.ui.view,arch_db:project_customer_team.view_edit_project_inherit2_form
+msgid "Customer Team Info"
+msgstr "فريق الجهة المنفذة"
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__email
+msgid "E-mail"
+msgstr "الايميل"
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__name
+msgid "Employee"
+msgstr "الموظف"
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__id
+msgid "ID"
+msgstr ""
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__job
+msgid "Job In Project"
+msgstr "الوظيفة"
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__phone
+msgid "Phone"
+msgstr "الهاتف"
+
+#. module: project_customer_team
+#: model:ir.model,name:project_customer_team.model_project_project
+#: model:ir.model.fields,field_description:project_customer_team.field_project_customer_team__project_id
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project_customer_team
+#: model:ir.model.fields,field_description:project_customer_team.field_project_project__project_customer_team_ids
+msgid "Project Customer Team"
+msgstr ""
+
+#. module: project_customer_team
+#: model:ir.model,name:project_customer_team.model_project_customer_team
+msgid "project.customer.team"
+msgstr ""
diff --git a/odex25_project/project_customer_team/models/__init__.py b/odex25_project/project_customer_team/models/__init__.py
new file mode 100644
index 000000000..1034a6e9d
--- /dev/null
+++ b/odex25_project/project_customer_team/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import project
+
diff --git a/odex25_project/project_customer_team/models/project.py b/odex25_project/project_customer_team/models/project.py
new file mode 100644
index 000000000..489f6758b
--- /dev/null
+++ b/odex25_project/project_customer_team/models/project.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    project_customer_team_ids = fields.One2many('project.customer.team','project_id',string="Project Customer Team")
+
+class ProjectTeam(models.Model):
+    _name = "project.customer.team"
+
+    name = fields.Char(string="Employee")
+    project_id = fields.Many2one('project.project',string="Project")
+    phone = fields.Char(string="Phone")
+    email = fields.Char(string="E-mail")
+    job = fields.Char(string="Job In Project")
+
diff --git a/odex25_project/project_customer_team/security/ir.model.access.csv b/odex25_project/project_customer_team/security/ir.model.access.csv
new file mode 100644
index 000000000..a35e4a52d
--- /dev/null
+++ b/odex25_project/project_customer_team/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_customer_team,project.customer.team,model_project_customer_team,project.group_project_user,1,1,1,1
diff --git a/odex25_project/project_customer_team/views/project_views.xml b/odex25_project/project_customer_team/views/project_views.xml
new file mode 100644
index 000000000..27959abc9
--- /dev/null
+++ b/odex25_project/project_customer_team/views/project_views.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    
+    <!-- Project Project -->
+    <record id="view_edit_project_inherit2_form" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project_base.view_edit_project_inherit_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='team']" position="after">
+                <page name="customer_team" string="Customer Team Info">
+                    <field name="project_customer_team_ids" nolabel="1">
+                        <tree editable="top">
+                            <field name="name" required="1"/>
+                            <field name="phone" widget="phone" required="1" optional="show"/>
+                            <field name="email" widget="email" context="{'gravatar_image': True}" required="1" optional="show"/>
+                            <field name="job" required="1" optional="show"/>
+                            <field name="project_id" invisible="1"/>
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_helpdisk_task/__init__.py b/odex25_project/project_helpdisk_task/__init__.py
new file mode 100644
index 000000000..50b5fd506
--- /dev/null
+++ b/odex25_project/project_helpdisk_task/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+from . import models
+
+
diff --git a/odex25_project/project_helpdisk_task/__manifest__.py b/odex25_project/project_helpdisk_task/__manifest__.py
new file mode 100644
index 000000000..c8890b225
--- /dev/null
+++ b/odex25_project/project_helpdisk_task/__manifest__.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Odex25 Project Helpdisk Task",
+    'summary': """Add Ticket Link in Tasks""",
+    'description': """
+      Add Ticket Link in Tasks
+
+    """,
+    'category': 'Odex25-Project/Odex25-Project',
+    'version': '1.0',
+    'depends': ['project_base'],
+    'data': [
+        'views/project_views.xml',
+        'views/project_task_views.xml',
+    ],
+}
diff --git a/odex25_project/project_helpdisk_task/models/__init__.py b/odex25_project/project_helpdisk_task/models/__init__.py
new file mode 100644
index 000000000..f3b3fc59f
--- /dev/null
+++ b/odex25_project/project_helpdisk_task/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from . import project
+from . import project_task
+
diff --git a/odex25_project/project_helpdisk_task/models/project.py b/odex25_project/project_helpdisk_task/models/project.py
new file mode 100644
index 000000000..2159752f3
--- /dev/null
+++ b/odex25_project/project_helpdisk_task/models/project.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    link_helpdisk_task = fields.Boolean(string="Link with Helpdisk")
+    module_project_helpdisk_task = fields.Boolean(string="Link with Helpdisk",related='company_id.module_project_helpdisk_task')
+
diff --git a/odex25_project/project_helpdisk_task/models/project_task.py b/odex25_project/project_helpdisk_task/models/project_task.py
new file mode 100644
index 000000000..cc734efad
--- /dev/null
+++ b/odex25_project/project_helpdisk_task/models/project_task.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+
+
+class ProjectTask(models.Model):
+    _inherit = "project.task"
+
+    ticket_id = fields.Many2one('odex25_helpdesk.ticket', string="Ticket Name")
+    ticket_ip_address = fields.Char(string="IP Address")
+    ticket_db_name = fields.Char(string="Database name")
+    link_helpdisk_task = fields.Boolean(string="Link with Helpdisk",related='project_id.link_helpdisk_task')
+
+
+
+
+
diff --git a/odex25_project/project_helpdisk_task/views/project_task_views.xml b/odex25_project/project_helpdisk_task/views/project_task_views.xml
new file mode 100644
index 000000000..5a5e3b5c8
--- /dev/null
+++ b/odex25_project/project_helpdisk_task/views/project_task_views.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Project Tasks from inherite-->
+    <record id="view_task_form2" model="ir.ui.view">
+        <field name="name">project.task.form</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <field name="tag_ids" position="after">
+                    <field name="link_helpdisk_task" invisible="1"/>
+                    <field name="ticket_id"
+                           attrs="{'invisible': [('link_helpdisk_task', '!=', True)]}"/>
+                    <field name="ticket_ip_address"
+                           attrs="{'invisible': [('link_helpdisk_task', '!=', True)]}"/>
+                    <field name="ticket_db_name"
+                           attrs="{'invisible': [('link_helpdisk_task', '!=', True)]}"/>
+                </field>
+        </field>
+    </record>
+
+    
+</odoo>
diff --git a/odex25_project/project_helpdisk_task/views/project_views.xml b/odex25_project/project_helpdisk_task/views/project_views.xml
new file mode 100644
index 000000000..29c2633e7
--- /dev/null
+++ b/odex25_project/project_helpdisk_task/views/project_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    
+    <!-- Project Project -->
+    <record id="view_edit_project_inherit_form" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="module_project_helpdisk_task" invisible="1"/>
+                <field name="link_helpdisk_task" attrs="{'invisible': [('module_project_helpdisk_task', '!=', True)]}"/>
+            </xpath>
+        </field>
+    </record>
+            
+</odoo>
diff --git a/odex25_project/project_maps/__init__.py b/odex25_project/project_maps/__init__.py
new file mode 100644
index 000000000..0650744f6
--- /dev/null
+++ b/odex25_project/project_maps/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/odex25_project/project_maps/__manifest__.py b/odex25_project/project_maps/__manifest__.py
new file mode 100644
index 000000000..04e1989cb
--- /dev/null
+++ b/odex25_project/project_maps/__manifest__.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+{
+    'name': 'Project Maps',
+    'version': '14.0.1.0.3',
+    'category': 'Odex25-Project/Odex25-Project',
+    'description': """
+Project Maps
+========
+
+Added google_map view on your Projects
+""",
+    'depends': ['project_base', 'web_google_maps'],
+    'website': '',
+    'data': [
+        'views/project_project_view.xml',
+    ],
+    'demo': [],
+    'installable': True
+}
diff --git a/odex25_project/project_maps/i18n/ar_001.po b/odex25_project/project_maps/i18n/ar_001.po
new file mode 100644
index 000000000..75c421f7e
--- /dev/null
+++ b/odex25_project/project_maps/i18n/ar_001.po
@@ -0,0 +1,103 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project_maps
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-04 07:15+0000\n"
+"PO-Revision-Date: 2024-06-04 10:23+0300\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
+"X-Generator: Poedit 3.4.3\n"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid ""
+"<span class=\"oe_inline\"> ( </span>\n"
+"                            <span> Lat : </span>"
+msgstr ""
+"<span class=\"oe_inline\"> ( </span>\n"
+" <span> خط العرض : </span>"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "<span> : Long : </span>"
+msgstr "<span> : طويل : </span>"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "Address"
+msgstr "العنوان"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "City"
+msgstr "المدينة"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "Country"
+msgstr "الدولة"
+
+#. module: project_maps
+#: model:ir.model.fields,field_description:project_maps.field_project_project__project_latitude
+msgid "Customer Latitude"
+msgstr "خط العرض"
+
+#. module: project_maps
+#: model:ir.model.fields,field_description:project_maps.field_project_project__project_longitude
+msgid "Customer Longitude"
+msgstr "خط الطول"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "Geolocalize"
+msgstr "تحديد الموقع الجغرافي"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "Geolocation"
+msgstr "تحديد الموقع الجغرافي"
+
+#. module: project_maps
+#: model:ir.actions.act_window,name:project_maps.project_map
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "Google Map"
+msgstr "الخرائط  قوقل"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_google_map
+msgid "Maps"
+msgstr "الخرائط  قوقل"
+
+#. module: project_maps
+#: model:ir.model,name:project_maps.model_project_project
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "State"
+msgstr "ولاية"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "Street 2..."
+msgstr "شارع 2..."
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "Street..."
+msgstr "شارع"
+
+#. module: project_maps
+#: model_terms:ir.ui.view,arch_db:project_maps.project_form_google_maps_inherit
+msgid "ZIP"
+msgstr "الرمز البريدي"
diff --git a/odex25_project/project_maps/models/__init__.py b/odex25_project/project_maps/models/__init__.py
new file mode 100644
index 000000000..56545d0d4
--- /dev/null
+++ b/odex25_project/project_maps/models/__init__.py
@@ -0,0 +1 @@
+from . import project_project
diff --git a/odex25_project/project_maps/models/project_project.py b/odex25_project/project_maps/models/project_project.py
new file mode 100644
index 000000000..42320e361
--- /dev/null
+++ b/odex25_project/project_maps/models/project_project.py
@@ -0,0 +1,47 @@
+from odoo import api, fields, models
+
+
+class ProjectProject(models.Model):
+    _inherit = 'project.project'
+
+    project_longitude = fields.Float(
+        string='Customer Longitude', digits=(16, 5)
+    )
+    project_latitude = fields.Float(
+        string='Customer Latitude', digits=(16, 5)
+    )
+
+
+    @api.model
+    def _geo_localize(self, street='', zip='', city='', state='', country=''):
+        geo_obj = self.env['base.geocoder']
+        search = geo_obj.geo_query_address(
+            street=street, zip=zip, city=city, state=state, country=country
+        )
+        result = geo_obj.geo_find(search, force_country=country)
+        if result is None:
+            search = geo_obj.geo_query_address(
+                city=city, state=state, country=country
+            )
+            result = geo_obj.geo_find(search, force_country=country)
+        return result
+
+    def geo_localize(self):
+        for project in self.with_context(lang='en_US'):
+            result = self._geo_localize(
+                street=project.street,
+                zip=project.zip,
+                city=project.city,
+                state=project.state_id.name,
+                country=project.country_id.name,
+            )
+
+            if result:
+                project.write(
+                    {
+                        'project_latitude': result[0],
+                        'project_longitude': result[1],
+                    }
+                )
+
+        return True
diff --git a/odex25_project/project_maps/views/project_project_view.xml b/odex25_project/project_maps/views/project_project_view.xml
new file mode 100644
index 000000000..727be04e5
--- /dev/null
+++ b/odex25_project/project_maps/views/project_project_view.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="project_google_map" model="ir.ui.view">
+        <field name="name">view.project.project.google_map</field>
+        <field name="model">project.project</field>
+        <field name="arch" type="xml">
+            <google_map string="Maps" lat="project_latitude" lng="project_longitude" color="color">
+                <field name="project_latitude"/>
+                <field name="project_longitude"/>
+                <field name="partner_id"/>
+                <field name="color"/>
+                <field name="priority"/>
+                <field name="tag_ids"/>
+                <field name="user_id"/>
+                <progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}'/>
+                <templates>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_content">
+                            <div>
+                                <strong class="o_kanban_record_title">
+                                    <span>
+                                        <field name="name"/>
+                                    </span>
+                                </strong>
+                            </div>
+                            <div>
+                                <span class="o_kanban_record_subtitle">
+                                    <field name="partner_id"/>
+                                </span>
+                            </div>
+                            <div>
+                                <field name="tag_ids"/>
+                            </div>
+                            <div class="o_kanban_record_bottom">
+                                <div class="oe_kanban_bottom_left">
+                                    <field name="priority" widget="priority"/>
+                                </div>
+                                <div class="oe_kanban_bottom_right">
+                                    <field name="user_id" widget="many2one_avatar_user"/>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </google_map>
+        </field>
+    </record>
+    <record id="project_map" model="ir.actions.act_window">
+        <field name="name">Google Map</field>
+        <field name="res_model">project.project</field>
+        <field name="view_mode">google_map</field>
+        <field name="view_id" ref="project_maps.project_google_map"/>
+        <field name="domain">[('id', '=', active_id)]</field>
+    </record>
+    <record id="project_form_google_maps_inherit" model="ir.ui.view">
+        <field name="name">view.project.task.form.google_maps.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="priority" eval="1000"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook//page[@name='location']" position="replace">
+                <page name="geolocalize" string="Geolocalize">
+                    <group>
+                        <group>
+                            <label for="street" string="Address"/>
+                            <div class="o_address_format">
+                                <field name="street" placeholder="Street..." class="o_address_street" widget="gplaces_address_autocomplete" options="{'lat': 'project_latitude', 'lng': 'project_longitude'}"/>
+                                <field name="street2" placeholder="Street 2..." class="o_address_street"/>
+                                <field name="city" placeholder="City" class="o_address_city"/>
+                                <field name="state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}" context="{'default_country_id': country_id}"/>
+                                <field name="zip" placeholder="ZIP" class="o_address_zip"/>
+                                <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
+                            </div>
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Geolocation" colspan="2"/>
+                        <button string="Geolocalize" name="geo_localize" type="object" icon="fa-check" colspan="2"/>
+                        <div>
+                            <span class="oe_inline"> ( </span>
+                            <span> Lat : </span>
+                            <field name="project_latitude" class="oe_inline" no_label="1"/>
+                            <span> : Long : </span>
+                            <field name="project_longitude" class="oe_inline" nolabel="1"/>
+                            <span>) </span>
+                        </div>
+                    </group>
+                </page>
+            </xpath>
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="%(project_maps.project_map)d" type="action" class="oe_stat_button" context="{'search_default_name': name}" icon="fa-map-marker" string="Google Map" attrs="{'invisible': ['|',('project_latitude', '=', 0.0), ('project_longitude', '=', 0.0)]}"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="project.open_view_project_all" model="ir.actions.act_window">
+        <field name="view_mode">kanban,tree,form,calendar,pivot,graph,activity,google_map</field>
+    </record>
+    <!-- <record id="project_view_google_map" model="ir.actions.act_window.view">
+        <field name="sequence" eval="63"/>
+        <field name="view_mode">google_map</field>
+        <field name="view_id" ref="project_google_map"/>
+        <field name="act_window_id" ref="project.open_view_project_all"/>
+    </record> -->
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_metrics/__init__.py b/odex25_project/project_metrics/__init__.py
new file mode 100644
index 000000000..f5ba686bc
--- /dev/null
+++ b/odex25_project/project_metrics/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import models
\ No newline at end of file
diff --git a/odex25_project/project_metrics/__manifest__.py b/odex25_project/project_metrics/__manifest__.py
new file mode 100644
index 000000000..0b7e46a96
--- /dev/null
+++ b/odex25_project/project_metrics/__manifest__.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Project Metrics",
+    'summary': """Project Metrics""",
+    'category': 'Odex25-Project/Odex25-Project',
+    'description': """
+       Add Project Metrics that calculated from tasks progress
+       and time plan and project counsumed hours
+       
+    """,
+    'version': '0.1',
+    'depends': ['project_time_plan'],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/project_metrics_views.xml',
+        'views/project_project_views.xml',
+        'views/project_task_views.xml',
+    ],
+}
diff --git a/odex25_project/project_metrics/models/__init__.py b/odex25_project/project_metrics/models/__init__.py
new file mode 100644
index 000000000..48c65a216
--- /dev/null
+++ b/odex25_project/project_metrics/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import project_metrics,project_project,project_task
\ No newline at end of file
diff --git a/odex25_project/project_metrics/models/project_metrics.py b/odex25_project/project_metrics/models/project_metrics.py
new file mode 100644
index 000000000..808ceb7d3
--- /dev/null
+++ b/odex25_project/project_metrics/models/project_metrics.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api
+
+
+class ProjectMetrics(models.Model):
+    _name = "project.project.metrics"
+    _description = "Project Metrics"
+    _order = "week_id"
+
+    project_id = fields.Many2one('project.project', string="Project")
+    # weight = fields.Float(related='project_id.weight', string="Weight", store=True)
+    week_id = fields.Many2one('time.plan.details', string="Week")
+    plan_line_ids = fields.Many2many('project.time.plan.line', compute="_get_time_plan", string="Time plan lines")
+    total_time_plan = fields.Float(related="project_id.total_time_plan", string="Total Time Plan")
+    week_time_plan = fields.Float(compute="_compute_progress", string="Week cumulative distributed budge(PV)",
+                                  store=True)
+    week_consumed_hours = fields.Float(compute="_compute_progress", string="Week accumulative Consumed Hours(AC)",
+                                       store=True)
+    progress = fields.Float(string="Progress%", compute="_compute_progress", store=True)
+    ev = fields.Float(string="Earned value", compute="_compute_progress", store=True,
+                      help="Earned value (EV) = Progress% * Total Hours")
+    cpi = fields.Float(string="Cost Performance Index", compute="_compute_progress", store=True,
+                       help="Cost Performance Index (CPI = EV/AC) \n *EV Earned Value \n *AC  accumulative Consumed Hours")
+    spi = fields.Float(string="Schedule Performance Index", compute="_compute_progress", store=True,
+                       help="Schedule Performance Index (SPI = EV/PV) \n *PV  cumulative distributed budge \n *EV Earned Value")
+    cv = fields.Float(string="Cost Variance", compute="_compute_progress", store=True,
+                      help="Cost Variance (CV = EV - AC)")
+    sv = fields.Float(string="Schedule Variance", compute="_compute_progress", store=True,
+                      help="Schedule Variance (SV = EV - PV)")
+    eac = fields.Float(string="Estimated Cost at Completion", compute="_compute_progress", store=True,
+                       help="Estimated Cost at Completion (EAC) = (BAC / CPI) \n *BAC Planned Budget \n *CPI Cost Performance Index")
+    etc = fields.Float(string="Estimated To Completion (ETC)", compute="_compute_progress", store=True,
+                       help="Estimated To Completion (ETC) = (BAC - EV) / CPI \n *BAC Planned Budget \n *CPI Cost Performance Index \n *EV Earned Value")
+    vac = fields.Float(string="Variance at Completion (VAC)", compute="_compute_progress", store=True,
+                       help="Variance at Completion (VAC) = BAC - EAC \n *BAC Planned Budget \n *EAC Estimated Cost at Completion")
+    tcpi = fields.Float(string="To Complete Performance Index(TCPI)", compute="_compute_progress", store=True,
+                        help="To Complete Performance Index(TCPI) = (BAC - EV) / (BAC - AC) \n *BAC Planned Budget \n *EV Earned Value \n *AC Accumulative Consumed Hours")
+
+    def _compute_progress(self):
+        for rec in self:
+            # 1 Compute Progress
+            print("===================================",rec.project_id.tasks.filtered(lambda task: not task.parent_id))
+            progress = 0.0
+            for dept in rec.project_id.tasks.filtered(lambda task: not task.parent_id).mapped('task_progress_ids').filtered(lambda p: p.week_id.id == rec.week_id.id):
+                progress += (dept.task_progress * (dept.weight / 100))
+            rec.progress = round(progress)
+            # for dept in rec.project_id.tasks.filtered(lambda task: not task.parent_id).mapped(
+            #         'task_progress_ids').filtered(lambda p: p.week_id.id == rec.week_id.id):
+            #     progress += (dept.task_progress * (dept.weight / 100))
+            # rec.progress = round(progress)
+
+            # 2 Compute ev
+            rec.ev = (rec.progress / 100) * rec.total_time_plan
+            # 3 cpi
+            rec.week_consumed_hours = sum(self.env['account.analytic.line'].search(
+                [('project_id', '=', rec.project_id.id), ('date', '<=', rec.week_id.date_to)]).mapped('unit_amount'))
+            if rec.week_consumed_hours:
+                rec.cpi = rec.ev / rec.week_consumed_hours
+            else:
+                rec.cpi = 0.0
+            # 4 spi
+            rec.week_time_plan = sum(self.env['project.time.plan.line'].search(
+                [('project_id', '=', rec.project_id.id), ('time_plan_id.date_to', '<=', rec.week_id.date_to)]).mapped(
+                'time_plan'))
+            if rec.week_time_plan:
+                rec.spi = rec.ev / rec.week_time_plan
+            else:
+                rec.spi = 0.0
+            # 5 cv
+            if rec.ev:
+                rec.cv = rec.ev - rec.week_consumed_hours
+            else:
+                rec.cv = 0.0
+            # 6 sv
+            if rec.ev:
+                rec.sv = rec.ev - rec.week_time_plan
+            else:
+                rec.sv = 0.0
+            # 7 eac
+            if rec.cpi:
+                rec.eac = rec.total_time_plan / rec.cpi
+            else:
+                rec.eac = 0.0
+            # 8 etc
+            if rec.cpi:
+                rec.etc = (rec.total_time_plan - rec.ev) / rec.cpi
+            else:
+                rec.etc = 0.0
+            # 9 VAC = BAC - EAC
+            rec.vac = rec.total_time_plan - rec.eac
+            # 10 TCPI = (BAC - EV) / (BAC - AC)
+            if rec.total_time_plan - rec.week_consumed_hours > 0:
+                rec.tcpi = (rec.total_time_plan - rec.ev) / (rec.total_time_plan - rec.week_consumed_hours)
+            else:
+                rec.tcpi = 0.0
+
+    def _get_time_plan(self):
+        for rec in self:
+            rec.plan_line_ids = []
+            plan_line_ids = self.env['project.time.plan.line'].search(
+                [('project_id', '=', rec.project_id.id), ('time_plan_id', '=', rec.week_id.id)])
+            if plan_line_ids:
+                rec.plan_line_ids = plan_line_ids.ids
diff --git a/odex25_project/project_metrics/models/project_project.py b/odex25_project/project_metrics/models/project_project.py
new file mode 100644
index 000000000..f36ceb2e2
--- /dev/null
+++ b/odex25_project/project_metrics/models/project_project.py
@@ -0,0 +1,69 @@
+
+# -*- coding: utf-8 -*-
+import ast
+import calendar
+from datetime import datetime, time, timedelta
+from dateutil import relativedelta
+from odoo.addons.resource.models.resource import float_to_time, HOURS_PER_DAY
+from odoo.osv import expression
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    total_time_plan = fields.Float("Total Time Plan", compute="_compute_total_time", store=True)
+    week_ids = fields.Many2many('time.plan.details', compute="_get_project_weeks", string="Week")
+    project_metrics_ids = fields.One2many("project.project.metrics", 'project_id', string="Project Metrics")
+
+
+
+    @api.depends("time_plan_ids", "time_plan_ids.time_plan")
+    def _compute_total_time(self):
+        for rec in self:
+            rec.total_time_plan = 0.0
+            if rec.time_plan_ids:
+                rec.total_time_plan = sum(rec.time_plan_ids.mapped("time_plan"))
+
+    @api.depends("time_plan_ids", "time_plan_ids.line_ids")
+    def _get_project_weeks(self):
+        for rec in self:
+            rec.week_ids = []
+            weeks = rec.time_plan_ids.mapped("line_ids").mapped("time_plan_id")
+            if weeks:
+                rec.week_ids = weeks.ids
+                # rec.get_project_metrics()
+
+    def get_project_metrics(self):
+        for rec in self:
+            vals_list = []
+            ProjectMetrics = self.env['project.project.metrics']
+            metrics_weeks = rec.project_metrics_ids.mapped("week_id").ids
+            for week in rec.week_ids:
+                if week.id not in metrics_weeks:
+                    vals_list.append({'project_id': rec.id, 'week_id': week.id})
+            if vals_list:
+                ProjectMetrics.create(vals_list)
+
+
+
+
+
+    def action_view_project_metrics(self):
+        self.ensure_one()
+        self.get_project_metrics()
+        self.mapped("project_metrics_ids")._get_time_plan()
+        self.mapped("project_metrics_ids")._compute_progress()
+        self.project_metrics_ids._get_time_plan()
+        self.project_metrics_ids._compute_progress()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.project.metrics",
+            "name": "Project Metrics",
+            'view_type': 'form',
+            'view_mode': 'tree,pivot,graph',
+            "context": {"create": False},
+            "domain": [('project_id', '=', self.id)]
+        }
+        return action_window
\ No newline at end of file
diff --git a/odex25_project/project_metrics/models/project_task.py b/odex25_project/project_metrics/models/project_task.py
new file mode 100644
index 000000000..5fdcb8fde
--- /dev/null
+++ b/odex25_project/project_metrics/models/project_task.py
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+
+class ProjectTimePlan(models.Model):
+    _inherit = "project.time.plan"
+
+    task_ids = fields.One2many('project.task', 'time_plan_id', string="Tasks")
+
+
+
+    @api.model
+    def create(self, vals):
+        res = super().create(vals)
+        if vals.get('time_plan_ids', False):
+            res.task_ids.get_progress_ids()
+        return res
+
+    def write(self, vals):
+        res = super().write(vals)
+        if vals.get('time_plan_ids', False):
+            self.task_ids.get_progress_ids()
+        return res
+
+class ProjectTask(models.Model):
+    _inherit = "project.task"
+
+    phase_id = fields.Many2one('project.phase', string='Project Phase', domain="[('project_id','=',project_id)]")
+    department_id = fields.Many2one('hr.department', string="Department")
+    department_ids = fields.Many2many('hr.department', related="phase_id.department_ids", string="All stage Departments")
+    task_progress_ids = fields.One2many('project.task.progress', 'task_id', string="Task Progress")
+    time_plan_id = fields.Many2one('project.time.plan', compute="_get_time_plan", string="Time plan", store=True)
+    plan_details_ids = fields.Many2many('time.plan.details', related="time_plan_id.time_plan_ids")
+    weight = fields.Float(string="Weight", compute="_compute_weight" ,store=True)
+    plan_by_departments = fields.Boolean(related='company_id.plan_by_departments')
+
+    @api.depends('planned_hours', 'time_plan_id', 'time_plan_id.time_plan')
+    def _compute_weight(self):
+        for rec in self:
+            rec.weight = 0
+            if rec.child_ids:
+                rec.weight = sum(rec.child_ids.mapped('weight'))
+            else:
+                if rec.planned_hours and rec.time_plan_id.time_plan:
+                    rec.weight = round((rec.planned_hours / rec.time_plan_id.time_plan) * 100, 1)
+
+    @api.depends('project_id', 'department_id', 'phase_id')
+    def _get_time_plan(self):
+        for rec in self:
+            rec.time_plan_id = False
+            if rec.project_id and rec.department_id and rec.phase_id:
+                rec.time_plan_id = self.env['project.time.plan'].search(
+                    [('project_id', '=', rec.project_id.id), ('department_id', '=', rec.department_id.id),
+                     ('phase_id', '=', rec.phase_id.id)])
+
+    def _get_same_week(self, week):
+        weeks = self.env['project.task.progress']
+        weeks = self.mapped('task_progress_ids').filtered(lambda l: l.week_id.id == week.id)
+        return weeks
+
+
+
+
+    @api.onchange('phase_id')
+    def _onchange_phase_id(self):
+        for task in self:
+            task.department_id=False
+
+
+
+    def get_progress_ids(self):
+        TaskLine = self.env["project.task.progress"]
+        for rec in self:
+            vals_list = []
+            lines_week = rec.task_progress_ids.mapped('week_id')
+            for week in rec.time_plan_id.time_plan_ids:
+                if week.id not in lines_week.ids:
+                    vals_list.append({'task_id': rec.id, 'week_id': week.id, })
+            rec.task_progress_ids = [(6, 0, TaskLine.create(vals_list).ids)]
+
+    def action_task_progress(self):
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.task.progress",
+            "name": "Task Progress",
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            "context": {"create": False},
+            "domain": [('task_id', '=', self.id)]
+        }
+        return action_window
+
+
+    def write(self, vals):
+        res = super().write(vals)
+        if vals.get('project_id', False) or vals.get('department_id', False) or vals.get('phase_id', False) or vals.get('time_plan_id', False):
+            self.get_progress_ids()
+        return res
+
+    @api.model
+    def create(self, vals):
+        res = super().create(vals)
+        if res.project_id.status not in ['open']:
+            raise ValidationError(_("You cannot create Tasks for Project that is not in Open status!"))
+        res.get_progress_ids()
+        return res
+
+
+
+
+
+
+class ProjectTaskProgress(models.Model):
+    _name = "project.task.progress"
+    _description = "Task Progress"
+    _rec_name = 'task_id'
+
+    task_id = fields.Many2one('project.task', string="Task",ondelete="cascade")
+    weight = fields.Float(related="task_id.weight", string="Weight")
+    project_id = fields.Many2one('project.project', related="task_id.project_id", string="Project", store=True)
+    week_id = fields.Many2one('time.plan.details', string="Plan Details")
+    date_from = fields.Date(related="week_id.date_from")
+    date_to = fields.Date(related="week_id.date_to")
+    department_id = fields.Many2one('hr.department', related="task_id.department_id", store=True)
+    task_progress = fields.Float(string="Progress%", compute='_compute_progress', readonly=False, store=True,copy=False)
+
+
+    @api.depends('task_id.child_ids', 'task_id.project_id', 'task_id.child_ids.task_progress_ids',
+                 'task_id.child_ids.task_progress_ids.task_progress')
+    def _compute_progress(self):
+        for record in self:
+            if record.task_id.child_ids and record.task_id.weight:
+                task_progress = 0.0
+                progress_rec = record.task_id.child_ids._get_same_week(record.week_id)
+                for t in progress_rec:
+                    task_progress += (t.task_progress * t.task_id.weight)
+
+                record.task_progress = round(task_progress / record.task_id.weight, 1)
+            project_metrics = record.project_id.project_metrics_ids.filtered(lambda x: x.week_id.id == record.week_id.id)
+            project_metrics._compute_progress()
diff --git a/odex25_project/project_metrics/security/ir.model.access.csv b/odex25_project/project_metrics/security/ir.model.access.csv
new file mode 100644
index 000000000..ba179cc7f
--- /dev/null
+++ b/odex25_project/project_metrics/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_project_metrics,project.project.metrics,model_project_project_metrics,project.group_project_user,1,1,1,1
+access_project_task_progress,project_task_progress,model_project_task_progress,project.group_project_user,1,1,1,1
\ No newline at end of file
diff --git a/odex25_project/project_metrics/views/project_metrics_views.xml b/odex25_project/project_metrics/views/project_metrics_views.xml
new file mode 100644
index 000000000..c4fc0c383
--- /dev/null
+++ b/odex25_project/project_metrics/views/project_metrics_views.xml
@@ -0,0 +1,68 @@
+<odoo>
+    <data>
+
+        <record id="project_project_metrics_pivot" model="ir.ui.view">
+            <field name="name">project.project.metrics.pivot</field>
+            <field name="model">project.project.metrics</field>
+            <field name="arch" type="xml">
+                <pivot string="Project Metrics" disable_linking="True" sample="1">
+                    <field name="week_id" type="col"/>
+                    <field name="project_id" type="row"/>
+                    <field name="progress" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record id="project_project_metrics_tree" model="ir.ui.view">
+            <field name="name">project.project.metrics.tree</field>
+            <field name="model">project.project.metrics</field>
+            <field name="arch" type="xml">
+                <tree string="Project Metrics">
+                    <field name="week_id"/>
+                    <field name="progress" widget="progressbar"/>
+                    <field name="ev" optional="hide"/>
+                    <field name="total_time_plan" string="Total Allocated Budget Hours" invisible="1"/>
+                    <field name="week_time_plan" string="PV" optional="hide"/>
+                    <field name="week_consumed_hours" string="AC" optional="hide"/>
+                    <field name="cpi"
+                           options='{"fg_color": "red: cpi &lt;= 1 and ev != 0.0;green:cpi &gt; 1 and ev != 0.0"}'
+                           optional="hide"/>
+                    <field name="spi"
+                           options='{"fg_color": "red: spi &lt;= 1 and ev != 0.0;green:spi &gt; 1 and ev != 0.0"}'
+                           optional="hide"/>
+                    <field name="cv"
+                           options='{"fg_color": "red: cv &lt;= 0 and ev != 0.0;green:cv &gt; 0 and ev != 0.0"}'
+                           optional="hide"/>
+                    <field name="sv"
+                           options='{"fg_color": "red: sv &lt;= 0 and ev != 0.0;green:sv &gt; 0 and ev != 0.0"}'
+                           optional="hide"/>
+                    <field name="eac"
+                           options='{"fg_color": "red: eac &gt; total_time_plan and ev != 0.0;green:eac &lt; total_time_plan and ev != 0.0"}'
+                           optional="hide"/>
+                    <field name="etc"
+                           options='{"fg_color": "red: etc &gt; total_time_plan and ev != 0.0;green:etc &lt; total_time_plan and ev != 0.0"}'
+                           optional="hide"/>
+                    <field name="vac"
+                           options='{"fg_color": "red: vac &lt; 0 and ev != 0.0;green:vac &gt; 0 and ev != 0.0"}'
+                           optional="hide"/>
+                    <field name="tcpi"
+                           options='{"fg_color": "red: tcpi &gt; 1 and ev != 0.0;green:tcpi &lt; 1 and ev != 0.0"}'
+                           optional="hide"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="project_project_metrics_graph" model="ir.ui.view">
+            <field name="name">project.project.metrics.graph</field>
+            <field name="model">project.project.metrics</field>
+            <field name="arch" type="xml">
+                <graph string="Project Metrics" type="line" sample="1" disable_linking="1">
+                    <field name="week_id"/>
+                    <field name="ev" type="measure"/>
+                </graph>
+            </field>
+        </record>
+
+
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_metrics/views/project_project_views.xml b/odex25_project/project_metrics/views/project_project_views.xml
new file mode 100644
index 000000000..5e1f386e0
--- /dev/null
+++ b/odex25_project/project_metrics/views/project_project_views.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Project -->
+    <record id="view_edit_project_inherit_form" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project_base.view_edit_project_inherit_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_project_invoice']" position="after">
+                <button class="d-none d-md-inline oe_stat_button"
+                        type="object" name="action_view_project_metrics" icon="fa-bar-chart"
+                        string="Project Metrics">
+                    <field name="project_metrics_ids" attrs="{'invisible': True}"/>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
+
+
+
+
+</odoo>
diff --git a/odex25_project/project_metrics/views/project_task_views.xml b/odex25_project/project_metrics/views/project_task_views.xml
new file mode 100644
index 000000000..a78518d94
--- /dev/null
+++ b/odex25_project/project_metrics/views/project_task_views.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+
+
+    <!-- Project Tasks from inherit-->
+    <record id="view_task_form_inherit" model="ir.ui.view">
+        <field name="name">project.task.form</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button name="action_task_progress" type="object" class="oe_stat_button" icon="fa-dashboard" string="Progress%" >
+                </button>
+            </div>
+
+
+            <xpath expr="//field[@name='user_id']" position="before">
+                <field name="department_ids" invisible="1"/>
+                <field name="plan_by_departments" invisible="1"/>
+                <field name="department_id"  domain="[('id','in',department_ids)]" attrs="{'invisible': [('plan_by_departments', '=', False)]}"/>
+
+            </xpath>
+
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="weight" />
+                <field name="plan_details_ids" widget="many2many_tags" invisible="1" />
+            </xpath>
+            <xpath expr="//page[@name='description_page']" position="after">
+                <page name="progress_page" string="Progress">
+                    <group name="progress">
+                        <field name="task_progress_ids" nolabel="1" widget="x2many_2d_matrix" field_x_axis="week_id" field_y_axis="task_id" field_value="task_progress" show_column_totals="0">
+                            <tree limit="1000000">
+                                <field name="task_progress" />
+                                <field name="task_id" />
+                                <field name="week_id" />
+                            </tree>
+                        </field>
+                    </group>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Project Task tree Inherit-->
+    <record id="view_task_tree_inherit" model="ir.ui.view">
+        <field name="name">project.task.tree</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project_base.view_task_tree" />
+        <field name="arch" type="xml">
+
+            <field name="phase_id" position="after">
+                <field name="department_id"/>
+            </field>
+        </field>
+    </record>
+
+
+
+
+    <!-- Project Task search view Inherit-->
+    <record id="view_task_search_form_inherit" model="ir.ui.view">
+        <field name="name">project.task.filter</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project_base.view_task_search_form" />
+        <field name="arch" type="xml">
+            <field name="project_id" position="after">
+                <field name="phase_id" />
+            </field>
+            <filter name="group_phase_id" position="after">
+                <filter string="Department" name="group_department_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'department_id'}" />
+            </filter>
+
+        </field>
+    </record>
+
+    <!-- Task pivot-->
+    <record id="view_task_pivot" model="ir.ui.view">
+        <field name="name">project.task.pivot</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_project_task_pivot" />
+        <field name="arch" type="xml">
+            <field name="project_id" position="after">
+                <field name="effective_hours" type="measure"/>
+                <field name="planned_hours" type="measure"/>
+            </field>
+            <field name="stage_id" position="replace">
+                <field name="department_id" type="col"/>
+            </field>
+        </field>
+    </record>
+
+
+
+
+
+
+    <record id="project_task_progress_pivot_view" model="ir.ui.view">
+        <field name="name">project.task.progress.pivot.view</field>
+        <field name="model">project.task.progress</field>
+        <field name="arch" type="xml">
+            <pivot string="Activities Progress Report" sample="1">
+                <field name="project_id" type="row" />
+                <field name="department_id" type="row" />
+                <field name="task_id" type="row" />
+                <field name="week_id" type="col" />
+                <field name="task_progress" type="measure" />
+            </pivot>
+        </field>
+    </record>
+
+    <record id="project_task_progress_tree_view" model="ir.ui.view">
+        <field name="name">project.task.progress.tree.view</field>
+        <field name="model">project.task.progress</field>
+        <field name="arch" type="xml">
+            <tree string="Activities Progress" sample="1" editable="top">
+                <field name="week_id" readonly="1"/>
+                <field name="task_progress"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="project_task_progress_pivot_action" model="ir.actions.act_window">
+        <field name="name">Activities Progress Report</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.task.progress</field>
+        <field name="view_mode">pivot</field>
+        <field name="view_id" ref="project_task_progress_pivot_view" />
+    </record>
+
+    <!-- inherit action to remove default filter-->
+    <!-- 'search_default_group_phase_id':1,'search_default_group_component_id':1 -->
+    <record id="project.action_view_all_task" model="ir.actions.act_window">
+        <field name="context">{'all_task':0,'search_default_project':1}</field>
+    </record>
+
+
+    <menuitem action="project_task_progress_pivot_action" id="activity_progress_report_menu" name="Activities Progress Report" parent="project.menu_project_report" sequence="150" />
+
+
+</odoo>
diff --git a/odex25_project/project_native/__init__.py b/odex25_project/project_native/__init__.py
new file mode 100644
index 000000000..13fc2f029
--- /dev/null
+++ b/odex25_project/project_native/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+
+from . import models
+
diff --git a/odex25_project/project_native/__manifest__.py b/odex25_project/project_native/__manifest__.py
new file mode 100644
index 000000000..8aa436841
--- /dev/null
+++ b/odex25_project/project_native/__manifest__.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+{
+    "name": """Gantt Native view for Projects""",
+    "summary": """One price = web_gant_native, project_native, project_native_report_advance, project_native_exchange hr_holidays_gantt_native, mrp_gantt_native""",
+    "category": "Odex25-Project/Odex25-Project",
+    "images": ['static/description/banner.gif'],
+    "version": "14.22.08.02.00",
+    "description": """
+        Gantt View for Project and Project Task
+    """,
+    "author": "Viktor Vorobjov",
+    "license": "OPL-1",
+    "website": "https://www.youtube.com/watch?v=ewE4HMxlDcM",
+    "support": "vostraga@gmail.com",
+    "live_test_url": "https://demo14.garage12.eu",
+
+    "depends": [
+        "project",
+        "hr_timesheet",
+        "web_gantt_native",
+        "web_widget_time_delta",
+        "web_widget_colorpicker"
+    ],
+    "external_dependencies": {"python": [], "bin": []},
+    "data": [
+        'views/project_task_view.xml',
+        'views/project_task_resource_view.xml',
+        'views/project_task_detail_plan_view.xml',
+        'views/project_calendar_access_view.xml',
+        'views/resource_views.xml',
+        'views/project_project_view.xml',
+        'security/ir.model.access.csv',
+    ],
+    "qweb": [],
+    "demo": [],
+
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+    "installable": True,
+    "auto_install": False,
+    "application": False,
+}
diff --git a/odex25_project/project_native/doc/RELEASE_NOTES.md b/odex25_project/project_native/doc/RELEASE_NOTES.md
new file mode 100644
index 000000000..590e70801
--- /dev/null
+++ b/odex25_project/project_native/doc/RELEASE_NOTES.md
@@ -0,0 +1,48 @@
+## Module <Project Native>
+
+#### Version 14.21.09.16.0
+Unlink predecessor fix.
+
+#### Version 14.21.03.29.0
+Update calculate Load control for task if resource exist.
+
+#### Version 14.21.02.16.0
+Warning remove
+
+#### Version 14.20.12.19.0
+MRP allows precedessor.
+Check precedessor befor save (not allow if group)
+Open any group in the treeview if related field
+
+
+#### History
+    pyCairo - pdf
+    Task Rsource Load Control Update
+    Update 1: python 3.6.3 and click to gantt line
+    Fix: datalist check
+    Update: Calendar
+    Update: Project manual start - and date, sorting from kanban / stage, small fix.
+    Update: Drag UI.
+    Update: Contrain constrain_type
+    Update: diff datetime checker
+    Update: Folding
+    Update: Remove Canvas and Draw Line by div.
+    Update: version and remove js canvas
+    Update: default value for task from project.
+    Fix: Kanban change state - end date, Plan detail wrong task_id
+    Fix: added if None date in task, do nothing.
+    UI: more improve
+    Update: Info for gantt bar and Critical path calculation.
+    Update: Detail plan, fix ghost bar, fix default start time: allow neagative value..
+    Update: Gantt for Projects View.
+    Update: Resource for taks
+    Update: Loop Detect.
+    Fix: default date in auto sheduling
+    Fix: predecessor
+    Update: Sorting and Deadline
+    Update: UI ztree
+    Fix: next day
+    Fix: Tree
+    Update: _check_subtask_level - pass
+    Update: Fold Save and List view
+    Fix: Detail Plan Action
diff --git a/odex25_project/project_native/doc/index.rst b/odex25_project/project_native/doc/index.rst
new file mode 100644
index 000000000..2122ff7b8
--- /dev/null
+++ b/odex25_project/project_native/doc/index.rst
@@ -0,0 +1,49 @@
+Info demo/video
+==========================
+
+* Youtube: `Odoo Gantt Native Play List <https://www.youtube.com/watch?v=xbAoC_s5Et0&list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx>`_
+
+* Demo: Odoo 14 Gantt - Go to Live Privew (button near Add to Cart)
+    * User: demo
+    * password: demog
+
+
+* Docs:  github.com/straga/gantt_native_doc
+
+  * Calc Type - Resources - Resources Task Link.md
+  * Detail Plan Control in actions.md
+  * Detail Plan Control.md
+  * Duration - Work.md
+  * Update Duration - Work.md
+  * New Task - Sub task.md
+
+* History:
+
+  * ver: 2022-08-02:
+      * UPDATE: datetime from field, remote user_id fro resources, resource active/archive view, import - comment nout use var
+
+
+  * ver: 22.05.27.0:
+      * datetime from fieds fix.
+
+  * ver: 21.09.16.0:
+      * Unlink predecessor fix.
+
+  * ver: 2021-08-10:
+      * Mark Plan Action only for not manual.
+
+  * ver: 2021-07-21:
+      * No admin right can't create project. Now for default: user create project with default company calendar and can't change calendar. Only Admin Right user can do that.
+  * ver: 2021-07-06:
+      * Allow multiple delete Task resource link
+
+  * ver: 2021-06-03:
+      * If delete Task cascade delete Rsource link record to.
+      * In the project allow select calendar like in odoo 13. Gantt View tab:
+      * Critical path: backward calculate - now start from day start working time, before calc from end working time
+
+  * ver: 2021-05-25:
+      * Add Gantt Views to All Tasks
+
+  * ver: Before :
+      * Look RELEASE_NOTES.md
\ No newline at end of file
diff --git a/odex25_project/project_native/i18n/ar_001.po b/odex25_project/project_native/i18n/ar_001.po
new file mode 100644
index 000000000..05e20dad3
--- /dev/null
+++ b/odex25_project/project_native/i18n/ar_001.po
@@ -0,0 +1,315 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* web_gantt_native
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-05-03 08:56+0000\n"
+"PO-Revision-Date: 2023-05-03 08:56+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "1H"
+msgstr "ساعة واحدة"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "2H"
+msgstr "ساعتان"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "4H"
+msgstr "4 ساعات"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "8H"
+msgstr "8 ساعات"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_timeline_data.js:0
+#, python-format
+msgid "Bar Data Update"
+msgstr "تحديث بيانات الشريط"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Close"
+msgstr "إغلاق"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#: code:addons/web_gantt_native/static/src/js/gantt_timeline_data.js:0
+#, python-format
+msgid "Data updated : "
+msgstr "تم تحديث البيانات:"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Days"
+msgstr "أيام"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Delete"
+msgstr "حذف"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__display_name
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_tool__display_name
+#: model:ir.model.fields,field_description:web_gantt_native.field_ir_ui_view__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Edit in Form View"
+msgstr "تحرير في عرض النموذج"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "Finish to Finish (FF)"
+msgstr "انتهاء إلى انتهاء (FF)"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "Finish to Start (FS)"
+msgstr "انتهاء إلى بدء (FS)"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/native_gantt_renderer.js:0
+#: model:ir.model.fields.selection,name:web_gantt_native.selection__ir_ui_view__type__ganttaps
+#, python-format
+msgid "Gantt APS"
+msgstr "جانت APS"
+
+#. module: web_gantt_native
+#: model:ir.model,name:web_gantt_native.model_gantt_native_tool
+msgid "Gantt Native Tool"
+msgstr "أداة جانت الأصلية"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__id
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_tool__id
+#: model:ir.model.fields,field_description:web_gantt_native.field_ir_ui_view__id
+msgid "ID"
+msgstr "المعرف"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Item Data Update"
+msgstr "تحديث بيانات العنصر"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__lag_qty
+msgid "Lag"
+msgstr "تأخير"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__lag_type
+msgid "Lag type"
+msgstr "نوع التأخير"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor____last_update
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_tool____last_update
+#: model:ir.model.fields,field_description:web_gantt_native.field_ir_ui_view____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Month"
+msgstr "شهر"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/native_gantt_view.js:0
+#, python-format
+msgid "Native Gantt"
+msgstr "جانت الأصلية"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Ops"
+msgstr "العمليات"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "PDF Report for Project"
+msgstr "تقرير PDF للمشروع"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_options.js:0
+#, python-format
+msgid "PDF Report for Screen"
+msgstr "تقرير PDF للشاشة"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Please Select Project First For Task"
+msgstr "يرجى تحديد المشروع أولاً للمهمة"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_tool.py:0
+#, python-format
+msgid ""
+"Please install module first: Gantt Native PDF Advance "
+"(project_native_report_advance). It free parts for: web_gantt_native "
+msgstr ""
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Quarter"
+msgstr "ربع"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "Start to Finish (SF)"
+msgstr "من البداية إلى النهاية (SF)"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "Start to Start (SS)"
+msgstr "من البداية إلى البداية (SS)"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Today"
+msgstr "اليوم"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Tree Data Update"
+msgstr "تحديث بيانات الشجرة"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Try update"
+msgstr "حاول التحديث"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__type
+msgid "Type"
+msgstr "النوع"
+
+#. module: web_gantt_native
+#: model:ir.model,name:web_gantt_native.model_ir_ui_view
+msgid "View"
+msgstr "عرض"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_ir_ui_view__type
+#: model:ir.model.fields,field_description:web_gantt_native.field_website_page__type
+msgid "View Type"
+msgstr "نوع واجهة العرض"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Weeks"
+msgstr "أسابيع"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "You are trying add task to not select Project!"
+msgstr "أنت تحاول إضافة مهمة إلى مشروع غير محدد!"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "You are trying to edit on a read-only field! : '%s' "
+msgstr "أنت تحاول تحرير حقل للقراءة فقط! : '%s'"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_timeline_data.js:0
+#: code:addons/web_gantt_native/static/src/js/gantt_timeline_data.js:0
+#, python-format
+msgid "You are trying to write on a read-only field! : '%s' "
+msgstr "أنت تحاول الكتابة في حقل للقراءة فقط! : '%s'"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "day"
+msgstr "يوم"
+
+#. module: web_gantt_native
+#: model:ir.model,name:web_gantt_native.model_gantt_native_predecessor
+msgid "gantt.native.predecessor"
+msgstr "السلف"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "hour"
+msgstr "ساعة"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "minute"
+msgstr "دقيقة"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "percent"
+msgstr "نسبة مئوية"
\ No newline at end of file
diff --git a/odex25_project/project_native/images/gantt_native_view.png b/odex25_project/project_native/images/gantt_native_view.png
new file mode 100644
index 000000000..77cf5bf3f
Binary files /dev/null and b/odex25_project/project_native/images/gantt_native_view.png differ
diff --git a/odex25_project/project_native/models/__init__.py b/odex25_project/project_native/models/__init__.py
new file mode 100644
index 000000000..ee34716ab
--- /dev/null
+++ b/odex25_project/project_native/models/__init__.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from . import project_task
+from . import project_task_tree
+from . import project_task_tree_update
+from . import project_task_calendar
+from . import project_task_scheduler
+from . import project_task_detail_plan
+from . import project_task_info
+from . import project_task_critical_path
+from . import project_task_scheduler_calendar
+from . import project_task_resource
+from . import resource
diff --git a/odex25_project/project_native/models/project_task.py b/odex25_project/project_native/models/project_task.py
new file mode 100644
index 000000000..a147794ef
--- /dev/null
+++ b/odex25_project/project_native/models/project_task.py
@@ -0,0 +1,570 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+import logging
+from lxml import etree
+
+import datetime
+from dateutil import tz
+import pytz
+import time
+from string import Template
+from datetime import datetime, timedelta
+from odoo.exceptions import Warning
+from pdb import set_trace as bp
+
+from itertools import groupby
+from operator import itemgetter
+
+from odoo.exceptions import UserError
+
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    @api.model
+    def _tz_get(self):
+        return [(tz, tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
+
+    @api.model
+    def _get_scheduling_type(self):
+        value = [
+            ('forward', _('Forward')),
+            ('backward', _('Backward')),
+            ('manual', _('Manual')),
+        ]
+        return value
+
+    @api.model
+    def _get_duration_picker(self):
+        value = [
+            ('day', _('Day')),
+            ('second', _('Second')),
+            ('day_second', _('Day Second'))
+        ]
+        return value
+
+    use_calendar = fields.Boolean(name="Use Calendar",help="Set Calendat in Setting Tab", default=True)
+
+    resource_calendar_id = fields.Many2one(
+        'resource.calendar', string='Working Time',
+        related='company_id.resource_calendar_id', readonly=False)
+
+    scheduling_type = fields.Selection('_get_scheduling_type',
+                                       string='Scheduling Type',
+                                       required=True,
+                                       default='forward')
+
+    date_start = fields.Datetime(string='Starting Date',
+                                 default=fields.Datetime.now,
+                                 help="Date Start for Auto Mode",
+                                 index=True, copy=False)
+
+    date_end = fields.Datetime(string='Ending Date', default=fields.datetime.now() + timedelta(days=1),
+                               index=True, copy=False)
+
+    task_default_duration = fields.Integer(string='Task Duration', default=86400,
+                                           help="Default Task Duration", )
+
+    task_default_start = fields.Integer(string='Task Start (UTC)', default=28800,
+                                        help="Default Task Start after midnight, UTC - without Time Zone", )
+
+    task_default_start_end = fields.Char(string='Task Start (tz)', readonly=True, compute='_compute_default_start_end',
+                                         help="Default Task Start after midnight, with user Time Zone", )
+
+    # humanize duration
+    duration_scale = fields.Char(string='Duration Scale', default='d,h', help="You can set: y,mo,w,d,h,m,s,ms")
+    duration_picker = fields.Selection('_get_duration_picker', string='Duration Picker', default=None, help="Empty it is Hide: day and second")
+    duration_work_scale = fields.Char(string='Duration Work Scale', default='h', help="You can set: y,mo,w,d,h,m,s,ms")
+
+    tz = fields.Selection(_tz_get, string='Timezone', default=lambda self: self._context.get('tz'),
+                          help="Time Zone")
+    tz_offset = fields.Char(compute='_compute_tz_offset', string='Timezone offset', invisible=True)
+
+    cp_shows = fields.Boolean(name="Critical Path", help="Critical Path Shows", default=True)
+    cp_detail = fields.Boolean(name="Critical Path Detail", help="Critical Path Shows Detail on Gantt", default=False)
+
+
+
+    @api.depends('tz')
+    def _compute_tz_offset(self):
+        for project in self:
+            project.tz_offset = datetime.now(pytz.timezone(project.tz or 'GMT')).strftime('%z')
+
+    @api.depends("task_default_start", "task_default_duration")
+    def _compute_default_start_end(self):
+
+        for proj in self:
+
+            tz_name = self.env.context.get('tz') or self.env.user.tz
+            date_end_str = ''
+
+            if tz_name:
+                user_tz = pytz.timezone(tz_name)
+
+                date_start = fields.Datetime.from_string(fields.Datetime.now())
+                date_start = date_start.replace(hour=0, minute=0, second=0)
+                date_start = date_start + timedelta(seconds=proj.task_default_start)
+
+                date_end = date_start + timedelta(seconds=proj.task_default_duration)
+
+                date_start_tz = date_start.replace(tzinfo=pytz.utc).astimezone(user_tz)
+                date_end_tz = date_end.replace(tzinfo=pytz.utc).astimezone(user_tz)
+
+                date_end_str = 'UTC= {} -> {}, TZ= {} -> {}'.format(fields.Datetime.to_string(date_start),
+                                                                    fields.Datetime.to_string(date_end),
+                                                                    fields.Datetime.to_string(date_start_tz),
+                                                                    fields.Datetime.to_string(date_end_tz)
+                                                                    )
+
+            proj.task_default_start_end = date_end_str
+
+
+class ProjectTaskPredecessor(models.Model):
+    _name = 'project.task.predecessor'
+    _inherit = ['gantt.native.predecessor']
+
+    task_id = fields.Many2one('project.task', 'Task', ondelete='cascade')
+    parent_task_id = fields.Many2one('project.task', 'Parent Task', required=True, ondelete='restrict',
+                                 domain="[('project_id','=', parent.project_id)]")
+
+
+    _sql_constraints = [
+        ('project_task_link_uniq', 'unique(task_id, parent_task_id, type)', 'Must be unique.'),
+
+    ]
+
+    @api.model
+    def write(self, vals):
+        if "parent_task_id" in vals:
+            self.check_parent(vals["parent_task_id"])
+        return super(ProjectTaskPredecessor, self).write(vals)
+
+    @api.model
+    def create(self, vals):
+        self.check_parent(vals["parent_task_id"])
+        result = super(ProjectTaskPredecessor, self).create(vals)
+
+        if result.task_id.schedule_mode == "manual":
+            second_between = (result.task_id.date_end - result.task_id.date_start).total_seconds()
+            if result.type == "FS":
+                result.task_id.date_start = result.parent_task_id.date_end
+                result.task_id.date_end = result.task_id.date_start + timedelta(seconds=second_between)
+
+            elif result.type == "SS":
+                result.task_id.date_start = result.parent_task_id.date_start
+                result.task_id.date_end = result.task_id.date_start + timedelta(seconds=second_between)
+
+            elif result.type == "FF":
+                result.task_id.date_end = result.parent_task_id.date_end
+                result.task_id.date_start = result.task_id.date_end - timedelta(seconds=second_between)
+
+            elif result.type == "SF":
+                result.task_id.date_end = result.parent_task_id.date_start
+                result.task_id.date_start = result.task_id.date_end - timedelta(seconds=second_between)
+
+        return result
+
+
+    def check_parent(self, task_id):
+        task = self.env['project.task'].search([('id', '=', task_id)])
+        if task.child_ids:
+            raise UserError(_(
+                'You can not add a Predecessor for Task with subtask ({}).\n'
+                'Please Select Task inside Parent Task.').format(task.name))
+
+    def unlink(self):
+        parent_tasks = []
+        for project in self:
+            parent_tasks.append(project.parent_task_id)
+
+        res = super(ProjectTaskPredecessor, self).unlink()
+
+        if res:
+            for parent_task in parent_tasks:
+                search_if_parent = self.env['project.task.predecessor'].sudo().search_count(
+                    [('parent_task_id', '=', parent_task.id)])
+
+                if not search_if_parent:
+                    parent_task.write({
+                        'predecessor_parent': 0
+                    })
+        return res
+
+
+
+class ProjectTaskNative(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+    @api.model
+    def _get_schedule_mode(self):
+        value = [
+            ('auto', _('Auto')),
+            ('manual', _('Manual')),
+        ]
+        return value
+
+    @api.model
+    def _get_constrain_type(self):
+        value = [
+            ('asap', _('As Soon As Possible')),
+            ('alap', _('As Late As Possible')),
+            ('fnet', _('Finish No Earlier Than')),
+            ('fnlt', _('Finish No Later Than')),
+            ('mso', _('Must Start On')),
+            ('mfo', _('Must Finish On')),
+            ('snet', _('Start No Earlier Than')),
+            ('snlt', _('Start No Later Than')),
+        ]
+        return value
+
+    @api.model
+    def _default_date_end(self):
+
+        date_end = fields.Datetime.from_string(fields.Datetime.now())
+        date_end = date_end.replace(hour=0, minute=0, second=0, microsecond=0)
+        date_end = date_end + timedelta(days=1)
+
+        if 'default_project_id' in self._context:
+            project_id = self._context['default_project_id']
+
+            project = self.env['project.project'].browse(project_id)
+
+            if project.task_default_duration != 0 and project.task_default_start != 0:
+                date_end = fields.Datetime.from_string(fields.Datetime.now())
+                date_end = date_end.replace(hour=0, minute=0, second=0, microsecond=0)
+                date_end = date_end + timedelta(seconds=project.task_default_start + project.task_default_duration)
+
+        return date_end
+
+    @api.model
+    def _default_date_start(self):
+
+        date_start = fields.Datetime.from_string(fields.Datetime.now())
+        date_start = date_start.replace(hour=0, minute=0, second=0, microsecond=0)
+        if 'default_project_id' in self._context:
+            project_id = self._context['default_project_id']
+
+            project = self.env['project.project'].browse(project_id)
+
+            if project.task_default_start != 0:
+                date_start = date_start + timedelta(seconds=project.task_default_start)
+
+        return date_start
+
+
+
+    @api.model
+    def _get_fixed_calc_type(self):
+        value = [
+            ('duration', _('Duration')),
+            ('work', _('Work')),
+
+        ]
+        return value
+
+    fixed_calc_type = fields.Selection('_get_fixed_calc_type',
+                                       string='Calc Type',
+                                       required=True,
+                                       default='work')
+
+    # link
+    predecessor_ids = fields.One2many('project.task.predecessor', 'task_id', 'Links')
+    predecessor_count = fields.Integer(compute='_compute_predecessor_count', string='Predecessor Count', store=True)
+    predecessor_parent = fields.Integer(compute='_compute_predecessor_count', string='Predecessor parent', store=True)
+
+
+    # Gantt
+    is_milestone = fields.Boolean("Mark as Milestone", default=False)
+    on_gantt = fields.Boolean("Task name on gantt", default=False)
+    date_finished = fields.Datetime('Done Date')
+
+    # info - autoplanning
+    duration = fields.Integer(
+        'Duration',
+        compute='_compute_duration',
+        readonly=True, store=True)
+
+    # scheduler
+    schedule_mode = fields.Selection('_get_schedule_mode',
+                                     string='Schedule Mode',
+                                     required=True,
+                                     default='manual')
+
+    # constrain
+    constrain_type = fields.Selection('_get_constrain_type',
+                                      string='Constraint Type',
+                                      required=True,
+                                      default='asap')
+    constrain_date = fields.Datetime('Constraint Date')
+
+    plan_action = fields.Integer(compute='_compute_plan_action', string='Plan Action', store=True)
+    plan_duration = fields.Integer(string='Plan Value', default=86400)
+
+    # redefine default
+    date_start = fields.Datetime(string='Starting Date',
+                                 default=_default_date_start,
+                                 index=True, copy=False)
+
+    date_end = fields.Datetime(string='Ending Date', default=_default_date_end,
+                               index=True, copy=False)
+
+    # color
+
+    color_gantt_set = fields.Boolean("Set Color Task", default=False)
+    color_gantt = fields.Char(
+        string="Color Task Bar",
+        help="Choose your color for Task Bar",
+        default="rgba(170,170,13,0.53)"
+    )
+
+    # humanize duration
+    duration_scale = fields.Char(string='Duration Scale', related="project_id.duration_scale", readonly=True, )
+    duration_picker = fields.Selection(string='Duration Picker', related="project_id.duration_picker", readonly=True,)
+    duration_work_scale = fields.Char(string='Duration Work Scale', related="project_id.duration_work_scale", readonly=True, )
+
+
+    def update_date_end(self, stage_id):
+        #Disable remove (end date) when stage change,
+        return {}
+
+
+    @api.onchange('user_id')
+    def _onchange_user(self):
+        if self.user_id:
+            # self.date_start = fields.Datetime.now()
+            # task.detail_plan_ids.unlink()
+            pass
+
+
+
+
+    def _get_summary_date(self):
+
+        for task in self.sorted(key='sorting_level', reverse=True):
+
+            summary_date_start = None
+            summary_date_end = None
+            if task.child_ids:
+
+                date_start = []
+                date_end = []
+
+                for child in task.child_ids:
+                    if child.child_ids:
+
+                        summary_date_start = child.summary_date_start
+                        summary_date_end = child.summary_date_end
+
+                        if summary_date_start:
+                            date_start.append(summary_date_start)
+
+                        if summary_date_end:
+                            date_end.append(summary_date_end)
+
+                    else:
+
+                        if child.date_start:
+                            date_start.append(child.date_start)
+
+                        if child.date_end:
+                            date_end.append(child.date_end)
+
+                # if date_start:
+                #     summary_date_start = min(date_start,
+                #                                   key=lambda x: x if fields.Datetime.from_string(x) else None)
+                #
+                # if date_end:
+                #     summary_date_end = max(date_end, key=lambda x: x if fields.Datetime.from_string(x) else None)
+
+                if date_start:
+                    summary_date_start = min(date_start)
+
+                if date_end:
+                    summary_date_end = max(date_end)
+
+            task.summary_date_start = summary_date_start
+            task.summary_date_end = summary_date_end
+
+
+
+    summary_date_start = fields.Datetime(compute='_get_summary_date', string="Summary Date Start")
+    summary_date_end = fields.Datetime(compute='_get_summary_date', string="Summary Date End")
+
+
+    p_loop = fields.Boolean("Loop Detected")
+
+
+    @api.onchange('project_id')
+    def _onchange_project(self):
+        if hasattr(super(ProjectTaskNative, self), '_onchange_project'):
+            if self._origin.id:
+                if self.env['project.task.predecessor'].search(
+                        ['|', ('task_id', '=', self._origin.id), ('parent_task_id', '=', self._origin.id),
+                         (('parent_task_id', '=', self._origin.id))], limit=1):
+                    raise UserError(_(
+                        'You can not change a Project for task.\nPlease Delete - Predecessor: for parent or child.'))
+
+                if self.search([('parent_id', '=', self._origin.id)], limit=1):
+                    raise UserError(_(
+                        'You can not change a Project for Task.\nPlease Delete or Remove - sub tasks first.'))
+
+            super(ProjectTaskNative, self)._onchange_project()
+
+
+    @api.depends("predecessor_ids")
+    def _compute_predecessor_count(self):
+
+        for task in self:
+            for predecessor in task.predecessor_ids:
+                predecessor.parent_task_id.write({
+                    'predecessor_parent': 1,
+                })
+
+            search_if_parent = self.env['project.task.predecessor'].sudo().search_count(
+                [('parent_task_id', '=', task.id)])
+            task.update({
+                'predecessor_count': len(task.predecessor_ids),
+                'predecessor_parent': search_if_parent,
+            })
+
+
+
+    @api.model
+    def scheduler_plan(self, project_id):
+
+        search_project = self.env['project.project'].sudo().search([('id', '=', project_id)], limit=1)
+        scheduling_type = search_project.scheduling_type
+
+        if scheduling_type == "manual":
+            raise UserError(_(
+                'Not work in manual mode. Please set in project: Backwork or Forward'))
+
+        # project_task_scheduler.py
+        self._scheduler_plan_start_calc(project=search_project)
+
+        # self.do_sorting(project_id=project_id)
+
+        self._summary_work(project_id=project_id)
+        self._scheduler_plan_complite(project_id=project_id, scheduling_type=scheduling_type)
+
+        return True
+
+
+    def _scheduler_plan_complite(self, project_id, scheduling_type):
+
+        # Calculate data start/stop for project.
+
+        search_tasks = self.env['project.task'].sudo().search([('project_id', '=', project_id)])
+
+        if scheduling_type == "forward":
+            date_list_end = []
+            for task in search_tasks:
+                var_data = {}
+                var_data['plan_action'] = False
+                task.sudo().write(var_data)
+
+                if task.date_end:
+                    # date_list_end.append(fields.Datetime.from_string(task.date_end))
+                    date_list_end.append(task.date_end)
+
+            if date_list_end:
+                new_prj_date_end = max(date_list_end)
+                self.env['project.project'].sudo().browse(int(project_id)).write({
+                    'date_end': new_prj_date_end,
+                })
+
+        if scheduling_type == "backward":
+            date_list_start = []
+            for task in search_tasks:
+                var_data = {}
+                var_data['plan_action'] = False
+                task.sudo().write(var_data)
+
+                if task.date_start:
+                    # date_list_start.append(fields.Datetime.from_string(task.date_start))
+                    date_list_start.append(task.date_start)
+
+            if date_list_start:
+                new_prj_date_start = min(date_list_start)
+                self.env['project.project'].sudo().browse(int(project_id)).write({
+                    'date_start': new_prj_date_start,
+                })
+
+
+    def _summary_work(self, project_id):
+
+        search_tasks = self.env['project.task'].sudo().search(
+            ['&', ('project_id', '=', project_id), ('child_ids', '!=', False)])
+
+        for task in search_tasks:
+            var_data = {}
+            if task.schedule_mode == "auto":
+                var_data["date_start"] = task.summary_date_start
+                var_data["date_end"] = task.summary_date_end
+
+                if task.summary_date_end and task.summary_date_start:
+                    # diff = fields.Datetime.from_string(task.summary_date_end) - fields.Datetime.from_string(
+                    #     task.summary_date_start)
+
+                    diff = task.summary_date_end - task.summary_date_start
+                    var_data["plan_duration"] = diff.total_seconds()
+
+                    # var_data["duration"] = diff.total_seconds()
+
+                task.sudo().write(var_data)
+
+
+    @api.depends("predecessor_ids.task_id", "predecessor_ids.type", "constrain_type", "constrain_date", "plan_duration",
+                 "duration", "project_id.scheduling_type", "task_resource_ids.name")
+    def _compute_plan_action(self):
+        for task in self:
+            if task.schedule_mode != "manual":
+                task.plan_action = True
+
+
+    @api.depends('date_end', 'date_start')
+    def _compute_duration(self):
+        for task in self:
+
+            if task.date_end and task.date_start:
+                diff = fields.Datetime.from_string(task.date_end) - fields.Datetime.from_string(task.date_start)
+                duration = diff.total_seconds()
+            else:
+                duration = 0.0
+
+            task.duration = duration
+
+
+
+    def unlink(self):
+
+        if self.search([('parent_id', 'in', self.ids)], limit=1):
+            raise UserError(_(
+                'You can not delete a Parent Task.\nPlease Delete - sub tasks first.'))
+        return super(ProjectTaskNative, self).unlink()
+
+
+
+    def conv_sec_tofloat(self, sec, type="sec"):
+
+        if type == "sec":
+            tde = timedelta(seconds=sec)
+        if type == "hrs":
+            tde = timedelta(hours=sec)
+
+        return tde.total_seconds() / timedelta(hours=1).total_seconds()
+
+
+
+    @api.constrains('parent_id', 'child_ids')
+    def _check_subtask_level(self):
+        pass
+        # for task in self:
+        #     if task.parent_id and task.child_ids:
+        #         raise ValidationError(_('Task %s cannot have several subtask levels.' % (task.name,)))
+
+
+
diff --git a/odex25_project/project_native/models/project_task_calendar.py b/odex25_project/project_native/models/project_task_calendar.py
new file mode 100644
index 000000000..832640ad1
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_calendar.py
@@ -0,0 +1,633 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+import logging
+from lxml import etree
+
+import datetime
+from dateutil import tz
+import pytz
+import time
+from string import Template
+from datetime import datetime, timedelta
+from odoo.exceptions import  Warning
+from pdb import set_trace as bp
+
+from itertools import groupby
+from operator import itemgetter
+
+from odoo.exceptions import UserError
+
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+
+
+class ProjectTaskNativeCalendar(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+
+    #Tools
+    @staticmethod
+    def merge_range(ranges: list, start_key: str, end_key: str):
+        ranges = sorted(ranges, key=lambda x: x[start_key])
+
+        if ranges:
+            saved = dict(ranges[0])
+
+            for range_set in sorted(ranges, key=lambda x: x[start_key]):
+                if range_set[start_key] <= saved[end_key]:
+                    saved[end_key] = max(saved[end_key], range_set[end_key])
+                else:
+                    yield dict(saved)
+                    saved[start_key] = range_set[start_key]
+                    saved[end_key] = range_set[end_key]
+
+            yield dict(saved)
+        else:
+            return ()
+
+
+
+    def get_sec(self, from_time):
+        h = from_time.hour
+        m = from_time.minute
+        s = from_time.second
+        return int(h) * 3600 + int(m) * 60 + int(s)
+
+    def to_tz(self, datetime, tz_name):
+        tz = pytz.timezone(tz_name)
+        return pytz.UTC.localize(datetime.replace(tzinfo=None), is_dst=False).astimezone(tz).replace(tzinfo=None)
+
+    def to_naive_user_tz(self, datetime, tz_name):
+        tz = tz_name and pytz.timezone(tz_name) or pytz.UTC
+        return pytz.UTC.localize(datetime.replace(tzinfo=None), is_dst=False).astimezone(tz).replace(tzinfo=None)
+
+    def to_naive_utc(self, datetime, tz_name):
+        tz = tz_name and pytz.timezone(tz_name) or pytz.UTC
+        return tz.localize(datetime.replace(tzinfo=None), is_dst=False).astimezone(pytz.UTC).replace(tzinfo=None)
+
+
+    def _get_date_from_level(self, levels, value=None, type_op=None):
+        """
+        :param levels: list of calendar level with leavs and attendance
+        :param value: get to_Datetime or from_Datetime
+        :param type_op: what return max,min or list
+        :return:
+        """
+
+        obj_list = []
+        for level in levels:
+            if level["type"] == "attendance":
+                obj_list.append(level[value])
+
+        if type_op == "max" and obj_list:
+            # return fields.Datetime.to_string(max(obj_list))
+            return max(obj_list)
+        elif type_op == "min" and obj_list:
+            # return fields.Datetime.to_string(min(obj_list))
+            return min(obj_list)
+        elif type_op == "list" and obj_list:
+            return obj_list
+        else:
+            return False
+
+
+    # s1
+    def _get_calendar_level(self, task_obj, date_in, duration, t_params, direction="normal"):
+
+
+        """
+        :param task: Task obj for
+        :param date_in: detetime start date or end date
+        :param diff: timedelta
+        :param direction: norma or revers mode: from start date or end date
+        :return: list of leves calendar
+        """
+
+        if task_obj["project_id"] and task_obj["project_id"].use_calendar or task_obj["task_resource_ids"].ids:
+
+            diff = timedelta(seconds=duration)
+
+            tz_name = task_obj["project_id"].tz
+
+            if tz_name and date_in:
+                date_in = self.to_tz(date_in, tz_name)
+
+            if date_in:
+                # return level
+                return self._get_planned_x(t_params=t_params,
+                                           x_date=date_in,  # start_date/end_date
+                                           diff=diff,
+                                           level=[],
+                                           tz_name=tz_name, iteration=0, task=task_obj,
+                                           direct=direction  # "normal"/"revers"
+                                           )
+
+            return False
+
+        else:
+            return False
+
+
+    # 2
+    def _get_planned_x(self, t_params, x_date, diff, level=None, tz_name=None, iteration=None, task=None,
+                       direct=None):
+
+        level = level
+
+        attendance_ids_param = t_params["attendance_ids"]
+        global_leave_ids_param = t_params["leave_ids"]
+        task_res = task["task_res"]
+
+        fixed_calc_type = task["fixed_calc_type"]
+
+        # diff_e_counter - how much for resource work
+        _calendar_ids, diff_e_counter = self._get_diff_e_counter(task_res, fixed_calc_type, diff)
+
+        attendance_ids = list(filter(lambda x: x["calendar_id"] in _calendar_ids, attendance_ids_param))
+
+        x_date_e = x_date
+        next_step = True
+
+        while next_step:
+
+            if not attendance_ids:
+                return level
+
+            weekday = x_date_e.weekday()
+            attendances = self._attendance_from_list(attendance_ids, weekday, x_date_e.date())
+
+            next_step_allow = []
+            len_attendances = len(attendances)
+            work_already_day = {}
+
+            work_time_day = self._get_work_time_day(attendances, task_res)
+
+            for inx, attendance in enumerate(attendances):
+
+                hour_from_att = timedelta(hours=float(attendance["hour_from"]))
+                hour_to_att = timedelta(hours=float(attendance["hour_to"]))
+
+                for _res in task_res:
+
+                    _load_factor = _res["load_factor"]
+                    _calendar_id = _res["calendar_id"]
+                    _resource_id = _res["resource_id"]
+                    _load_control = _res["load_control"]
+
+                    diff_e = diff_e_counter[_resource_id]
+
+                    if attendance["calendar_id"] == _calendar_id and diff_e > timedelta(hours=0):
+
+                        flag_task = "{}_{}".format(task["id"], task["name"])
+                        flag_project = None
+                        if task["project_id"] and _load_control == "in_project":
+                            proj = task["project_id"]
+                            flag_project = "{}_{}".format(proj.id, proj.name)
+
+
+                        work_time, work_time_already = self._get_work_intervals(_resource_id, work_already_day,
+                                                                                work_time_day, _load_factor)
+
+                        hour_from, hour_to = self.check_load_factor(_load_factor,
+                                                                    hour_to_att, hour_from_att,
+                                                                    len_attendances, inx, work_time,
+                                                                    work_time_already)
+
+                        hour_from_date = x_date_e.replace(hour=0, minute=0, second=0, microsecond=0) + hour_from
+                        hour_to_date = x_date_e.replace(hour=0, minute=0, second=0, microsecond=0) + hour_to
+
+                        global_leave_ids = self.check_load_control(_load_control, _calendar_id, _resource_id,
+                                                                   global_leave_ids_param, direct,
+                                                                   flag_task, flag_project)
+
+                        global_leave_merge = list(self.merge_range(ranges=global_leave_ids,
+                                                                   start_key='date_from',
+                                                                   end_key='date_to'))
+
+                        global_leave, cut_hour = self._check_leave(global_leave_merge,
+                                                                   dt_work_from=hour_from_date,
+                                                                   dt_work_to=hour_to_date, tz_name=tz_name)
+                        # if leave not full day
+                        if cut_hour:
+                            hour_from_date = cut_hour["from"]
+                            hour_to_date = cut_hour["to"]
+
+                            hour_from = timedelta(seconds=self.get_sec(hour_from_date.time()))
+                            hour_to = timedelta(seconds=self.get_sec(hour_to_date.time()))
+
+                        #
+                        if not global_leave:
+
+                            date_from, date_to, diff_e = self._calc_from_to(x_date_e, tz_name,
+                                                                            hour_from_date, hour_to_date,
+                                                                            hour_from, hour_to,
+                                                                            direct, diff_e)
+
+                            if date_to and date_from:
+
+                                # already work
+                                if _resource_id in work_already_day:
+                                    work_already_day[_resource_id] = work_already_day[_resource_id] + (
+                                                date_to - date_from)
+                                else:
+                                    work_already_day[_resource_id] = (date_to - date_from)
+
+                                diff_e_counter[_resource_id] = diff_e
+
+                                level, global_leave_ids_param = self._push_interval_log(level,
+                                                                                        global_leave_ids_param,
+                                                                                        attendance,
+                                                                                        date_from, date_to,
+                                                                                        iteration,
+                                                                                        _resource_id, _calendar_id,
+                                                                                        flag_task, flag_project,
+                                                                                        _load_control,
+                                                                                        direct=direct)
+
+            for _res in task_res:
+                _resource_id = _res["resource_id"]
+                res_diff = diff_e_counter[_resource_id]
+                if res_diff > timedelta(hours=0):
+                    next_step_allow.append(True)
+
+            date_next = self._get_planned_interval_next_date(day_before=x_date_e, direct=direct)
+            next_step = False
+
+            if next_step_allow and all(next_step_allow) and date_next:
+                iteration += 1
+                next_step = True
+                x_date_e = date_next
+
+        return level
+
+
+    def _check_leave(self, global_leave_ids, dt_work_from, dt_work_to, tz_name):
+        """
+
+        :param global_leave_ids:leaves for calendar
+        :param dt_work_from: working from datetime
+        :param dt_work_to: working to datetime
+        :param tz_name: timezone
+        :return:
+            True, False = Datetime period in leaves totaly
+            False, list of new from and to Datetime = if need cut of from or to
+            False, False = nothing need do, no leaves and cut of.
+        """
+        if tz_name:
+            for global_leave_id in global_leave_ids:
+                # dt_leave_from = fields.Datetime.from_string(global_leave_id.date_from)
+                # dt_leave_to = fields.Datetime.from_string(global_leave_id.date_to)
+                dt_leave_from = global_leave_id["date_from"]
+                dt_leave_to = global_leave_id["date_to"]
+
+                dt_leave_from = self.to_tz(dt_leave_from, tz_name)
+                dt_leave_to = self.to_tz(dt_leave_to, tz_name)
+
+                global_leave = not dt_leave_from > dt_work_from and not dt_leave_to < dt_work_to
+                # _logger.warning("-----------||-----------------")
+                # _logger.warning("")
+                # _logger.warning("is leave = {}".format(global_leave))
+
+                if not global_leave:
+                    # result1 = dt_leave_from <= dt_work_from and dt_leave_to.date() == dt_work_from.date()
+                    # result2 = dt_leave_to >= dt_work_to and dt_leave_from.date() == dt_work_to.date()
+                    #
+                    # _logger.warning("dt_leave_from {} <= dt_work_from {} = {}".format(dt_leave_from, dt_work_from, result1))
+                    # _logger.warning("dt_leave_to {} == dt_work_from {}".format(dt_leave_to.date(), dt_work_from.date()))
+                    # _logger.warning("")
+                    # _logger.warning("dt_leave_to {} >= dt_work_to {} = {}".format(dt_leave_to, dt_work_to, result2))
+                    # _logger.warning("dt_leave_from {} == dt_work_to {}".format(dt_leave_from.date(), dt_work_to.date()))
+
+                    #change from
+                    new_dt_work_from = dt_work_from
+                    if dt_leave_from <= dt_work_from and dt_leave_to.date() == dt_work_from.date():
+                        td_from = dt_leave_to - dt_work_from
+                        if td_from.days == 0:
+                            new_dt_work_from = dt_work_from + td_from
+                            # _logger.warning("{} = {}".format(type(td_from), td_from))
+
+                    #change to
+                    new_dt_work_to = dt_work_to
+                    if dt_leave_to >= dt_work_to and dt_leave_from.date() == dt_work_to.date():
+                        td_to = dt_work_to - dt_leave_from
+                        if td_to.days == 0:
+                            new_dt_work_to = dt_work_to - td_to
+                            # _logger.warning("{} = {}".format(type(td_to), td_to))
+
+                    if new_dt_work_from != dt_work_from or new_dt_work_to != dt_work_to:
+                        # _logger.warning("-- --")
+                        # _logger.warning(new_dt_work_from)
+                        # _logger.warning(new_dt_work_to)
+
+                        return False,   {
+                                            "name": global_leave_id["name"],
+                                            "from": new_dt_work_from,
+                                            "to": new_dt_work_to
+                                        }
+                else:
+                    return True, False
+
+
+        return False, False
+
+
+
+    def _attendance_from_list(self, els, wkd, start_date):
+        _list = []
+
+        # search_objs = filter(lambda x: x['dayofweek'] == str(wkd)
+        #                                and not (x['date_from'] and x['date_from'] < start_date)
+        #                                and not (x['date_to'] and x['date_to'] < start_date)
+        #                                and x['calendar_id'] == cal_id
+        #                                , els)
+
+        # start_date = start_date.replace(hour=0, minute=0, second=0)
+        _list = []
+
+        for x in els:
+            _ok = False
+
+            if x['dayofweek'] == str(wkd):
+                _ok = True
+
+                if x['date_from'] and x['date_to']:
+                    _ok = False
+
+                    if x['date_from'] <= start_date and x['date_to'] >= start_date:
+                        _ok = True
+
+            if _ok:
+                _list.append(x)
+
+
+        _list = sorted(_list, key=lambda k: k['hour_from'])
+
+        return _list
+
+
+
+    def _push_interval_log(self, level, global_leave_ids_param, attendance, date_from, date_to, iteration,
+                                  res_id, cal_id, flag_task, flag_project, _load_control, direct="normal"):
+
+
+        #level
+        level.append({"name": attendance["display_name"],
+                      "type": "attendance",
+                      "date_from": date_from,
+                      "date_to": date_to,
+                      "interval": (date_to - date_from),
+                      "iteration": iteration,
+                      "res_ids": res_id
+                      })
+
+        #global already use resource
+        if res_id != -1 and _load_control in ["in_project", "everywhere"]:
+
+            # load = {"leave_id": "l{}r{}".format(cal_id, res_id),
+            #         "calendar_id": cal_id,
+            #         "name": direct,
+            #         "resource_id": str(res_id),
+            #         "date_from": fields.Datetime.to_string(date_from),
+            #         "date_to": fields.Datetime.to_string(date_to),
+            #         "flag_task": flag_task,
+            #         "flag_project": flag_project
+            #         }
+
+            load = {"leave_id": "l{}r{}".format(cal_id, res_id),
+                    "calendar_id": cal_id,
+                    "name": direct,
+                    "resource_id": str(res_id),
+                    "date_from": date_from,
+                    "date_to": date_to,
+                    "flag_task": flag_task,
+                    "flag_project": flag_project
+                    }
+
+            global_leave_ids_param.append(load)
+
+        return level, global_leave_ids_param
+
+
+
+    def check_load_factor(self, _load_factor, hour_to, hour_from, len_attendances, inx, work_time, work_time_already):
+
+        interval_next = hour_to - hour_from
+        time_already_next = work_time_already + interval_next
+
+        if _load_factor < 1 and time_already_next > work_time:
+            interval_next = work_time - work_time_already
+
+
+        if _load_factor > 1 and inx == len_attendances - 1 and work_time > time_already_next:
+            interval_next = work_time - work_time_already
+
+
+        hour_to = hour_from + interval_next
+
+        if hour_to > timedelta(hours=24):
+            hour_to = timedelta(hours=24)
+
+        return hour_from, hour_to
+
+
+    # need more test
+    def check_load_control(self, _load_control, _calendar_id, _resource_id, global_leave_ids_param, direct,
+                           flag_task, flag_project):
+
+        if direct == "normal":
+            direct = "revers"
+        elif direct == "revers":
+            direct = "normal"
+
+        # Take a calendar
+        global_leave_ids = list(filter(lambda x: x["calendar_id"] == _calendar_id, global_leave_ids_param))
+
+        # For example we go forward and don't wont use leave from that.
+        global_leave_ids = list(filter(lambda x: x["name"] != direct, global_leave_ids))
+
+        # Don't get leave for current task need only load from other.
+        global_leave_ids = list(filter(lambda x: x["flag_task"] != flag_task, global_leave_ids))
+
+
+        # For current project and global leave too.
+        if _load_control == "in_project":
+            global_leave_ids = list(filter(lambda x: x["flag_project"] == flag_project and
+                                                     x["resource_id"] == str(_resource_id)
+                                                     or
+                                                     x["resource_id"] == "-1", global_leave_ids))
+
+        elif _load_control == "everywhere":
+            global_leave_ids = list(filter(lambda x: x["resource_id"] in [str(_resource_id), _resource_id,  "-1"], global_leave_ids))
+
+        # probably only leave resource
+        else:
+            global_leave_ids = list(filter(lambda x: x["resource_id"] in [_resource_id, "-1"], global_leave_ids))
+
+        return global_leave_ids
+
+
+    def _calc_from_to(self, x_date_e, tz_name, hour_from_date, hour_to_date, hour_from, hour_to, direct, diff_e):
+
+        date_to = False
+        date_from = False
+
+        # NORMAL
+        if direct == "normal":
+            # _logger.warning(" N - {}, Constrain Date = {}".format(task["name"], x_date_e))
+            # _logger.warning("Working Period = {} - {}, duration: {}".format(hour_from_date, hour_to_date, diff_e))
+
+            summ_hours = timedelta(hours=0)
+            # from 8:00 to 12:00
+            # if start 7:00 <=  available start 8:00 = start from 8:00 and sum 12:00-8:00
+            if x_date_e <= hour_from_date:
+                date_from = hour_from_date
+                summ_hours = hour_to - hour_from
+
+            #else if start between from and to ( 8:00 <= 9:00 < 12:00) = from 9:00 = summ 12:00-9:00
+            elif hour_from_date <= x_date_e < hour_to_date:
+                date_from = x_date_e
+                summ_hours = hour_to_date - date_from
+
+            # left diff < = available, 3h < = 4h = summ = 3h,  or 10h <= 4h = summ 4h
+            if diff_e <= summ_hours:
+                summ_hours = diff_e
+
+            # if available from and sum available > 0, new lef diff = diff - sum, 3-3=0 or 4-3=1,
+            # new date to = from - sum, 8:00 + 3:00 = 11:00, new period 8:00 to 11:00 and left diff = 0
+            if date_from and summ_hours > timedelta(hours=0):
+
+                diff_e = diff_e - summ_hours
+                date_to = date_from + summ_hours
+
+            if date_from and date_to:
+                # _logger.warning(
+                #     "Real Work = {} - {}, minus: {} need more: {}".format(date_from, date_to, summ_hours, diff_e))
+
+                date_from = self.to_naive_utc(date_from, tz_name)
+                date_to = self.to_naive_utc(date_to, tz_name)
+
+        # REVERS
+        if direct == "revers":
+            # _logger.warning(" R - {}, Contrasin Date= {}".format(task["name"], x_date_e))
+            # _logger.warning("Working Period = {} - {}, duration: {}".format(hour_from_date, hour_to_date, diff_e))
+            summ_hours = timedelta(hours=0)
+
+            # working time 13:00 - 17:00
+            # if x_date 23:00, date_to = 17:00
+            # summ_hours = 17:00 - 13:00 = 4h
+            if x_date_e >= hour_to_date:
+                date_to = hour_to_date
+                summ_hours = hour_to - hour_from
+
+            # 13:00 < 15:00 <= 17:00: date_to = 15:00
+            # summ_hours = 15:00 - 13:00 = 2h
+            elif hour_from_date < x_date_e <= hour_to_date:
+                date_to = x_date_e
+                summ_hours = date_to - hour_from_date
+
+            # if 3h <= 4h = 3h
+            if diff_e <= summ_hours:
+                summ_hours = diff_e
+
+            # if 15:00 and >0h, calc (need to works)15h - (available)4h = 11h
+            if date_to and summ_hours > timedelta(hours=0):
+                diff_e = diff_e - summ_hours
+
+                # from start time working day
+                date_from = hour_from_date
+                date_to = hour_from_date + summ_hours
+
+                # from end time working day - working time = but break time need exist and that not work ok
+                # date_from = date_to - summ_hours # if go revers we can start from end time period
+
+
+            if date_from and date_to:
+
+                # _logger.warning("Real Work = {} - {}, minus: {} need more: {}".format(date_from, date_to, summ_hours, diff_e))
+
+                date_from = self.to_naive_utc(date_from, tz_name)
+                date_to = self.to_naive_utc(date_to, tz_name)
+
+
+
+        return date_from, date_to, diff_e
+
+
+
+    def _get_work_time_day(self, attendances, task_res ):
+
+        work_time = {}
+
+        for attendance in attendances:
+            for _res in task_res:
+                _calendar_id = _res["calendar_id"]
+                _resource_id = _res["resource_id"]
+
+                if attendance["calendar_id"] == _calendar_id:
+                    hour_from_att = timedelta(hours=float(attendance["hour_from"]))
+                    hour_to_att = timedelta(hours=float(attendance["hour_to"]))
+
+                    working_time_res_id = timedelta(hours=0)
+                    if _resource_id in work_time:
+                        working_time_res_id = work_time[_resource_id]
+
+                    work_time[_resource_id] = working_time_res_id + (hour_to_att - hour_from_att)
+
+        return work_time
+
+
+    def _get_diff_e_counter(self, task_res, fixed_calc_type, diff):
+
+        diff_e_counter = {}
+        _calendar_ids = []
+
+
+        for _res in task_res:
+
+            _calendar_ids.append(_res["calendar_id"])
+
+            _load_factor = _res["load_factor"]
+            _resource_id = _res["resource_id"]
+            diff_k = diff
+
+            if fixed_calc_type == "duration":
+                diff_e_counter[_resource_id] = diff_k * _load_factor
+
+            if fixed_calc_type == "work":
+                diff_k = diff / len(task_res)
+                diff_e_counter[_resource_id] = diff_k
+
+
+        return _calendar_ids, diff_e_counter
+
+
+    def _get_work_intervals(self, _resource_id, work_already_day, work_time_day, _load_factor):
+
+        work_time_already = timedelta(hours=0)
+        if _resource_id in work_already_day:
+            work_time_already = work_already_day[_resource_id]
+
+        work_time = work_time_day[_resource_id] * _load_factor
+
+        return work_time, work_time_already
+
+
+    def _get_planned_interval_next_date(self, day_before, direct="normal"):
+
+        if direct == "normal":
+            start_date = (day_before + timedelta(days=1)).replace(hour=0, minute=0, second=0, microsecond=00)
+            return start_date
+
+        if direct == "revers":
+            end_date = (day_before - timedelta(days=1)).replace(hour=23, minute=59, second=59, microsecond=00)
+            return end_date
+
+
+
+
+
+
+
+
diff --git a/odex25_project/project_native/models/project_task_critical_path.py b/odex25_project/project_native/models/project_task_critical_path.py
new file mode 100644
index 000000000..cf0cf5166
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_critical_path.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api
+import logging
+
+_logger = logging.getLogger(__name__) # Need for message in console.
+
+
+class ProjectTaskCriticalPath(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+    critical_path = fields.Boolean(name="is Critical Path", help="is Critical Path", default=False, readonly=True)
+    # critical path
+    cp_shows = fields.Boolean(string='Critical Path', related="project_id.cp_shows", readonly=True, )
+    cp_detail = fields.Boolean(string='Critical Path Detail', related="project_id.cp_detail", readonly=True, )
+
+
+    def _critical_path_calc(self, task):
+        task["critical_path"] = False
+        task["info_vals"] = False
+        value = {}
+
+        need_key = ["soon_date_start", "soon_date_end", "late_date_start", "late_date_end"]
+
+        if all(key in task for key in need_key):
+            if task["late_date_start"] and task["soon_date_start"]:
+                # soon_date_start = fields.Datetime.from_string(task["soon_date_start"])
+                # late_date_start = fields.Datetime.from_string(task["late_date_start"])
+                soon_date_start = task["soon_date_start"]
+                late_date_start = task["late_date_start"]
+
+                start = ((late_date_start - soon_date_start).total_seconds()) / 3600
+                value["left_up"] = task["soon_date_start"]
+                value["left_down"] = task["late_date_start"]
+                value["start"] = "{:.2f}".format(start)
+                if start <= 0:
+                    task["critical_path"] = True
+
+            if task["late_date_end"] and task["soon_date_end"]:
+                # soon_date_end = fields.Datetime.from_string(task["soon_date_end"])
+                # late_date_end = fields.Datetime.from_string(task["late_date_end"])
+                soon_date_end = task["soon_date_end"]
+                late_date_end = task["late_date_end"]
+                end = ((late_date_end - soon_date_end).total_seconds()) / 3600
+                value["right_up"] = task["soon_date_end"]
+                value["right_down"] = task["late_date_end"]
+                value["end"] = "{:.2f}".format(end)
+                if end <= 0:
+                    task["critical_path"] = True
+
+            if value:
+                task["info_vals"] = value
+
+        return task
+
+
+    # @api.model
+    # def critical_path_hide(self, project_id):
+    #
+    #     test = "OK"
+    #     return test
+
+
+
+
+
diff --git a/odex25_project/project_native/models/project_task_detail_plan.py b/odex25_project/project_native/models/project_task_detail_plan.py
new file mode 100644
index 000000000..474defcfe
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_detail_plan.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+import logging
+from lxml import etree
+
+import datetime
+from dateutil import tz
+import pytz
+import time
+from string import Template
+from datetime import datetime, timedelta
+from odoo.exceptions import Warning
+from pdb import set_trace as bp
+
+from itertools import groupby
+from operator import itemgetter
+
+from odoo.exceptions import UserError
+
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+class ProjectTaskDetailPlan(models.Model):
+    _name = 'project.task.detail.plan'
+    _description = "project.task.detail.plan"
+
+    @api.model
+    def _get_type(self):
+        value = [
+            ('cut', _('Cut of DateTime')),
+            ('attendance', _('Attendance')),]
+        return value
+
+
+    @api.depends('resource_id', 'name_att')
+
+    def _compute_name(self):
+        for task in self:
+            task.name = "{} - {}".format(task.name_att or "", task.resource_id.name or "",)
+
+    name = fields.Char("Name", default='_compute_name',compute='_compute_name', readonly=True, store=True,)
+
+    task_id = fields.Many2one('project.task', 'Task',  readonly=True,)
+    type_level = fields.Selection('_get_type',
+                                  string='Type',
+                                  readonly=True, )
+
+    data_from = fields.Datetime("Date From",  readonly=True,)
+    data_to = fields.Datetime("Date To",  readonly=True,)
+    duration = fields.Integer(string='Duration',  readonly=True,)
+    iteration = fields.Integer(string='iteration',  readonly=True,)
+    name_att = fields.Char("Name att", readonly=True,)
+    resource_id = fields.Many2one('resource.resource', 'Resource', readonly=True,)
+
+    color_gantt_set = fields.Boolean("Set Color Task", default=True)
+    color_gantt = fields.Char(
+        string="Color",
+        store=True,
+        default='_compute_color_gantt',
+        compute='_compute_color_gantt'
+    )
+
+    schedule_mode = fields.Selection([ ('auto', 'Auto'), ('manual', 'Manual')],
+                                     string='Schedule Mode',
+                                     default='auto',  readonly=True,)
+
+    data_aggr = fields.Date("Date Aggr.", readonly=True, )
+
+    @api.depends('type_level')
+    def _compute_color_gantt(self):
+        for plan in self:
+            if plan.type_level == "cut":
+                plan.color_gantt ="rgba(190,170,23,0.53)"
+            else:
+                plan.color_gantt ="rgba(170,170,13,0.53)"
+
+
+
+class ProjectTask(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+    @api.depends("detail_plan_ids")
+    def _compute_detail_plan_count(self):
+
+        for task in self:
+            detail_plan_work = 0
+            for detail_plan_id in task.detail_plan_ids:
+                detail_plan_work = detail_plan_work + detail_plan_id.duration
+
+            task.update({
+                'detail_plan_count': len(task.detail_plan_ids),
+                'detail_plan_work': detail_plan_work,
+            })
+
+    detail_plan_count = fields.Integer(compute='_compute_detail_plan_count', string='Detail plan Count', store=True)
+    detail_plan_ids = fields.One2many('project.task.detail.plan', 'task_id', 'Detail Plan List', ondelete='cascade')
+    detail_plan = fields.Boolean(name="Detail Plan", help="Allow Save Detail Plan", default=False)
+    detail_plan_work = fields.Integer(compute='_compute_detail_plan_count', string='Detail plan work', store=True)
+
+    def _add_detail_plan(self, calendar_level):
+        task_detail_lines = []
+
+        for level in calendar_level:
+
+            resource_id = False
+            if level["res_ids"] and level["res_ids"] != -1:
+
+                resource_id = level["res_ids"]
+
+
+            value = {
+                    "name": level["name"],
+                    "type_level": level["type"],
+                    "data_from": level["date_from"],
+                    "data_to": level["date_to"],
+                    "duration": level["interval"].total_seconds(),
+                    "iteration": level["iteration"],
+                    "name_att": level["name"],
+                    "data_aggr": level["date_from"].date(),
+                    "resource_id" : resource_id
+                }
+
+            task_detail_lines.append((0, 0, value), )
+        return task_detail_lines
+
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    detail_plan = fields.Boolean(name="Save Detail Plan", help="Allow Save Detail Plan", default=False)
diff --git a/odex25_project/project_native/models/project_task_info.py b/odex25_project/project_native/models/project_task_info.py
new file mode 100644
index 000000000..ae297901a
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_info.py
@@ -0,0 +1,53 @@
+from odoo import models, fields
+import logging
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+class ProjectTaskInfo(models.Model):
+    _name = 'project.task.info'
+    _description = "project.task.info"
+
+    name = fields.Char("Name")
+    task_id = fields.Many2one('project.task', 'Task', ondelete='cascade')
+    start = fields.Char("Start")
+    end = fields.Char("End")
+    left_up = fields.Char("Left Up")
+    left_down = fields.Char("Left Down")
+    right_up = fields.Char("Right Up")
+    right_down = fields.Char("Right Down")
+    show = fields.Boolean("Show", default=False)
+
+class ProjectTask(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+    info = fields.Integer(string='Info', default=False)
+    info_ids = fields.One2many('project.task.info', 'task_id', 'Info Value')
+
+
+    def _task_info_add(self, task, vals, info_name):
+
+        if "info_vals" in task.keys() and task["info_vals"]:
+            info_data = task["info_vals"]
+            info_data["name"] = info_name
+            task_info_lines = [(0, 0, info_data)]
+            vals["info_ids"] = task_info_lines
+        return vals
+
+    def _task_info_remove(self, info_name):
+        domain = [('name', '=', info_name)]
+        result = self.env['project.task.info'].sudo().search(domain)
+        if result:
+            result.unlink()
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/odex25_project/project_native/models/project_task_resource.py b/odex25_project/project_native/models/project_task_resource.py
new file mode 100644
index 000000000..524bc33bb
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_resource.py
@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+import logging
+from lxml import etree
+
+import datetime
+from dateutil import tz
+import pytz
+import time
+from string import Template
+from datetime import datetime, timedelta
+from odoo.exceptions import  Warning
+from pdb import set_trace as bp
+
+from itertools import groupby
+from operator import itemgetter
+
+from odoo.exceptions import UserError
+
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+
+class ProjectTaskNativeResource(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+    task_resource_ids = fields.One2many('project.task.resource.link', 'task_id', 'Resources')
+
+
+class ProjectTaskResourceLink(models.Model):
+    _name = 'project.task.resource.link'
+    _description = "project.task.resource.link"
+
+    _order = 'date_start'
+
+    @api.model
+    def _get_load_control(self):
+        value = [
+            ('no', _('No')),
+            ('in_project', _('In project')),
+            ('everywhere', _('Everywhere')),
+        ]
+        return value
+
+    name = fields.Char(compute='_compute_name_link', readonly=True, store=False)
+
+    resource_id = fields.Many2one('resource.resource', 'Resource', ondelete='restrict')
+    task_id = fields.Many2one('project.task', 'Task', ondelete='cascade', readonly=True,)
+    load_factor = fields.Float("Load Factor", default=1.0)
+
+    resource_type = fields.Selection(string='Type', related="resource_id.resource_type", readonly=True, store=True)
+    date_start = fields.Datetime(related='task_id.date_start', string="Date Start",  store=True, readonly=True,)
+    date_end = fields.Datetime(related='task_id.date_end', string="Date End",  store=True, readonly=True,)
+    duration = fields.Integer(related='task_id.duration', string='Duration',  store=True, readonly=True,)
+    project_id = fields.Many2one(related='task_id.project_id', string='Project', store=True, readonly=True,)
+    active_task = fields.Boolean(related='task_id.active', string="Archived",  store=True, readonly=True,)
+
+    # load_control = fields.Boolean(name="Load Control", help="Allow Resource Load Control", default=True)
+    load_control = fields.Selection('_get_load_control',
+                                    string='Load Control',
+                                    required=True,
+                                    default='everywhere')
+
+    color_gantt_set = fields.Boolean("Set Color Task", default=True)
+    color_gantt = fields.Char(
+        string="Color",
+        store=True,
+        default='rgba(190,170,23,0.53)'
+    )
+
+
+
+
+    @api.depends('task_id', 'load_factor', 'resource_id', 'resource_type')
+    def _compute_name_link(self):
+        for task in self:
+            task.name = "{}-{} ({}) {}".format(task.project_id.name or "", task.task_id.name or "", task.resource_id.name, task.load_factor or "")
+
+
+
+    def write(self, vals):
+
+        result = super(ProjectTaskResourceLink, self).write(vals)
+        if result:
+            info_name = "res_{}".format(self.id)
+            info_task = self.env['project.task.info'].sudo().search([('name', '=', info_name)])
+            if info_task.id:
+                info_task.sudo().write({"end": self.resource_id.name})
+
+        return result
+
+
+
+    def unlink(self):
+        res = super(ProjectTaskResourceLink, self).unlink()
+
+        if res:
+            for res_id in self:
+                self.env['project.task'].sudo()._task_info_remove(info_name="res_{}".format(res_id.id))
+
+        return res
+
+    @api.model
+    def create(self, vals):
+
+        new_id = super(ProjectTaskResourceLink, self).create(vals)
+
+        if new_id:
+            info_name = "res_{}".format(new_id.id)
+            value = {}
+            value["name"] = info_name
+            value["end"] = new_id.resource_id.name
+            value["show"] = True
+
+            vals = {}
+            vals["info_ids"] = [(0, 0, value)]
+            new_id.task_id.write(vals)
+
+        return new_id
+
+
+
+    _sql_constraints = [
+            ('project_task_resource_link_uniq', 'unique(task_id, resource_id)', 'Duplicate Resource.'),
+        ]
+
+
+
diff --git a/odex25_project/project_native/models/project_task_scheduler.py b/odex25_project/project_native/models/project_task_scheduler.py
new file mode 100644
index 000000000..df3020134
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_scheduler.py
@@ -0,0 +1,897 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+import logging
+
+from datetime import datetime, timedelta
+
+
+_logger = logging.getLogger(__name__) # Need for message in console.
+
+
+class ProjectTaskNativeScheduler(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+    def _scheduler_plan_start_calc(self, project):
+
+        # abstract_tasks = self.env['project.native.scheduling.task']
+        #
+        # abstract_tasks.project = project
+        #
+        # _logger.debug("IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIID: {} Name: {}".format(abstract_tasks.project.id, abstract_tasks.project.name))
+
+        scheduling_type = project.scheduling_type
+        tasks_ap = []
+        predecessors_ap = []
+        project_id = project.id
+        resources_ids = set()
+        leave_ids = list()
+        attendance_ids = list()
+        t_params = {}
+        calendar_ready = []
+
+        attendance_ids_cache = []
+        leave_ids_cache = []
+
+        resource_key_val = []
+
+        #Tasks
+        domain = [('project_id', '=', project_id), '|', ('active', '=', True), ('active', '=', False)]
+
+        arch_tasks = self.env['project.task'].sudo().search(domain)
+
+        tasks_list = arch_tasks.sorted(key=lambda x: x.sorting_seq)
+
+        # aps_tasks = self.env['project.native.scheduling.task'].sudo().search([])
+        # _logger.debug(
+        #     "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL: {}".format(aps_tasks))
+
+        t_params = {
+            'leave_ids': leave_ids,
+            'attendance_ids': attendance_ids,
+            'scheduling_type': scheduling_type,
+            'project_id': project_id,
+            'project': project
+        }
+
+        for task in tasks_list:
+
+            #clean detail plaN FOR TASK.
+            task.detail_plan_ids.unlink()
+
+            task_resource_ids = False
+
+            if hasattr(task, 'task_resource_ids'):
+                task_resource_ids = task.task_resource_ids
+
+            cal_id, task_res, t_params = self.make_res_cal_leave(task_resource_ids, t_params, tasks_list.ids)
+
+            soon_date_start = None
+            soon_date_end = None
+            late_date_start = None
+            late_date_end = None
+
+
+            if scheduling_type == "forward":
+                # soon_date_start = fields.Datetime.to_string(task.date_start)
+                # soon_date_end = fields.Datetime.to_string(task.date_end)
+                soon_date_start = task.date_start
+                soon_date_end = task.date_end
+
+            if scheduling_type == "backward":
+                # late_date_start = fields.Datetime.to_string(task.date_start)
+                # late_date_end = fields.Datetime.to_string(task.date_end)
+                late_date_start = task.date_start
+                late_date_end = task.date_end
+
+            # _logger.debug("ID: {} Name: {}".format(task.id, task.name))
+
+            #Tasks List
+            tasks_ap.append({"id": task.id,
+                             "plan_duration": task.plan_duration,
+                             # "date_start": task.date_start,
+                             # "date_end": task.date_end,
+                             "soon_date_start": soon_date_start,
+                             "soon_date_end": soon_date_end,
+                             "late_date_start": late_date_start,
+                             "late_date_end": late_date_end,
+                             "schedule_mode": task.schedule_mode,
+                             "project_id": project,
+                             # "attendance_ids": attendance_ids,
+                             # "global_leave_ids": global_leave_ids,
+                             "constrain_type": task.constrain_type,
+                             "constrain_date": task.constrain_date,
+                             "detail_plan": task.detail_plan,
+                             "name": task.name,
+                             "cal_id": cal_id,
+                             # "leav_id": leav_id,
+                             "task_resource_ids" : task_resource_ids,
+                             "task_res" : task_res,
+                             # "user_id": task.user_id,
+                             # "fixed_task_type": task.fixed_task_type,
+                             "fixed_calc_type" : task.fixed_calc_type,
+                             "p_loop" : False
+                             })
+
+            domain = ['|', ('task_id', '=', task.id), ('parent_task_id', '=', task.id)]
+            predecessors_list = self.env['project.task.predecessor'].sudo().search(domain)
+
+            #Precedessor List
+            for predecessor in predecessors_list:
+                predecessors_ap.append(
+                    {"id": predecessor.id,
+                     "type": predecessor.type,
+                     "lag_qty": predecessor.lag_qty,
+                     "lag_type": predecessor.lag_type,
+                     "parent_task_id": predecessor.parent_task_id.id,
+                     "task_id": predecessor.task_id.id
+                     })
+
+        #Predecessors
+        predecessors_ap = [i for n, i in enumerate(predecessors_ap) if i not in predecessors_ap[n + 1:]]
+        t_params["predecessors_ap"] = predecessors_ap
+
+        #Project dates check, if not, set.
+        p_date_start, p_date_end = self._project_check_date(project, scheduling_type)
+        project_ap = {
+            "id": project.id,
+            "project_obj": project,
+            "date_start": p_date_start,
+            "date_end": p_date_end
+        }
+
+
+        #Remove task _info by critical path_[project_id]
+        info_name = "cp_{}".format(project.id)
+        self._task_info_remove(info_name)
+
+        #Calc First Step
+        tasks_ap = self._ap_calc_tasks_list(project_ap=project_ap, tasks_ap=tasks_ap, t_params=t_params,
+                                            revers_step=False)
+
+
+        #Calc new project date
+        project_ap = self._project_get_date(project_ap, tasks_ap, scheduling_type)
+
+
+        #Cals Revers Step
+        tasks_ap = self._ap_calc_tasks_list(project_ap=project_ap, tasks_ap=tasks_ap, t_params=t_params,
+                                            revers_step=True)
+
+
+        # Calc Critical Path
+        for task_cp in tasks_ap:
+            self._critical_path_calc(task=task_cp)
+
+
+        ## Check if as Late as possible for task and recalculate with allowed buffer
+        for task_alap in tasks_ap:
+
+            if task_alap["constrain_type"] == "alap":
+                alap_run = False
+                if scheduling_type == "forward":
+                    # soon_date_end = fields.Datetime.from_string(task_alap["soon_date_end"])
+                    # late_date_end = fields.Datetime.from_string(task_alap["late_date_end"])
+                    soon_date_end = task_alap["soon_date_end"]
+                    late_date_end = task_alap["late_date_end"]
+                    if late_date_end > soon_date_end:
+                        alap_run = True
+                        task_alap["soon_date_start"] = task_alap["late_date_start"]
+                        task_alap["soon_date_end"] = task_alap["late_date_end"]
+                        if "late_detail_plan" in task_alap.keys():
+                            task_alap["soon_detail_plan"] = task_alap["late_detail_plan"]
+
+                else:
+                    # soon_date_start = fields.Datetime.from_string(task_alap["soon_date_start"])
+                    # late_date_start = fields.Datetime.from_string(task_alap["late_date_start"])
+                    soon_date_start = task_alap["soon_date_start"]
+                    late_date_start = task_alap["late_date_start"]
+                    if soon_date_start > late_date_start:
+                        alap_run = True
+                        task_alap["late_date_start"] = task_alap["soon_date_start"]
+                        task_alap["late_date_end"] = task_alap["soon_date_end"]
+                        if "soon_detail_plan" in task_alap.keys():
+                            task_alap["late_detail_plan"] = task_alap["soon_detail_plan"]
+
+                if alap_run:
+                    self._ap_calc_scheduler_recur_work(task_id=task_alap["id"], project=project_ap, tasks=tasks_ap,
+                                                   t_params=t_params, revers_step=False)
+
+
+        #Write result to task
+        projects_task_obj = self.env['project.task']
+        for task_new in tasks_ap:
+            # self._critical_path_calc( task, vals)
+
+            if "calc" in task_new.keys():
+                task_id = task_new["id"]
+                task_obj = projects_task_obj.browse(task_id)
+                vals = {}
+                vals = self._task_info_add(task=task_new, vals=vals, info_name=info_name)
+
+                if scheduling_type == "forward":
+                    task_date_start = "soon_date_start"
+                    task_date_end = "soon_date_end"
+                    detail_plan = "soon_detail_plan"
+                else:
+                    task_date_start = "late_date_start"
+                    task_date_end = "late_date_end"
+                    detail_plan = "late_detail_plan"
+
+                vals["date_start"] = task_new[task_date_start]
+                vals["date_end"] = task_new[task_date_end]
+
+
+                if detail_plan in task_new.keys():
+
+                    save_detail_plan = False
+                    if task_obj.project_id and task_obj.project_id.detail_plan:
+                        save_detail_plan = task_obj.project_id.detail_plan
+                    elif task_obj.detail_plan:
+                        save_detail_plan = True
+
+                    if save_detail_plan:
+                        task_detail_lines = self._add_detail_plan(task_new[detail_plan]) #call detail plan maker
+                        if task_detail_lines:
+                            vals["detail_plan_ids"] = task_detail_lines
+
+
+                if "critical_path" in task_new.keys():
+                    vals["critical_path"] = task_new["critical_path"]
+
+                vals["p_loop"] = task_new["p_loop"]
+
+
+                task_obj.write(vals)
+
+
+
+    def _project_get_date(self, project_ap, tasks_ap, scheduling_type):
+
+        prj_task_date = []
+        if scheduling_type == "forward":
+            date_obj = "soon_date_end"
+            p_date_obj = "date_end"
+            limit = max
+        elif scheduling_type == "backward":
+            date_obj = "late_date_start"
+            p_date_obj = "date_start"
+            limit = min
+        else:
+            return False
+
+        for task in tasks_ap:
+
+            if task[date_obj] and "calc" in task.keys():
+                # prj_task_date.append(fields.Datetime.from_string(task[date_obj]))
+                prj_task_date.append(task[date_obj])
+
+        if prj_task_date:
+            new_date = limit(prj_task_date)
+            project_ap[p_date_obj] = new_date
+
+
+
+        return project_ap
+
+
+    # 0 all Calc Tasks List
+    def _ap_calc_tasks_list(self, project_ap, tasks_ap, t_params, revers_step=False):
+
+        search_tasks = []
+        scheduling_type = t_params["scheduling_type"]
+        project_id = t_params["project_id"]
+
+        if revers_step:
+            if scheduling_type == "forward":
+                scheduling_type = "backward"
+            elif scheduling_type == "backward":
+                scheduling_type = "forward"
+
+        if scheduling_type == "forward":
+            search_tasks = self.env['project.task'].sudo().search(
+                ['&', ('project_id', '=', project_id), ('predecessor_count', '=', 0)])
+
+        if scheduling_type == "backward":
+            search_tasks = self.env['project.task'].sudo().search(
+                ['&', ('project_id', '=', project_id), ('predecessor_parent', '=', 0)])
+
+
+        t_params.update({"scheduling_type": scheduling_type})
+
+        for search_task  in search_tasks:
+            tasks_ap = self._ap_calc_scheduler_first_work(task=search_task, tasks=tasks_ap, project=project_ap,
+                                                          t_params=t_params, revers_step=revers_step)
+        return tasks_ap
+
+
+
+    # 1 Fist Work
+    def _ap_calc_scheduler_first_work(self, task, tasks, project, t_params, revers_step=False):
+
+        # _logger.debug(
+        #     "-> Start - ID: {}, Name: {}".format(task["id"], task["name"]))
+
+        scheduling_type = t_params["scheduling_type"]
+
+        if not task.child_ids:  # (task not group.)
+            vals = {}
+
+            if task.schedule_mode == "auto":  # (auto mode)
+
+                task_obj = self._task_from_list(tasks, task.id)
+
+                if scheduling_type == "forward":
+                    direction = "normal"
+                    date_type = "date_start"
+                    cp_date_start = "soon_date_start"
+                    cp_date_end = "soon_date_end"
+
+                elif scheduling_type == "backward":
+                    direction = "revers"
+                    date_type = "date_end"
+                    cp_date_start = "late_date_start"
+                    cp_date_end = "late_date_end"
+
+                else:
+                    return tasks
+
+                # for first task get start date from project
+                new_date = project[date_type]
+
+                if not new_date:
+                    return tasks
+                # calc calendar and dates
+                calendar_level, date_start, date_end = self._ap_calc_period(task_obj=task_obj,
+                                                                           direction=direction,
+                                                                           new_date=new_date,
+                                                                           date_type=date_type,
+                                                                           t_params=t_params)
+                # critical path dates
+                vals[cp_date_start] = date_start
+                vals[cp_date_end] = date_end
+
+                # check constain for that date and recalculate if needed
+                vals, calendar_level = self._scheduler_work_constrain(task_obj, vals, calendar_level,
+                                                                      scheduling_type, t_params)
+
+                if calendar_level:
+                    vals["detail_plan"] = calendar_level
+
+                tasks = [self._task_date_update(x_task, task.id, vals) for x_task in tasks]
+
+            else:
+                vals["calc"] = True
+                tasks = [self._task_date_update(x_task, task.id, vals) for x_task in tasks]
+
+
+            tasks = self._ap_calc_scheduler_recur_work(task_id=task.id,
+                                                       project=project,
+                                                       tasks=tasks,
+                                                       t_params=t_params,
+                                                       revers_step=revers_step)
+
+            return tasks
+
+        else:
+            return tasks
+
+
+    # 2 Recursion Work
+    def _ap_calc_scheduler_recur_work(self, task_id, project, tasks, t_params, revers_step=False):
+
+        scheduling_type = t_params["scheduling_type"]
+        predecessors = t_params["predecessors_ap"]
+
+        #scheduling_type == "backward":
+        task_field = 'task_id'
+        next_task_field = "parent_task_id"
+
+        if scheduling_type == "forward":
+            task_field = "parent_task_id"
+            next_task_field = "task_id"
+
+        next_stack = [task_id]
+        visited_stack = []
+
+        # _logger.debug("Start From = {} Revers: {}".format(task_id, revers_step))
+        _itr = 0
+        while len(next_stack) > 0:
+
+            #_logger.debug(" = next_stack: {}".format(next_stack))
+
+            for next_id in next_stack[:]:
+
+                loop_search = list(
+                    filter(lambda x: x["next_id"] == next_id and x["itr"] != _itr, visited_stack))
+
+                next_stack.remove(next_id)
+                # _logger.debug("- : {}".format(next_id))
+
+
+                if loop_search:
+                    # _logger.debug(" -> cal_search: {}".format(loop_search))
+
+
+                    tasks = [self._task_date_update(x_task, next_id, {"p_loop": True}) for x_task in tasks]
+
+
+                if not loop_search:
+
+                    search_objs = filter(lambda x: x[task_field] == next_id, predecessors)
+                    search_objs = list(search_objs)
+
+                    visited_stack.append({"next_id": next_id,  "itr": _itr})
+
+                    for predecessor_obj in search_objs:
+
+                        date_list = self._calc_date_list(scheduling_type, predecessors, tasks, predecessor_obj)
+                        task_obj = self._task_from_list(tasks, task_id=predecessor_obj[next_task_field])
+
+                        if task_obj:
+
+
+
+                            vals, calendar_level = self._calc_new_date(scheduling_type=scheduling_type,
+                                                                       predecessor_obj=predecessor_obj,
+                                                                       task_obj=task_obj, date_list=date_list, t_params=t_params)
+
+                            if task_obj["schedule_mode"] == "auto":
+                                if vals and 'plan_action' not in vals.keys():
+                                    next_id = task_obj["id"]
+                                    #check constrain
+                                    vals, calendar_level = self._scheduler_work_constrain(task_obj, vals, calendar_level,
+                                                                                          scheduling_type, t_params)
+
+                                    if calendar_level:
+                                        vals["detail_plan"] = calendar_level
+
+                            else:
+                                vals["calc"] = True
+
+                            tasks = [self._task_date_update(x_task, next_id, vals) for x_task in tasks]
+
+                        next_stack.append(predecessor_obj[next_task_field])
+                        # _logger.debug("+ : {}".format(predecessor_obj[next_task_field]))
+
+
+
+            _itr = _itr + 1
+            if not next_stack:
+                return tasks
+
+        return tasks
+
+
+    # Tools
+
+
+
+
+    def _project_check_date(self, project, scheduling_type):
+
+        # Project Star and End Date
+        # date_start = fields.Datetime.from_string(project.date_start)
+        # date_end = fields.Datetime.from_string(project.date_end)
+        date_start = project.date_start
+        date_end = project.date_end
+
+        if scheduling_type == "forward":
+            pvals = {}
+            if not date_start:
+                date_start = fields.datetime.now()
+                pvals['date_start'] = date_start
+            pvals['date_end'] = date_end = None
+            project.write(pvals)
+
+
+        if scheduling_type == "backward":
+            pvals = {}
+            if not date_end:
+                date_end = fields.datetime.now()
+                pvals['date_end'] = date_end
+            pvals['date_start'] = date_start = None
+            project.write(pvals)
+
+        return date_start, date_end
+
+
+    # calc date if not set.
+    def _ap_calc_date(self, date_input, date_type, plan_duration):
+
+        new_date_start = None
+        new_date_end = None
+
+        if date_type == "date_start":
+            # new_date_start = fields.Datetime.to_string(date_input)
+            new_date_start = date_input
+            if plan_duration == 0:
+                new_date_end = new_date_start
+            else:
+                diff = timedelta(seconds=plan_duration)
+                # new_date_end = fields.Datetime.to_string(date_input + diff)
+                new_date_end = date_input + diff
+
+        if date_type == "date_end":
+            # new_date_end = fields.Datetime.to_string(date_input)
+            new_date_end = date_input
+            if plan_duration == 0:
+                new_date_start = new_date_end
+            else:
+                diff = timedelta(seconds=plan_duration)
+                # new_date_start = fields.Datetime.to_string(date_input - diff)
+                new_date_start = date_input - diff
+
+        return new_date_start, new_date_end
+
+
+    def _ap_calc_period(self, task_obj, direction, new_date, date_type, t_params, cal_value=None):
+
+        '''
+        :param direction: normal , revers
+        :param date_type: date_start , date_end
+        :param scheduling_type: forward , backward
+        :return:
+        '''
+
+        if not cal_value:
+            cal_value = {
+                "start_value": "date_from",
+                "start_type_op": "min",
+                "end_value": "date_to",
+                "end_type_op": "max"
+            }
+
+
+        if task_obj:
+
+            plan_duration = task_obj["plan_duration"]
+            calendar_level = self._get_calendar_level(task_obj, new_date, plan_duration, t_params, direction=direction)
+
+            if calendar_level:
+                date_start = self._get_date_from_level(calendar_level, cal_value["start_value"], cal_value["start_type_op"])
+                date_end = self._get_date_from_level(calendar_level, cal_value["end_value"], cal_value["end_type_op"])
+            else:
+                date_start, date_end = self._ap_calc_date(new_date, date_type, plan_duration)
+
+            return calendar_level, date_start, date_end
+        else:
+            return False, False, False
+
+
+
+    def _task_date_update(self, task, task_id, vals):
+
+        if task["id"] == task_id:
+
+            if "p_loop" in vals.keys():
+                task["p_loop"] = vals["p_loop"]
+                task["calc"] = True
+                return task
+
+
+            if "calc" in vals.keys():
+                task["calc"] = True
+                return task
+
+            if "soon_date_start" in vals.keys() and "soon_date_end" in vals.keys():
+                date_start = "soon_date_start"
+                date_end = "soon_date_end"
+                detail_plan = "soon_detail_plan"
+                task["calc"] = True
+
+            elif "late_date_start" in vals.keys() and "late_date_end" in vals.keys():
+                date_start = "late_date_start"
+                date_end = "late_date_end"
+                detail_plan = "late_detail_plan"
+                task["calc"] = True
+            else:
+                return task
+
+            task[date_start] = vals[date_start]
+            task[date_end] = vals[date_end]
+
+
+            if "detail_plan" in vals.keys():
+                task[detail_plan] = vals["detail_plan"]
+                del vals["detail_plan"]
+
+        return task
+
+
+
+    def _task_from_list(self, tasks, task_id):
+        task_list = []
+        if tasks and task_id:
+            search_objs = filter(lambda x: x['id'] == task_id, tasks)
+
+            if search_objs:
+                search_objs_list = list(search_objs)
+                if search_objs_list[0]:
+                    task_list = search_objs_list[0]
+
+        return task_list
+
+
+
+    def _calc_date_list(self, scheduling_type, predecessors, tasks, predecessor_obj):
+
+        date_list = []
+        type_link = predecessor_obj["type"]
+        task_date_obj = 0
+        parent_date_field_1 = 0
+        parent_date_field_2 = 0
+
+        if scheduling_type == "forward":
+
+            dt_list_task_field = "task_id"
+            dt_list_task_id = predecessor_obj["task_id"]
+
+            cp_date_start = "soon_date_start"
+            cp_date_end = "soon_date_end"
+
+            if type_link == "FS":
+                task_date_obj = "parent_task_id"
+                parent_date_field_1 = cp_date_end
+                parent_date_field_2 = cp_date_start
+
+            elif type_link == "SS":
+                task_date_obj = "parent_task_id"
+                parent_date_field_1 = cp_date_start
+                parent_date_field_2 = cp_date_end
+
+            elif type_link == "FF":
+                task_date_obj = "parent_task_id"
+                parent_date_field_1 = cp_date_end
+                parent_date_field_2 = cp_date_start
+
+            elif type_link == "SF":
+                task_date_obj = "parent_task_id"
+                parent_date_field_1 = cp_date_start
+                parent_date_field_2 = cp_date_end
+
+
+        elif scheduling_type == "backward":
+            dt_list_task_field = 'parent_task_id'
+            dt_list_task_id = predecessor_obj["parent_task_id"]
+            cp_date_start = "late_date_start"
+            cp_date_end = "late_date_end"
+
+            if type_link == "FS":
+                task_date_obj = "task_id"
+                parent_date_field_1 = cp_date_start
+                parent_date_field_2 = cp_date_end
+
+            elif type_link == "SS":
+                task_date_obj = "task_id"
+                parent_date_field_1 = cp_date_start
+                parent_date_field_2 = cp_date_end
+
+            elif type_link == "FF":
+                task_date_obj = "task_id"
+                parent_date_field_1 = cp_date_end
+                parent_date_field_2 = cp_date_start
+
+            elif type_link == "SF":
+                task_date_obj = "task_id"
+                parent_date_field_1 = cp_date_end
+                parent_date_field_2 = cp_date_start
+        else:
+            return date_list
+
+
+
+        search_date_objs = filter(lambda x: x[dt_list_task_field] == dt_list_task_id and x['type'] == type_link, predecessors)
+        search_date_objs = list(search_date_objs)
+
+
+        for date_obj in search_date_objs:
+
+            parent_task = self._task_from_list(tasks, task_id=date_obj[task_date_obj])
+
+            if parent_task and parent_date_field_1 and parent_task[parent_date_field_1]:
+                # parent_date = fields.Datetime.from_string(parent_task[parent_date_field_1])
+                parent_date = parent_task[parent_date_field_1]
+
+                if date_obj["lag_qty"] != 0 and parent_date and parent_task[parent_date_field_2]:
+
+                    # parent_date_two = fields.Datetime.from_string(parent_task[parent_date_field_2])
+                    parent_date_two = parent_task[parent_date_field_2]
+                    parent_date = self._predecessor_lag_timedelta(parent_date,
+                                                                  date_obj["lag_qty"], date_obj["lag_type"],
+                                                                  parent_date_two)
+                date_list.append(parent_date)
+
+        return date_list
+
+
+
+    def _calc_new_date(self, scheduling_type, predecessor_obj, task_obj, date_list, t_params):
+
+        new_date = cp_date_start = cp_date_end = direction = date_type = False
+        vals = {}
+        calendar_level = []
+        type_link = predecessor_obj["type"]
+
+        if date_list:
+
+            if scheduling_type == "forward":
+
+                cp_date_start = "soon_date_start"
+                cp_date_end = "soon_date_end"
+
+                if type_link == "FS":
+
+                    new_date = max(date_list)
+                    date_type = "date_start"
+                    direction = "normal"
+
+                if type_link == "SS":
+                    new_date = min(date_list)
+                    date_type = "date_start"
+                    direction = "normal"
+
+                if type_link == "FF":
+                    new_date = max(date_list)
+                    date_type = "date_end"
+                    direction = "revers"
+
+                if type_link == "SF":
+
+                    new_date = min(date_list)
+                    date_type = "date_end"
+                    direction = "revers"
+
+
+            elif scheduling_type == "backward":
+
+                cp_date_start = "late_date_start"
+                cp_date_end = "late_date_end"
+
+                if type_link == "FS":
+
+                    new_date = min(date_list)
+                    date_type = "date_end"
+                    direction = "revers"
+
+                if type_link == "SS":
+                    new_date = min(date_list)
+                    date_type = "date_start"
+                    direction = "normal"
+
+                if type_link == "FF":
+                    new_date = max(date_list)
+                    date_type = "date_end"
+                    direction = "revers"
+
+                if type_link == "SF":
+
+                    new_date = max(date_list)
+                    date_type = "date_start"
+                    direction = "normal"
+
+        if new_date:
+            calendar_level, date_start, date_end = self._ap_calc_period(task_obj=task_obj, direction=direction,
+                                                                       new_date=new_date, date_type=date_type,
+                                                                       t_params=t_params, cal_value=None)
+            vals[cp_date_start] = date_start
+            vals[cp_date_end] = date_end
+
+        else:
+            vals['plan_action'] = True
+
+        return vals, calendar_level
+
+
+
+    def _predecessor_lag_timedelta(self, parent_date, lag_qty, lag_type, parent_date_two, plan_type='forward'):
+
+        diff = timedelta(days=0)
+
+        if plan_type == 'backward':
+            lag_qty = lag_qty * -1
+
+        if lag_type == "day":
+            diff = timedelta(days=lag_qty)
+            return parent_date+diff
+
+        if lag_type == "hour":
+            diff = timedelta(seconds=lag_qty*3600)
+
+        if lag_type == "minute":
+            diff = timedelta(seconds=lag_qty*60)
+
+        if lag_type == "percent":
+            diff = parent_date - parent_date_two
+            duration = diff.total_seconds()
+            percent_second = (duration*abs(lag_qty))/100
+
+            diff = timedelta(seconds=percent_second)
+
+        if lag_qty > 0:
+            return parent_date + diff
+        else:
+            return parent_date - diff
+
+
+    def _scheduler_work_constrain(self, task_obj, vals, calendar_level, scheduling_type, t_params):
+
+        if scheduling_type == "forward":
+            cp_date_start = "soon_date_start"
+            cp_date_end = "soon_date_end"
+        elif scheduling_type == "backward":
+            cp_date_start = "late_date_start"
+            cp_date_end = "late_date_end"
+        else:
+            return vals, calendar_level
+
+        constrain_type = task_obj["constrain_type"]
+        constrain_date = task_obj["constrain_date"]
+
+        if constrain_type and constrain_type not in ["asap", "alap"] and constrain_date and vals:
+
+            # constrain_date = fields.Datetime.from_string(constrain_date)
+            constrain_date = constrain_date
+            direction = date_type = None
+
+            # Finish No Early Than
+            if constrain_type == "fnet":
+                # sheduled_task_data = fields.Datetime.from_string(vals[cp_date_end])
+                sheduled_task_data = vals[cp_date_end]
+                if sheduled_task_data < constrain_date:
+                    direction = "revers"
+                    date_type = "date_end"
+
+            # Finish No Later Than
+            if constrain_type == "fnlt":
+                # sheduled_task_data = fields.Datetime.from_string(vals[cp_date_end])
+                sheduled_task_data = vals[cp_date_end]
+                if sheduled_task_data > constrain_date:
+                    direction = "revers"
+                    date_type = "date_end"
+
+            # Must Start On
+            if constrain_type == "mso":
+                direction = "normal"
+                date_type = "date_start"
+
+
+            # Must Finish On
+            if constrain_type == "mfo":
+                direction = "revers"
+                date_type = "date_end"
+
+
+            # Start No Earlier Than
+            if constrain_type == "snet":
+                # sheduled_task_data = fields.Datetime.from_string(vals[cp_date_start])
+                sheduled_task_data = vals[cp_date_start]
+                if sheduled_task_data < constrain_date:
+                    direction = "normal"
+                    date_type = "date_start"
+
+
+            # Start No Later Than
+            if constrain_type == "snlt":
+                # sheduled_task_data = fields.Datetime.from_string(vals[cp_date_start])
+                sheduled_task_data = vals[cp_date_start]
+                if sheduled_task_data > constrain_date:
+                    direction = "normal"
+                    date_type = "date_start"
+
+
+            if constrain_date:
+                calendar_level_new, date_start, date_end = self._ap_calc_period(task_obj=task_obj,
+                                                                                direction=direction,
+                                                                                new_date=constrain_date,
+                                                                                date_type=date_type,
+                                                                                t_params=t_params)
+
+                if date_start and date_end:
+                    vals[cp_date_start] = date_start
+                    vals[cp_date_end] = date_end
+
+                if calendar_level_new:
+                    calendar_level = calendar_level_new
+
+        return vals, calendar_level
diff --git a/odex25_project/project_native/models/project_task_scheduler_calendar.py b/odex25_project/project_native/models/project_task_scheduler_calendar.py
new file mode 100644
index 000000000..21dc6d881
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_scheduler_calendar.py
@@ -0,0 +1,170 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+import logging
+
+from datetime import datetime, timedelta
+
+
+
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+class ProjectTaskNativeSchedulerCalendar(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+
+    # Resource + calendar + leave
+    def make_res_cal_leave(self, task_resource_ids, t_params, task_ids):
+
+        project = t_params["project"]
+        attendance_ids = t_params["attendance_ids"]
+        leave_ids = t_params["leave_ids"]
+        cal_id = str(project.resource_calendar_id.id)
+        task_res = []
+
+
+        attendance_ids = self.add_attendance(project.resource_calendar_id, attendance_ids)
+        leave_ids = self.add_leave(project.resource_calendar_id, leave_ids)
+
+        if not task_resource_ids:
+            task_res.append({
+                "calendar_id": cal_id,
+                "resource_id": -1,
+                "load_factor": 1.0,
+                "load_control": "no",
+                # "load_control": False
+            })
+
+        if task_resource_ids:
+            attendance_ids, leave_ids, task_res = self.get_leave_for_resource(task_res, task_resource_ids,
+                                                                              attendance_ids, leave_ids, project,
+                                                                              task_ids)
+
+
+        t_params["attendance_ids"] = attendance_ids
+        t_params["leave_ids"] = leave_ids
+
+        return cal_id, task_res, t_params
+
+
+    def get_leave_for_resource(self,task_res, task_resource_ids, attendance_ids, leave_ids, project, task_ids):
+
+        for task_resource in task_resource_ids:
+            if task_resource.resource_id:
+
+                cal_obj = task_resource.resource_id.calendar_id
+
+                if cal_obj:
+                    # fill cache working time
+                    self.add_attendance(cal_obj, attendance_ids)
+                    # fill cache leave from calendar
+                    self.add_leave(cal_obj, leave_ids, task_resource.resource_id)
+                    # fill cache leave from allocate time from other tasks
+                    self.add_leave_level(cal_obj, task_resource.resource_id, leave_ids, task_ids)
+
+                    task_res.append({
+                        "calendar_id": str(cal_obj.id),
+                        "resource_id": task_resource.resource_id.id,
+                        "load_factor": task_resource.load_factor,
+                        "load_control": task_resource.load_control,
+                    })
+
+        return attendance_ids, leave_ids, task_res
+
+
+
+    # Leave
+    def add_leave_append(self, leave_id, leave_ids):
+
+        leave_ids.append(
+            {
+                "leave_id": str(leave_id.id),
+                "calendar_id": str(leave_id.calendar_id.id),
+                "resource_id": str(leave_id.resource_id.id or -1),
+                "name": leave_id.name,
+                "date_from": leave_id.date_from,
+                "date_to": leave_id.date_to,
+                "flag_task": None,
+                "flag_project": None
+            })
+
+        return leave_ids
+
+
+
+    def add_leave(self, cal_obj, leave_ids, task_resource=None):
+
+        if not task_resource:
+            for leave_id in cal_obj.leave_ids:
+
+                cal_leave_search = list(filter(lambda x: x["leave_id"] == str(leave_id.id), leave_ids))
+
+                if len(cal_leave_search) == 0:
+                    leave_ids = self.add_leave_append(leave_id, leave_ids)
+        else:
+            cal_search = list(filter(lambda x: x["calendar_id"] == str(cal_obj.id), leave_ids))
+
+            if len(cal_search) == 0:
+
+                for leave_id in cal_obj.global_leave_ids:
+                    if task_resource.id == leave_id.resource_id.id or not leave_id.resource_id.id:
+                        leave_ids = self.add_leave_append(leave_id, leave_ids)
+
+        return leave_ids
+
+
+
+    # Level
+    def add_leave_level(self, cal_id, res_id, leave_ids, task_ids):
+
+        dp_records = self.env['project.task.detail.plan'].sudo().search(
+            [('resource_id', '=', res_id.id), ('task_id', 'not in', task_ids)])
+
+        for dp_record in dp_records:
+            # leave_ids.append(
+            #     {
+            #         "leave_id": "dp{}".format(dp_record.id),
+            #         "calendar_id": str(cal_id.id),
+            #         "resource_id": str(res_id.id),
+            #         "name": dp_record.name,
+            #         "date_from": fields.Datetime.to_string(dp_record.data_from),
+            #         "date_to": fields.Datetime.to_string(dp_record.data_to),
+            #         "flag_task": None,
+            #         "flag_project": None
+            #     })
+            leave_ids.append(
+                {
+                    "leave_id": "dp{}".format(dp_record.id),
+                    "calendar_id": str(cal_id.id),
+                    "resource_id": str(res_id.id),
+                    "name": dp_record.name,
+                    "date_from": dp_record.data_from,
+                    "date_to": dp_record.data_to,
+                    "flag_task": None,
+                    "flag_project": None
+                })
+
+        return leave_ids
+
+
+    # attendance
+    def add_attendance(self, cal_obj, attendance_ids):
+
+        cal_res_search = list(filter(lambda x: x["calendar_id"] == str(cal_obj.id), attendance_ids))
+
+        if len(cal_res_search) == 0:
+
+            for att_id in cal_obj.attendance_ids:
+                attendance_ids.append(
+                    {
+                        "calendar_id": str(att_id.calendar_id.id),
+                        "display_name": att_id.display_name,
+                        "date_from": fields.Date.from_string(att_id.date_from) if att_id.date_from else False,
+                        "date_to": fields.Date.from_string(att_id.date_to) if att_id.date_to else False,
+                        "hour_from": att_id.hour_from,
+                        "hour_to": att_id.hour_to,
+                        "dayofweek": str(att_id.dayofweek),
+                    })
+
+        return attendance_ids
\ No newline at end of file
diff --git a/odex25_project/project_native/models/project_task_tree.py b/odex25_project/project_native/models/project_task_tree.py
new file mode 100644
index 000000000..34b7421be
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_tree.py
@@ -0,0 +1,68 @@
+from odoo import models, fields, api, _
+import logging
+
+
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    fold = fields.Boolean(name="Fold Project", help="Fold project", default=False)
+
+
+class ProjectTaskNative(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+    fold = fields.Boolean(string="Fold Task", help="Fold task", default=False)
+    sorting_seq = fields.Integer(string='Sorting Seq.', default=0)
+    sorting_level = fields.Integer('Sorting Level', default=0)
+
+
+    @api.model
+    def tree_update(self, tree_data, id_update, parent_id):
+
+
+        for idx, val in enumerate(tree_data):
+
+
+            if not val["is_group"]:
+
+                id = val["id"]
+                # seq = val["sorting_seq"]
+
+                var_data = {
+                    "sorting_seq": idx,
+                    "sorting_level": val["sorting_level"],
+                    "plan_action": val["plan_action"],
+                }
+
+
+                if id == id_update:
+
+                    var_data["parent_id"] = None
+                    if parent_id and isinstance(parent_id,int):
+                        var_data["parent_id"] = parent_id
+
+                task_obj_search = self.sudo().search([('id', '=', int(id))])
+                task_obj_search.sudo().write(var_data)
+
+        return True
+
+
+    @api.model
+    def fold_update(self, task_ids):
+
+        for key, val in task_ids.items():
+            id = key
+
+            var_data = {
+                "fold": val,
+            }
+
+            task_obj_search = self.sudo().search([('id', '=', int(id))])
+            task_obj_search.sudo().write(var_data)
+
+        return True
+
diff --git a/odex25_project/project_native/models/project_task_tree_update.py b/odex25_project/project_native/models/project_task_tree_update.py
new file mode 100644
index 000000000..a93048d23
--- /dev/null
+++ b/odex25_project/project_native/models/project_task_tree_update.py
@@ -0,0 +1,98 @@
+from odoo import models, fields, api, _
+
+from operator import itemgetter
+
+
+import logging
+
+
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+class ProjectTaskTreeUpdate(models.Model):
+    _name = 'project.task'
+    _inherit = 'project.task'
+
+    def tree_onfly(self, query, parent):  # array with inside array for sorting only in level.
+        parent['children'] = []
+        for item in query:
+            if item['parent_id'] == parent['id']:
+                parent['children'].append(item)
+                self.tree_onfly(query, item)
+        return parent
+
+
+    def flat_onfly(self, object, level=0):  # recusive search sub level.
+        result = []
+
+
+
+        def _get_rec(object, level, parent=None):
+
+            object = sorted(object, key=itemgetter('sorting_seq'))
+            for line in object:
+
+                res = {}
+                res['id'] = '{}'.format(line["id"])
+                res['name'] = u'{}'.format(line["name"])
+                res['parent_id'] = u'{}'.format(line["parent_id"])
+                res['sorting_seq'] = line["sorting_seq"]
+                res['level'] = '{}'.format(level)
+
+                result.append(res)
+
+                if line["children"]:
+
+                    if level < 16:
+                        level += 1
+                        parent = line["id"]
+
+                    _get_rec(line["children"], level, parent)
+
+                    if level > 0 and level < 16:
+                        level -= 1
+                        parent = None
+
+            return result
+
+
+
+        children = _get_rec(object, level)
+
+        return children
+
+
+    def do_sorting(self, project_id=None):  # recusive search sub level.
+
+        search_objs = self.sudo().search([('project_id', '=', project_id)], order="sorting_seq asc")
+
+        line_datas = []
+        for search_obj in search_objs:
+            res = {}
+            res['id'] = '{}'.format(search_obj.id)
+            res['name'] = u'{}'.format(search_obj.name)
+            res['parent_id'] = u'{}'.format(search_obj.parent_id.id)
+            res['sorting_seq'] = search_obj.sorting_seq
+
+            line_datas.append(res)
+
+        root = {'id': "False"}
+
+        # Stroim derevo s uchetom vseh pod urovnej.
+        tree_onfly = self.tree_onfly(line_datas, root)
+
+        # Razvorachivajem derevo v ploskuju strukturu i sortirujem po Index. Takim obrazom poluchajem
+        # otsortirovanoje derevo dla vivoda v proskom rezime na UI.
+        flat_onfly = self.flat_onfly(tree_onfly["children"])
+
+        for index, line in enumerate(flat_onfly):
+            var_data = {
+                "sorting_seq": index + 1,
+                "sorting_level": int(line["level"]),
+            }
+
+            task_obj = self.env['project.task']
+            task_obj_search = task_obj.sudo().search([('id', '=', int(line["id"]))])
+            task_obj_search.sudo().write(var_data)
+
+
diff --git a/odex25_project/project_native/models/resource.py b/odex25_project/project_native/models/resource.py
new file mode 100644
index 000000000..f4002c30b
--- /dev/null
+++ b/odex25_project/project_native/models/resource.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+import logging
+_logger = logging.getLogger(__name__)  # Need for message in console.
+
+
+
+
+class ResourceAps(models.Model):
+    _inherit = 'resource.resource'
+
+    resource_task_ids = fields.One2many('project.task.resource.link', 'resource_id', 'Resources')
\ No newline at end of file
diff --git a/odex25_project/project_native/security/ir.model.access.csv b/odex25_project/project_native/security/ir.model.access.csv
new file mode 100644
index 000000000..27b007f79
--- /dev/null
+++ b/odex25_project/project_native/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+access_project_task_predecessor,project.task.predecessor,model_project_task_predecessor,project.group_project_user,1,1,1,1
+access_project_task_detail_plan,project.task.detail.plan,model_project_task_detail_plan,project.group_project_user,1,1,1,1
+access_project_task_info,project.task.info,model_project_task_info,project.group_project_user,1,1,1,1
+access_project_task_resource_link,project.task.resource.link,model_project_task_resource_link,project.group_project_user,1,1,1,1
+
diff --git a/odex25_project/project_native/static/description/A1.png b/odex25_project/project_native/static/description/A1.png
new file mode 100644
index 000000000..9f977ce79
Binary files /dev/null and b/odex25_project/project_native/static/description/A1.png differ
diff --git a/odex25_project/project_native/static/description/A2.png b/odex25_project/project_native/static/description/A2.png
new file mode 100644
index 000000000..8dd8837bb
Binary files /dev/null and b/odex25_project/project_native/static/description/A2.png differ
diff --git a/odex25_project/project_native/static/description/A3.png b/odex25_project/project_native/static/description/A3.png
new file mode 100644
index 000000000..f3ee7153e
Binary files /dev/null and b/odex25_project/project_native/static/description/A3.png differ
diff --git a/odex25_project/project_native/static/description/G01.png b/odex25_project/project_native/static/description/G01.png
new file mode 100644
index 000000000..77cf5bf3f
Binary files /dev/null and b/odex25_project/project_native/static/description/G01.png differ
diff --git a/odex25_project/project_native/static/description/G02.png b/odex25_project/project_native/static/description/G02.png
new file mode 100644
index 000000000..435518ba5
Binary files /dev/null and b/odex25_project/project_native/static/description/G02.png differ
diff --git a/odex25_project/project_native/static/description/G03.png b/odex25_project/project_native/static/description/G03.png
new file mode 100644
index 000000000..e60d54c2d
Binary files /dev/null and b/odex25_project/project_native/static/description/G03.png differ
diff --git a/odex25_project/project_native/static/description/G04.png b/odex25_project/project_native/static/description/G04.png
new file mode 100644
index 000000000..9895cf6b8
Binary files /dev/null and b/odex25_project/project_native/static/description/G04.png differ
diff --git a/odex25_project/project_native/static/description/G05.png b/odex25_project/project_native/static/description/G05.png
new file mode 100644
index 000000000..9db195123
Binary files /dev/null and b/odex25_project/project_native/static/description/G05.png differ
diff --git a/odex25_project/project_native/static/description/G06.png b/odex25_project/project_native/static/description/G06.png
new file mode 100644
index 000000000..d4478c6af
Binary files /dev/null and b/odex25_project/project_native/static/description/G06.png differ
diff --git a/odex25_project/project_native/static/description/G07.png b/odex25_project/project_native/static/description/G07.png
new file mode 100644
index 000000000..6953bfe6f
Binary files /dev/null and b/odex25_project/project_native/static/description/G07.png differ
diff --git a/odex25_project/project_native/static/description/G09.png b/odex25_project/project_native/static/description/G09.png
new file mode 100644
index 000000000..7f1690dbd
Binary files /dev/null and b/odex25_project/project_native/static/description/G09.png differ
diff --git a/odex25_project/project_native/static/description/G10.png b/odex25_project/project_native/static/description/G10.png
new file mode 100644
index 000000000..65cfc5eb8
Binary files /dev/null and b/odex25_project/project_native/static/description/G10.png differ
diff --git a/odex25_project/project_native/static/description/G12.png b/odex25_project/project_native/static/description/G12.png
new file mode 100644
index 000000000..4bf620c4e
Binary files /dev/null and b/odex25_project/project_native/static/description/G12.png differ
diff --git a/odex25_project/project_native/static/description/G13.png b/odex25_project/project_native/static/description/G13.png
new file mode 100644
index 000000000..d5e840826
Binary files /dev/null and b/odex25_project/project_native/static/description/G13.png differ
diff --git a/odex25_project/project_native/static/description/G15.png b/odex25_project/project_native/static/description/G15.png
new file mode 100644
index 000000000..e534cbf04
Binary files /dev/null and b/odex25_project/project_native/static/description/G15.png differ
diff --git a/odex25_project/project_native/static/description/G16.png b/odex25_project/project_native/static/description/G16.png
new file mode 100644
index 000000000..5e2cf247d
Binary files /dev/null and b/odex25_project/project_native/static/description/G16.png differ
diff --git a/odex25_project/project_native/static/description/G20.png b/odex25_project/project_native/static/description/G20.png
new file mode 100644
index 000000000..d097cd25a
Binary files /dev/null and b/odex25_project/project_native/static/description/G20.png differ
diff --git a/odex25_project/project_native/static/description/G21.png b/odex25_project/project_native/static/description/G21.png
new file mode 100644
index 000000000..22851332c
Binary files /dev/null and b/odex25_project/project_native/static/description/G21.png differ
diff --git a/odex25_project/project_native/static/description/G25.png b/odex25_project/project_native/static/description/G25.png
new file mode 100644
index 000000000..bc06b6112
Binary files /dev/null and b/odex25_project/project_native/static/description/G25.png differ
diff --git a/odex25_project/project_native/static/description/G26.png b/odex25_project/project_native/static/description/G26.png
new file mode 100644
index 000000000..7189ae706
Binary files /dev/null and b/odex25_project/project_native/static/description/G26.png differ
diff --git a/odex25_project/project_native/static/description/G27.png b/odex25_project/project_native/static/description/G27.png
new file mode 100644
index 000000000..73a8d1c8e
Binary files /dev/null and b/odex25_project/project_native/static/description/G27.png differ
diff --git a/odex25_project/project_native/static/description/G28.png b/odex25_project/project_native/static/description/G28.png
new file mode 100644
index 000000000..fd224ca89
Binary files /dev/null and b/odex25_project/project_native/static/description/G28.png differ
diff --git a/odex25_project/project_native/static/description/G29.png b/odex25_project/project_native/static/description/G29.png
new file mode 100644
index 000000000..efa183cb7
Binary files /dev/null and b/odex25_project/project_native/static/description/G29.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Kanban_stage.png b/odex25_project/project_native/static/description/Gantt_Kanban_stage.png
new file mode 100644
index 000000000..96bfa7011
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Kanban_stage.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Add_Task.png b/odex25_project/project_native/static/description/Gantt_Odoo_Add_Task.png
new file mode 100644
index 000000000..1b9d92229
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Add_Task.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Attachemnt_Icon_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Attachemnt_Icon_01.png
new file mode 100644
index 000000000..b1936ec2c
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Attachemnt_Icon_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Backward_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Backward_01.png
new file mode 100644
index 000000000..ed2319e5a
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Backward_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Backward_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Backward_02.png
new file mode 100644
index 000000000..ceeed3913
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Backward_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Backward_03.png b/odex25_project/project_native/static/description/Gantt_Odoo_Backward_03.png
new file mode 100644
index 000000000..0912ce3c0
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Backward_03.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_01.png
new file mode 100644
index 000000000..8ce0377ce
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_02.png
new file mode 100644
index 000000000..2ef62d634
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_03.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_03.png
new file mode 100644
index 000000000..dd7e437a9
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_03.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_04.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_04.png
new file mode 100644
index 000000000..e917da974
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_04.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_05.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_05.png
new file mode 100644
index 000000000..04fbc4202
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_05.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_06.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_06.png
new file mode 100644
index 000000000..2c0986c64
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_06.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_07.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_07.png
new file mode 100644
index 000000000..df8523862
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_07.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_08.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_08.png
new file mode 100644
index 000000000..eb2e9281c
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_08.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_09.png b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_09.png
new file mode 100644
index 000000000..4cc48bf50
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Calendar_09.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_01.png
new file mode 100644
index 000000000..1d259da08
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_02.png
new file mode 100644
index 000000000..4953a19d6
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_03.png b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_03.png
new file mode 100644
index 000000000..5ade738da
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_03.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_04.png b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_04.png
new file mode 100644
index 000000000..c84a248aa
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_04.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_05.png b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_05.png
new file mode 100644
index 000000000..6b4f42b6d
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_05.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_06.png b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_06.png
new file mode 100644
index 000000000..e14dc914d
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Critical_Path_06.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Deadline_Control_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Deadline_Control_01.png
new file mode 100644
index 000000000..891002270
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Deadline_Control_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Deadline_Control_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Deadline_Control_02.png
new file mode 100644
index 000000000..725934f84
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Deadline_Control_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Done_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Done_01.png
new file mode 100644
index 000000000..753da3e11
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Done_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Done_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Done_02.png
new file mode 100644
index 000000000..7218eaaa6
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Done_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_01.png
new file mode 100644
index 000000000..3e3042dbd
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_02.png
new file mode 100644
index 000000000..c743118cf
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_03.png b/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_03.png
new file mode 100644
index 000000000..2364c54e1
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_03.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_04.png b/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_04.png
new file mode 100644
index 000000000..cc46d0355
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Duration_Scale_04.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Fold_State_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Fold_State_01.png
new file mode 100644
index 000000000..6557b22c5
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Fold_State_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Fold_State_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Fold_State_02.png
new file mode 100644
index 000000000..674efccf5
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Fold_State_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_01.png
new file mode 100644
index 000000000..71fe73c7a
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_02.png
new file mode 100644
index 000000000..909b77944
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_03.png b/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_03.png
new file mode 100644
index 000000000..ff779b83c
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_ISOweek_03.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_List_Item_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_List_Item_01.png
new file mode 100644
index 000000000..338bfef3c
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_List_Item_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Not_allow_Group_1.png b/odex25_project/project_native/static/description/Gantt_Odoo_Not_allow_Group_1.png
new file mode 100644
index 000000000..7300fc4ad
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Not_allow_Group_1.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Not_allow_Group_2.png b/odex25_project/project_native/static/description/Gantt_Odoo_Not_allow_Group_2.png
new file mode 100644
index 000000000..8a0604848
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Not_allow_Group_2.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Open_Tree_Group_1.png b/odex25_project/project_native/static/description/Gantt_Odoo_Open_Tree_Group_1.png
new file mode 100644
index 000000000..db01b40e2
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Open_Tree_Group_1.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Open_Tree_Group_2.png b/odex25_project/project_native/static/description/Gantt_Odoo_Open_Tree_Group_2.png
new file mode 100644
index 000000000..c6161bdd3
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Open_Tree_Group_2.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Order_by_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Order_by_01.png
new file mode 100644
index 000000000..e1372af0b
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Order_by_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Predecessor_Link_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Predecessor_Link_01.png
new file mode 100644
index 000000000..3a1ff4ff1
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Predecessor_Link_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Predecessor_Link_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Predecessor_Link_02.png
new file mode 100644
index 000000000..95d21c955
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Predecessor_Link_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Project_View.png b/odex25_project/project_native/static/description/Gantt_Odoo_Project_View.png
new file mode 100644
index 000000000..6e44f1073
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Project_View.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_01.png
new file mode 100644
index 000000000..702696999
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02-1.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02-1.png
new file mode 100644
index 000000000..08366549b
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02-1.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02-2.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02-2.png
new file mode 100644
index 000000000..8b35c3bc7
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02-2.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02.png
new file mode 100644
index 000000000..fcc935a53
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_03-1.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_03-1.png
new file mode 100644
index 000000000..f005556b1
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_03-1.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_03.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_03.png
new file mode 100644
index 000000000..c68f2fe00
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_03.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_04.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_04.png
new file mode 100644
index 000000000..124a2300b
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_04.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_05.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_05.png
new file mode 100644
index 000000000..9e4bf2b34
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_05.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_06.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_06.png
new file mode 100644
index 000000000..e65715e3c
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_06.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Resources_07.png b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_07.png
new file mode 100644
index 000000000..44d1decdf
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Resources_07.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Task_Default_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_Task_Default_01.png
new file mode 100644
index 000000000..a5ccc7ef2
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Task_Default_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_Task_Default_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_Task_Default_02.png
new file mode 100644
index 000000000..1b7c6d14b
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_Task_Default_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_UI_control_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_UI_control_01.png
new file mode 100644
index 000000000..590ef4770
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_UI_control_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_UI_new_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_UI_new_01.png
new file mode 100644
index 000000000..385eb8546
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_UI_new_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_UI_rename_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_UI_rename_01.png
new file mode 100644
index 000000000..4d88a9d17
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_UI_rename_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_UI_rename_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_UI_rename_02.png
new file mode 100644
index 000000000..e47e3f4f3
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_UI_rename_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_arrows_01.png b/odex25_project/project_native/static/description/Gantt_Odoo_arrows_01.png
new file mode 100644
index 000000000..24274e79b
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_arrows_01.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_Odoo_arrows_02.png b/odex25_project/project_native/static/description/Gantt_Odoo_arrows_02.png
new file mode 100644
index 000000000..9cbc21912
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_Odoo_arrows_02.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_PDF_menu.png b/odex25_project/project_native/static/description/Gantt_PDF_menu.png
new file mode 100644
index 000000000..6eafe48dc
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_PDF_menu.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_UI_long_name_1.png b/odex25_project/project_native/static/description/Gantt_UI_long_name_1.png
new file mode 100644
index 000000000..cad1a7db7
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_UI_long_name_1.png differ
diff --git a/odex25_project/project_native/static/description/Gantt_UI_long_name_2.png b/odex25_project/project_native/static/description/Gantt_UI_long_name_2.png
new file mode 100644
index 000000000..14673db8f
Binary files /dev/null and b/odex25_project/project_native/static/description/Gantt_UI_long_name_2.png differ
diff --git a/odex25_project/project_native/static/description/S1_group_project.png b/odex25_project/project_native/static/description/S1_group_project.png
new file mode 100644
index 000000000..bb7e2bc46
Binary files /dev/null and b/odex25_project/project_native/static/description/S1_group_project.png differ
diff --git a/odex25_project/project_native/static/description/S2_sorting.png b/odex25_project/project_native/static/description/S2_sorting.png
new file mode 100644
index 000000000..13c3dbfd0
Binary files /dev/null and b/odex25_project/project_native/static/description/S2_sorting.png differ
diff --git a/odex25_project/project_native/static/description/S3_fullscreent.png b/odex25_project/project_native/static/description/S3_fullscreent.png
new file mode 100644
index 000000000..6fb95cb51
Binary files /dev/null and b/odex25_project/project_native/static/description/S3_fullscreent.png differ
diff --git a/odex25_project/project_native/static/description/S3_grouping.png b/odex25_project/project_native/static/description/S3_grouping.png
new file mode 100644
index 000000000..c94b1ae0a
Binary files /dev/null and b/odex25_project/project_native/static/description/S3_grouping.png differ
diff --git a/odex25_project/project_native/static/description/arrow_all.png b/odex25_project/project_native/static/description/arrow_all.png
new file mode 100644
index 000000000..217c25560
Binary files /dev/null and b/odex25_project/project_native/static/description/arrow_all.png differ
diff --git a/odex25_project/project_native/static/description/arrow_ff.png b/odex25_project/project_native/static/description/arrow_ff.png
new file mode 100644
index 000000000..ff2670e9b
Binary files /dev/null and b/odex25_project/project_native/static/description/arrow_ff.png differ
diff --git a/odex25_project/project_native/static/description/arrow_fs.png b/odex25_project/project_native/static/description/arrow_fs.png
new file mode 100644
index 000000000..9239cc9d7
Binary files /dev/null and b/odex25_project/project_native/static/description/arrow_fs.png differ
diff --git a/odex25_project/project_native/static/description/arrow_predecessor.png b/odex25_project/project_native/static/description/arrow_predecessor.png
new file mode 100644
index 000000000..28507a9b3
Binary files /dev/null and b/odex25_project/project_native/static/description/arrow_predecessor.png differ
diff --git a/odex25_project/project_native/static/description/arrow_sf.png b/odex25_project/project_native/static/description/arrow_sf.png
new file mode 100644
index 000000000..57dd897b4
Binary files /dev/null and b/odex25_project/project_native/static/description/arrow_sf.png differ
diff --git a/odex25_project/project_native/static/description/arrow_ss.png b/odex25_project/project_native/static/description/arrow_ss.png
new file mode 100644
index 000000000..e0b394461
Binary files /dev/null and b/odex25_project/project_native/static/description/arrow_ss.png differ
diff --git a/odex25_project/project_native/static/description/banner.gif b/odex25_project/project_native/static/description/banner.gif
new file mode 100644
index 000000000..5261f5875
Binary files /dev/null and b/odex25_project/project_native/static/description/banner.gif differ
diff --git a/odex25_project/project_native/static/description/ct01.png b/odex25_project/project_native/static/description/ct01.png
new file mode 100644
index 000000000..fef7ea3df
Binary files /dev/null and b/odex25_project/project_native/static/description/ct01.png differ
diff --git a/odex25_project/project_native/static/description/ct02.png b/odex25_project/project_native/static/description/ct02.png
new file mode 100644
index 000000000..716e936ee
Binary files /dev/null and b/odex25_project/project_native/static/description/ct02.png differ
diff --git a/odex25_project/project_native/static/description/form_view.png b/odex25_project/project_native/static/description/form_view.png
new file mode 100644
index 000000000..9f063c6f7
Binary files /dev/null and b/odex25_project/project_native/static/description/form_view.png differ
diff --git a/odex25_project/project_native/static/description/gantt_native_e_1_menu.png b/odex25_project/project_native/static/description/gantt_native_e_1_menu.png
new file mode 100644
index 000000000..ae3192525
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_native_e_1_menu.png differ
diff --git a/odex25_project/project_native/static/description/gantt_native_folding_1.png b/odex25_project/project_native/static/description/gantt_native_folding_1.png
new file mode 100644
index 000000000..6a84b68f1
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_native_folding_1.png differ
diff --git a/odex25_project/project_native/static/description/gantt_native_folding_2.png b/odex25_project/project_native/static/description/gantt_native_folding_2.png
new file mode 100644
index 000000000..77b95e49b
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_native_folding_2.png differ
diff --git a/odex25_project/project_native/static/description/gantt_odoo_native_b_group_1.png b/odex25_project/project_native/static/description/gantt_odoo_native_b_group_1.png
new file mode 100644
index 000000000..06872abe2
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_odoo_native_b_group_1.png differ
diff --git a/odex25_project/project_native/static/description/gantt_odoo_native_dag_1.png b/odex25_project/project_native/static/description/gantt_odoo_native_dag_1.png
new file mode 100644
index 000000000..21bca45b3
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_odoo_native_dag_1.png differ
diff --git a/odex25_project/project_native/static/description/gantt_odoo_native_dag_2.png b/odex25_project/project_native/static/description/gantt_odoo_native_dag_2.png
new file mode 100644
index 000000000..17e928719
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_odoo_native_dag_2.png differ
diff --git a/odex25_project/project_native/static/description/gantt_odoo_native_limit_1.png b/odex25_project/project_native/static/description/gantt_odoo_native_limit_1.png
new file mode 100644
index 000000000..2b7950e6b
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_odoo_native_limit_1.png differ
diff --git a/odex25_project/project_native/static/description/gantt_odoo_native_limit_2.png b/odex25_project/project_native/static/description/gantt_odoo_native_limit_2.png
new file mode 100644
index 000000000..4de859395
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_odoo_native_limit_2.png differ
diff --git a/odex25_project/project_native/static/description/gantt_odoo_native_limit_3.png b/odex25_project/project_native/static/description/gantt_odoo_native_limit_3.png
new file mode 100644
index 000000000..12cd537a1
Binary files /dev/null and b/odex25_project/project_native/static/description/gantt_odoo_native_limit_3.png differ
diff --git a/odex25_project/project_native/static/description/gh_01.png b/odex25_project/project_native/static/description/gh_01.png
new file mode 100644
index 000000000..3836225ad
Binary files /dev/null and b/odex25_project/project_native/static/description/gh_01.png differ
diff --git a/odex25_project/project_native/static/description/gh_done.png b/odex25_project/project_native/static/description/gh_done.png
new file mode 100644
index 000000000..44ced9b67
Binary files /dev/null and b/odex25_project/project_native/static/description/gh_done.png differ
diff --git a/odex25_project/project_native/static/description/gh_ghost.png b/odex25_project/project_native/static/description/gh_ghost.png
new file mode 100644
index 000000000..b8eb9d455
Binary files /dev/null and b/odex25_project/project_native/static/description/gh_ghost.png differ
diff --git a/odex25_project/project_native/static/description/icon.png b/odex25_project/project_native/static/description/icon.png
new file mode 100644
index 000000000..99c21e071
Binary files /dev/null and b/odex25_project/project_native/static/description/icon.png differ
diff --git a/odex25_project/project_native/static/description/index.html b/odex25_project/project_native/static/description/index.html
new file mode 100644
index 000000000..9e5e5c81e
--- /dev/null
+++ b/odex25_project/project_native/static/description/index.html
@@ -0,0 +1,1699 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Main UI Gannt Module. It Only Web Gantt Framework. It is Main cost module. Other parts free.</h2>
+            <p class="oe_mt32">299.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/web_gantt_native/">Main UI Web Gannt Module</a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/project_native/">Gantt Native view for Projects </a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/project_native_exchange/">Save/Load project in xml</a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/project_native_report_advance/">Save Gantt in PDF for Project</a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/mrp_gantt_native/">Gantt Native view for MRP / Manufacture </a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/hr_holidays_gantt_native/">Gantt Native view for Leave </a>
+            <p class="oe_mt32">14e Technical Module for View both Gantt
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/project_native_ee/">View Standart Gantt in Project View </a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video PlayList <a href="https://www.youtube.com/playlist?list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx">Odoo Gantt Native</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Demo</h2>
+            <p class="oe_mt32">user: demo Password:demog <a href="https://demo14.garage12.eu/">Odoo Gantt Demo </a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>What New</h2>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">For UI view ISOweek/week</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Switch between ISOweek/week
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_ISOweek_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                IsoWeek
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_ISOweek_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                non ISOweek
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_ISOweek_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/7ecikOq2a4E">UI ISOweek</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Informations</h2>
+        </div>
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">TreeView: Open Any Related field</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Click on the name
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Open_Tree_Group_1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Opened
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Open_Tree_Group_1.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Gantt Bar Predecessor: Shows warning if try connect group.</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Tab
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Not_allow_Group_1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Warning
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Not_allow_Group_2.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/ewE4HMxlDcM">TreeView and MRP arrows</a>
+        </div>
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Fold State Available</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Fold with save
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Fold_State_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Unfold with save
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Fold_State_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">List in Items</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Show List near Item Name
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_List_Item_01.png"/>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/Az-B0rFNKFE">Some New for Gantt Item</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Fasted and Better TreeView for Gantt Items</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Tree View can update data in backgroup
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_UI_new_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                More Control: Add Item(every item possible it.), Recheduling, Rename, Export
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_UI_control_01.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Rename in Line</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Show action button near Item Name
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_UI_rename_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Rename on fly.
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_UI_rename_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/NgNX6Au0D2M">New UI TreeView for Gantt Item</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Informations</h2>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Done with -/+ days if deadline was define</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Done after deadline
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Done_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Done before deadline
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Done_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Deadline Control</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               If TODAY on Gatt, shows Bar to Today and how many days:  +/-  from today to deadline
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Deadline_Control_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                If not TODAY on Gatt, bar from Task Bar, but days:  +/-  from today to deadline
+                <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Deadline_Control_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Attachemts</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               If TODAY on Gatt, shows Bar to Today and how many days:  +/-  from today to deadline
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Attachemnt_Icon_01.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">OrderBy</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Can order: Start Date: DECS/ASC, if not group by Project
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Order_by_01.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/YntW-RCSZp4">Deadline, Orderby, Attachments</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">New sub Task for Task Group</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Click on Plus in circle
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Add_Task.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/IeTGq6GY9ao">Look much better</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Task Resource</h2>
+        <h3 class="oe_slogan">Allow add resource to Task</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Gantt Bar Shows resource and working period (vertical bar)
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Task: Calc type: Work/Duration
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Calc type</h2>
+        <h3 class="oe_slogan">Work/Duration</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Set Calc Type = Work and Plan Value = 72. Gantt calculate Working Time for all resource to Plan Value with Load Factor too.
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_02-1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Set Calc Type = Duration and Plan Value = 72. Gantt calculate Working Time for all resource to Plan Value with Load Factor too.
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_02-2.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Resources</h2>
+        <h3 class="oe_slogan">YOu can add resource to Task with Calendar</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Load Factor: if set 0.5, 8*05=4 hours in day available.
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_03.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Set Calendar for resource
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_03-1.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Resources Task Link</h2>
+        <h3 class="oe_slogan">Project -> Resource - > Resources Task Link</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Group by Resource: you can see, Total Working Hours in Day.
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_06.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                8H Scale. Vertical Bar showd working period in day.
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_07.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Loop Detect for Precedessor Link</h2>
+        <h3 class="oe_slogan">On Gantt Shows: Orange if some loop detect.</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+               Precedessor Link showd link type, if loop shows circle.
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_04.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Loop Detect
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Resources_05.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/spsVVf6KzDA">Look much better</a>
+        </div>
+    </div>
+</section>
+
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Project View</h2>
+        <h3 class="oe_slogan">Gantt mode for Project View can group by customer and manager.</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Project Dashboard
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Project_View.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Arrows Link</h2>
+        <h3 class="oe_slogan">Now look much better..</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Tasks Group by project
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_arrows_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Tasks Group by stage
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_arrows_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Detail Plan Control</h2>
+        <h3 class="oe_slogan">You can set: in Project, In Task.</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Allow detail plan control from project for all tasks. If select that options it save detail plan for all tasks. But if not, you can control separate it in each task.
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Default Start Time</h2>
+        <h3 class="oe_slogan">You can select: Negative value</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                You can set negative value for default time start in project.
+        </div>
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/OAz8WavVmbc">Detail Plan Control</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Gantt Bar Info</h2>
+        <h3 class="oe_slogan">Colored inforation for Bar</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                It is Basic things for more information about calculating Critical path. It available in project (cp_detail).
+                But you can use for your information, around gantt bar.
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Critical_Path_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Task - Tab Info
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Critical_Path_03.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/lHTZT3Tivjc">Gantt Bar Info</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Critical Path</h2>
+        <h3 class="oe_slogan">You can calculate critical path for project when do rescheduling (Press Refresh button)</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Look like That
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Critical_Path_02.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Project - you can On/Off: Critical path on gantt or critical path detail info.
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Critical_Path_05.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Critical Path and Constraint </h2>
+        <h3 class="oe_slogan">You can select: As late as possible</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Update Constraint type
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Critical_Path_04.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                It move tasks how is possible. Critical path not change. It like a buffer for task with Constraint: As LAte as possible.
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Critical_Path_06.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/e7CfKVY4Z98">Critical Path and Constraint</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">User Interface</h2>
+        <h3 class="oe_slogan">Colored and better usability</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Grouping and Sorting - drag and drop.
+                Allow only if, One elemnt in group by and is project and  limit more than
+                Quantity records after search.
+            <img class="oe_picture oe_screenshot" src="gantt_odoo_native_dag_1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Not Allow
+            </p>
+            <img class="oe_picture oe_screenshot" src="gantt_odoo_native_dag_2.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Group element colored.
+                IF last element in group by - is Project, it shows items in Tree.
+                If group element is project, shows Action Button for project(add task, rescheduling, export to pdf.)
+            </p>
+            <img class="oe_picture oe_screenshot" src="gantt_odoo_native_b_group_1.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/dcZRb25366E">Colored and better usability</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Limits</h2>
+        <h3 class="oe_slogan">Limit added for gantt items:</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                For default 250, it is in "view_task_ganttaps", later will be options in config, or something also.
+            <img class="oe_picture oe_screenshot" src="gantt_odoo_native_limit_1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                But now you can change on fly. 0 - means unlimited.
+            </p>
+            <img class="oe_picture oe_screenshot" src="gantt_odoo_native_limit_2.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                If Quantity records after search more than limit, it shows red. And means not shows all records on the gantt.
+            </p>
+            <img class="oe_picture oe_screenshot" src="gantt_odoo_native_limit_3.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Video</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/rq24wX3jHBA">Limit for Items </a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Task name with long name </h2>
+        <h3 class="oe_slogan">UI - Improved</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Look Better
+            <img class="oe_picture oe_screenshot" src="Gantt_UI_long_name_1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Very Long Name
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_UI_long_name_2.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://www.youtube.com/watch?v=khfzP9r_FMg">Task name with long name </a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">New Predecessor Link without canvas</h2>
+        <h3 class="oe_slogan">Group by: Project</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Look New
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Predecessor_Link_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Mouseover - Highlight Link
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Predecessor_Link_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/rZsCGC51ArU">New Predecessor Link without canvas</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Folding Task Group and Project</h2>
+        <h3 class="oe_slogan">Group by: Project</h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            Project Folding
+            <img class="oe_picture oe_screenshot" src="gantt_native_folding_1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Task Group Folding
+            </p>
+            <img class="oe_picture oe_screenshot" src="gantt_native_folding_2.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/PPWjILktLkA">Folding Task Group and Project</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">New UI Draggable and Resizable</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            Allows Draggable and Resizable - Gantt Bar.
+            </p>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Allows Draggable - Deadline.
+            </p>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/vOkxqPymq30">New UI Draggable and Resizable</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Sorting from Kanban by stage</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            In Gantt: group by stage -> same like in kanban view
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Kanban_stage.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/LFdLeBPZO5o">Group and Sort by Stage</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">In project you can generate Gantt PDF</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            In Gantt: group by project -> click red arrow
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_PDF_menu.png"/>
+        </div>
+
+        <div class="oe_span6">
+                <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/11.0/project_native_report/">Save Gantt in PDF for Project</a>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/7ktNYnOkYKk">Generate PDF</a>
+        </div>
+    </div>
+</section>
+
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">support: Use Calendar in Project - auto scheduling, with Detail Plan for Task.</h2>
+        <h3 class="oe_slogan">Calendar support - Global Leaves, Extra Working Time by date, Global Leave for cut of working time.</h3>
+
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            In the Project setting setup: Track time spent on projects and task
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Project: Working Time -> Select Calendar
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_02.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Calendar: Setup -> Global Leaves. You can setup Cut OFF time for special day too.
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_03.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Calendar: Setup -> Working Hours
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_04.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Project: Gantt View Tab Setup -> Use calendar and TimeZone for project.
+                After Open Gantt - > Group by project and Rescheduling
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_05.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Task: Open Task -> look: Detail-Plan for Task
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_07.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Task: Detail-Plan List View
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_08.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Task: Detail-Plan Gantt View
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_09.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/Tw768nxtjAY">Calendar, auto-Scheduling.</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Module: project_native_exchange. In project you can save / load project with tasks</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            In project: Exchange (Save / Load)
+            </p>
+            <img class="oe_picture oe_screenshot" src="gantt_native_e_1_menu.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://www.youtube.com/watch?v=VCgwmRPNNzI">Save/Load .xml file</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">In project you can set humanized duration scale for tasks</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            In project: Gantt View Tab: Duration Scale: "You canset: y,mo,w,d,h,m,s,ms", Duration Picker: Empty hide: day and second (select what you need)
+
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Calendar_06.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Task Hour:
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Duration_Scale_02.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Task Hour-Minutes
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Duration_Scale_03.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Task Week-Hour-Minutes:
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Duration_Scale_04.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://www.youtube.com/watch?v=kNwC15yScX4">Humanized duration scale</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Forward and Backward Scheduling</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            In project: Gantt View Tab: Select Forward and Backward Scheduling.
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Backward_02.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             In project: Gantt View Tab: Set Start or End Date.
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Backward_03.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Backward scheduling you can use with TOC (Theory of Constraints).
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Backward_01.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/jMnMUXe_PTs">Forward and Backward Scheduling</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Default Task Start and Duration for Project</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            In project: Gantt View Tab: Setting Duration and Start Task.
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Task_Default_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             New Task with project Default Task setting.
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_Odoo_Task_Default_02.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/rPosTADmp1Y">Odoo Gantt Native View - Default Setting Duration and Start Task</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">New UI</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            Today and Scale button in Odoo Native place.
+            </p>
+            <img class="oe_picture oe_screenshot" src="sc1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Frozen Header and horizontal - vertical scroll.
+            </p>
+            <img class="oe_picture oe_screenshot" src="sc2.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/xx2kuCP46nI">Odoo Gantt Native View - New UI</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Bootstrap Color Picker for Tasks</h2>
+        <h3 class="oe_slogan">Set Color Task and edit color for tasks</h3>
+        Before Update: Install module web_widget_colorpicker.
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            Gantt with custom color for tasks
+
+            </p>
+            <img class="oe_picture oe_screenshot" src="ct01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Edit Color Task
+            </p>
+            <img class="oe_picture oe_screenshot" src="ct02.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://www.youtube.com/watch?v=oLn3-2C5O2Y">Odoo Gantt Native - Task - Custom Color.</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Install</h2>
+        <h3 class="oe_slogan">Download from Odoo App</h3>
+        <div class="oe_span6 text-justify oe_mt32">
+            <span class="fa pull-left"/>
+
+            Manual: Copy folders modules ( web_gantt_native, project_native, web_widget_time_delta ) to odoo addons folder on Odoo server.
+            <span class="fa pull-left"></span>
+
+            <span class="fa  pull-left"></span>
+
+            Update Locale Module under Development Mode (APPs)
+            </p>
+            <span class="fa pull-left"></span>
+            <p>
+            Install modules(web_gantt_native, project_native, mrp_gantt_native, web_widget_time_delta  )
+            </p>
+            <span class="fa pull-left"></span>
+            <p>
+            Restart Odoo service. Need for Some Implementations.
+            </p>
+            <span class="fa pull-left"></span>
+            <p>
+                Updade/Upgrade in APP -> Restart Odoo service. or update over Console.
+                first install web_widget_time_deltav after that update other modules.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Start Date for Auto Scheduling for tasks</h2>
+        <h3 class="oe_slogan">Auto Scheduling</h3>
+
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+New option for the project. Start Date. All tasks in Auto Mode, after rescheduling will begin with the start date in the project.
+
+            </p>
+            <img class="oe_picture oe_screenshot" src="proj_start_date.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://www.youtube.com/watch?v=LWN6PtZqFv0">Odoo Gantt Native - Project - Start Date for Auto Mode</a>
+        </div>
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Lag/Lead time for  predecessor link and Summary Bar for tasks</h2>
+        <h3 class="oe_slogan">After Some Change Run Scheduler, ! - shows need rescheduling </h3>
+
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+To add lead time, type a negative number or a negative percentage (for example, -75%).
+
+Lead time is an overlap between two tasks, where those two tasks share a dependency (a relationship between tasks).
+For example, if you want the second task to start even though the first task is only 35% complete.
+Create predecessor link a finish-to-start dependency between the two tasks, and then add a lead time of -75 percent.
+
+            </p>
+            <img class="oe_picture oe_screenshot" src="sm04.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             To add lag time, type a positive number or percentage (for example, 3 day).
+
+                Lag time creates a delay between two tasks.
+                For example, if you want a 3 day delay between the end of the first task and the start of the second.
+                Create a predecessor link finish-to-start between the two tasks, and then add 2 days of lag time.
+            </p>
+            <img class="oe_picture oe_screenshot" src="sm03.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             You can add task as a summary task in the task list.
+            </p>
+            <img class="oe_picture oe_screenshot" src="sm01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             After some change in task it is shows "!" it means need rescheduled.
+            </p>
+            <img class="oe_picture oe_screenshot" src="sm02.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://www.youtube.com/watch?v=8PwUWjIkGnU&index=1&list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx">Odoo Gantt Native - Project - with Predecessor Lag and Summary Task.</a>
+        </div>
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Auto Scheduling and Constraint for tasks</h2>
+        <h3 class="oe_slogan">Manual / Auto Scheduling, Different type for constraint task</h3>
+
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Auto Scheduler Task
+                !Important -> Only after Click Re Scheduled Tasks for current project.
+
+            </p>
+            <img class="oe_picture oe_screenshot" src="A1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Schedule Type for  Task
+            </p>
+            <img class="oe_picture oe_screenshot" src="A2.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Constraint Type for  Task
+            </p>
+            <img class="oe_picture oe_screenshot" src="A3.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://www.youtube.com/watch?v=OXYNy0M-3yk">Odoo Gantt Native - Auto Scheduling and Constrain for tasks  </a>
+        </div>
+    </div>
+</section>
+
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Humanize duration</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Form View
+            </p>
+            <img class="oe_picture oe_screenshot" src="form_view.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                List View
+            </p>
+            <img class="oe_picture oe_screenshot" src="list_view.png"/>
+            <p class="oe_mt32">YouTube Video PlayList <a href="https://www.youtube.com/watch?v=9MCIs_-VDmc">Odoo Gantt Native - web widget time delta</a>
+
+
+        </div>
+
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Done and Ghosts Bar</h2>
+        <h3 class="oe_slogan">Timesheets - > Ghosts Bar on Gantt, And Done Date for Task on Gantt.</h3>
+
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Main View with Ghosts Bar and Done Bar.
+            </p>
+            <img class="oe_picture oe_screenshot" src="gh_01.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Ghosts Bar
+            </p>
+            <img class="oe_picture oe_screenshot" src="gh_ghost.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Done Bar
+            </p>
+            <img class="oe_picture oe_screenshot" src="gh_done.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://www.youtube.com/watch?v=cgjSU8cDzNg">Odoo Gantt Native - Timesheets Ghosts Bar </a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Sub Tasks</h2>
+        <h3 class="oe_slogan">Sorting, Grouping, SubTasks, Timesheets</h3>
+
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Only, if Grouping by Project: TreeView Drag and Drop Tasks.
+             For Automatically use sub-task in yours project just Sorting any Task.
+            </p>
+            <img class="oe_picture oe_screenshot" src="S1_group_project.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Drag and Drop Sorting: Sorting in self level.
+            </p>
+            <img class="oe_picture oe_screenshot" src="S2_sorting.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Drag and Drop Grouping: Change parent for Task.
+            </p>
+            <img class="oe_picture oe_screenshot" src="S3_grouping.png"/>
+        </div>
+                <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Task Full Screen Edit Support.
+            </p>
+            <img class="oe_picture oe_screenshot" src="S3_fullscreent.png"/>
+        </div>
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Task Predecessor</h2>
+        <h3 class="oe_slogan">Arrows between tasks</h3>
+
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Predecessor
+            </p>
+            <img class="oe_picture oe_screenshot" src="arrow_predecessor.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             FS - Finish to Start
+            </p>
+            <img class="oe_picture oe_screenshot" src="arrow_fs.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             SS - Start to Start
+            </p>
+            <img class="oe_picture oe_screenshot" src="arrow_ss.png"/>
+        </div>
+                <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             FF - Finish to Finish
+            </p>
+            <img class="oe_picture oe_screenshot" src="arrow_ff.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             SF - Start to Finish
+            </p>
+            <img class="oe_picture oe_screenshot" src="arrow_sf.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             All together
+            </p>
+            <img class="oe_picture oe_screenshot" src="arrow_all.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">If select Group by Project</h2>
+        <h3 class="oe_slogan">You can:</h3>
+        <div class="oe_span6 text-justify oe_mt32">
+            <span class="fa fa-search fa-2x pull-left"/>
+            <p class="oe_mb32" style="margin-left:48px;">
+            Tree Sorting Task inside project.
+            </p>
+            <span class="fa fa-sliders fa-2x pull-left"/>
+            <p class="oe_mb32" style="margin-left:48px;">
+            Drag and Drop Task
+            </p>
+            <span class="fa fa-bar-chart fa-2x pull-left"></span>
+            <p>
+            Change Level Task
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="G02.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Focus on Task</h2>
+        <h3 class="oe_slogan">Gantt Screen automaticly move to task</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="G03.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Easy Add/Edit Task</h2>
+        <h3 class="oe_slogan">Just Click</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="G04.png">
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Edit Task.
+            </p>
+            <img src="G05.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span6">
+            <h2 class="oe_slogan" style="color:#875A7B; text-align: left;">Tips / Hint - Drag and Drop Gantt Line</h2>
+
+            <p class="oe_mt32">
+                    Drag task Gantt line on timeline. <br/> Drag Start or End task.
+            </p>
+        </div>
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Hint.
+            </p>
+            <img class="oe_picture oe_screenshot" src="G06.png"/>
+        </div>
+
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Tips.
+            </p>
+            <img class="oe_picture oe_screenshot" src="G07.png"/>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Gantt Scale</h2>
+        <h3 class="oe_slogan">Easy switch</h3>
+
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Scale
+            </p>
+            <img class="oe_picture oe_screenshot" src="G25.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             1Hour, 2Hour, 4Hour, 8Hour
+            </p>
+            <img class="oe_picture oe_screenshot" src="G26.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Days
+            </p>
+            <img class="oe_picture oe_screenshot" src="G10.png"/>
+        </div>
+                <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Month
+            </p>
+            <img class="oe_picture oe_screenshot" src="G29.png"/>
+        </div>
+
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Weeks
+            </p>
+            <img class="oe_picture oe_screenshot" src="G27.png"/>
+        </div>
+                <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Quarter
+            </p>
+            <img class="oe_picture oe_screenshot" src="G28.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Timesheets progress and Deadline</h2>
+
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Progress
+            </p>
+            <img class="oe_picture oe_screenshot" src="G12.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Deadlne
+            </p>
+            <img class="oe_picture oe_screenshot" src="G13.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Milestone</h2>
+
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Makr Task as Milestone
+            </p>
+            <img class="oe_picture oe_screenshot" src="G15.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Milestone
+            </p>
+            <img class="oe_picture oe_screenshot" src="G16.png"/>
+        </div>
+
+
+    </div>
+
+
+    <section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Task Name and Progress Bar</h2>
+
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             New style progress bar with task name.
+            </p>
+            <img class="oe_picture oe_screenshot" src="G20.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             Task name options
+            </p>
+            <img class="oe_picture oe_screenshot" src="G21.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/1DLTggTKW9E">Odoo Gantt Native - Timesheets progress  </a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Need our service?</h2>
+            <p class="oe_mt32">Contact us by <a href="mailto:vostraga@gmail.com">email</a>
+            <ul>
+                <li><a href="mailto:vostraga@gmail.com">vostraga@gmail.com <i class="fa fa-envelope-o"></i></a></li>
+            </ul>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_separator">
+</section>
diff --git a/odex25_project/project_native/static/description/list_view.png b/odex25_project/project_native/static/description/list_view.png
new file mode 100644
index 000000000..3b36268cf
Binary files /dev/null and b/odex25_project/project_native/static/description/list_view.png differ
diff --git a/odex25_project/project_native/static/description/proj_start_date.png b/odex25_project/project_native/static/description/proj_start_date.png
new file mode 100644
index 000000000..034e13626
Binary files /dev/null and b/odex25_project/project_native/static/description/proj_start_date.png differ
diff --git a/odex25_project/project_native/static/description/sc1.png b/odex25_project/project_native/static/description/sc1.png
new file mode 100644
index 000000000..140185ec0
Binary files /dev/null and b/odex25_project/project_native/static/description/sc1.png differ
diff --git a/odex25_project/project_native/static/description/sc2.png b/odex25_project/project_native/static/description/sc2.png
new file mode 100644
index 000000000..e384772ce
Binary files /dev/null and b/odex25_project/project_native/static/description/sc2.png differ
diff --git a/odex25_project/project_native/static/description/sm01.png b/odex25_project/project_native/static/description/sm01.png
new file mode 100644
index 000000000..8cbc71e40
Binary files /dev/null and b/odex25_project/project_native/static/description/sm01.png differ
diff --git a/odex25_project/project_native/static/description/sm02.png b/odex25_project/project_native/static/description/sm02.png
new file mode 100644
index 000000000..a9d68d447
Binary files /dev/null and b/odex25_project/project_native/static/description/sm02.png differ
diff --git a/odex25_project/project_native/static/description/sm03.png b/odex25_project/project_native/static/description/sm03.png
new file mode 100644
index 000000000..b787d78fb
Binary files /dev/null and b/odex25_project/project_native/static/description/sm03.png differ
diff --git a/odex25_project/project_native/static/description/sm04.png b/odex25_project/project_native/static/description/sm04.png
new file mode 100644
index 000000000..2051e9147
Binary files /dev/null and b/odex25_project/project_native/static/description/sm04.png differ
diff --git a/odex25_project/project_native/views/project_calendar_access_view.xml b/odex25_project/project_native/views/project_calendar_access_view.xml
new file mode 100644
index 000000000..46c8d562b
--- /dev/null
+++ b/odex25_project/project_native/views/project_calendar_access_view.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<openerp>
+    <data>
+
+<!--        <record id="edit_project_access_inherited" model="ir.ui.view">-->
+<!--            <field name="name">project.project.access.edit.inherited</field>-->
+<!--            <field name="model">project.project</field>-->
+<!--            <field name="inherit_id" ref="project.edit_project"/>-->
+<!--            <field name="priority">24</field>-->
+<!--            <field name="arch" type="xml">-->
+
+<!--                 <xpath expr="//group[@name='misc']" position="replace">-->
+
+<!--                    <group name="misc">-->
+<!--                        <group string="Configuration" groups="project.group_project_manager">-->
+<!--                            <field name="sequence" groups="project.group_project_manager"/>-->
+<!--                        </group>-->
+<!--                        <group string="Time Scheduling" groups="project.group_project_manager">-->
+<!--                            <field name="resource_calendar_id" groups="project.group_project_manager"/>-->
+<!--                        </group>-->
+<!--                    </group>-->
+
+<!--                </xpath>-->
+
+
+<!--            </field>-->
+<!--        </record>-->
+
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/odex25_project/project_native/views/project_project_view.xml b/odex25_project/project_native/views/project_project_view.xml
new file mode 100644
index 000000000..f3b1851b3
--- /dev/null
+++ b/odex25_project/project_native/views/project_project_view.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+    <data>
+        <record id="view_project_ganttaps" model="ir.ui.view">
+            <field name="name">project.project.ganttaps</field>
+            <field name="model">project.project</field>
+            <field name="type">ganttaps</field>
+            <field eval="2" name="priority" />
+            <field name="arch" type="xml">
+                <ganttaps default_group_by="partner_id" main_group_id_name="partner_id" name="name" date_start="date_start" date_stop="date_end" user_id="user_id" sorting_seq="sequence" project_id="partner_id" no_group_sort_mode="">
+                </ganttaps>
+            </field>
+        </record>
+        <record id="project.open_view_project_all" model="ir.actions.act_window">
+            <field name="view_mode">kanban,form,ganttaps</field>
+        </record>
+    </data>
+</openerp>
diff --git a/odex25_project/project_native/views/project_task_detail_plan_view.xml b/odex25_project/project_native/views/project_task_detail_plan_view.xml
new file mode 100644
index 000000000..a2422efae
--- /dev/null
+++ b/odex25_project/project_native/views/project_task_detail_plan_view.xml
@@ -0,0 +1,113 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<odoo>
+    <data>
+
+        <record id="project_task_detail_plan_search_view_form" model="ir.ui.view">
+            <field name="name">project.task.detail.plan.search.form</field>
+            <field name="model">project.task.detail.plan</field>
+            <field name="arch" type="xml">
+               <search string="Level">
+                    <field name="task_id" />
+                </search>
+            </field>
+        </record>
+
+
+
+        <record id="act_project_task_detail_plan" model="ir.actions.act_window">
+            <field name="name">Detail Plan for Task</field>
+            <field name="res_model">project.task.detail.plan</field>
+            <field name="view_mode">tree,ganttaps</field>
+            <field name="context">{
+                "search_default_task_id": [active_id],
+                "default_task_id": active_id}
+            </field>
+            <field name="domain">[('task_id', '=', active_id)]</field>
+            <field name="search_view_id" ref="project_task_detail_plan_search_view_form"/>
+
+        </record>
+
+
+        <record id="view_task_form2_inherit_task_detail_plan" model="ir.ui.view">
+            <field name="name">view.task.form2.inherit.task.detail.plan</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project_native.ganttaps_view_task_form2"/>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+
+                <button name="action_subtask" position="after">
+                    <button name="%(project_native.act_project_task_detail_plan)d" type="action"
+                            class="oe_stat_button"
+                            icon="fa-tasks"
+                            attrs="{'invisible': [('detail_plan_count', '=', 0)]}">
+                        <field string="Detail-Plan" name="detail_plan_count" widget="statinfo"/>
+                    </button>
+                </button>
+
+
+            </field>
+		</record>
+
+ 		<!-- tree -->
+		<record id="project_task_detail_plan_tree_view" model="ir.ui.view">
+            <field name="name">project.task.detail.plan.tree</field>
+			<field name="model">project.task.detail.plan</field>
+	        <field name="arch" type="xml">
+	            <tree  create="false" edit="false">
+                    <field name="name"/>
+                    <field name="resource_id"/>
+                     <field name="task_id"/>
+                     <field name="type_level"/>
+                     <field name="data_from"/>
+                     <field name="data_to"/>
+                     <field name="duration" widget="time_delta" options="{'mask_humanize_string': 'h,m'}" />
+                    <field name="iteration"/>
+
+	            </tree>
+	        </field>
+		</record>
+
+
+        <record id="project_task_detail_plan_view_ganttaps" model="ir.ui.view">
+            <field name="name">project.task.detail.plan.ganttaps</field>
+            <field name="model">project.task.detail.plan</field>
+            <field name="type">ganttaps</field>
+            <field eval="2" name="priority"/>
+
+            <field name="arch" type="xml">
+                <ganttaps
+
+
+                        default_group_by = "task_id"
+                        main_group_id_name = "task_id"
+
+                        name = "name"
+                        date_start="data_from"
+                        date_stop="data_to"
+
+                        duration="duration"
+
+                        project_id="task_id"
+
+
+                        no_group_sort_mode=""
+                        schedule_mode="schedule_mode"
+
+                        color_gantt_set = "color_gantt_set"
+                        color_gantt = "color_gantt"
+
+                        default_order="data_from asc"
+
+                >
+
+                </ganttaps>
+
+            </field>
+
+        </record>
+
+
+
+
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_native/views/project_task_resource_view.xml b/odex25_project/project_native/views/project_task_resource_view.xml
new file mode 100644
index 000000000..8bd7275b5
--- /dev/null
+++ b/odex25_project/project_native/views/project_task_resource_view.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+	<data>
+
+        <menuitem id="project_resource_menu"
+		    parent="project.menu_main_pm"
+		    name="Resource" sequence="90"
+		/>
+
+        <!--project.task.resource.link-->
+
+        <record id="project_task_resource_link_form" model="ir.ui.view">
+            <field name="name">project.task.resource.link.form</field>
+            <field name="model">project.task.resource.link</field>
+            <field name="arch" type="xml">
+                <form string="Resource">
+                   <group>
+                      <group>
+                            <field name="name"/>
+<!--                            <field name="resource_id"/>-->
+                            <field name="task_id"/>
+                            <field name="date_start"/>
+                            <field name="date_end"/>
+                            <field name="duration" widget="time_delta"/>
+                       </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="project_task_resource_link_tree" model="ir.ui.view">
+            <field name="name">project.task.resource.link.tree</field>
+            <field name="model">project.task.resource.link</field>
+            <field name="arch" type="xml">
+                <tree string="Resources">
+                    <field name="name"/>
+                    <field name="resource_id"/>
+                    <field name="task_id"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="duration" widget="time_delta"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_project_task_resource_link_ganttaps" model="ir.ui.view">
+            <field name="name">project.task.resource.link.ganttaps</field>
+            <field name="model">project.task.resource.link</field>
+            <field name="type">ganttaps</field>
+            <field eval="2" name="priority"/>
+
+            <field name="arch" type="xml">
+                <ganttaps
+                        default_group_by = "resource_id"
+                        main_group_id_name = "resource_id"
+
+                        name = "name"
+                        date_start="date_start"
+                        date_stop="date_end"
+
+                        project_id="task_id"
+
+                        no_group_sort_mode=""
+
+                        color_gantt_set = "color_gantt_set"
+                        color_gantt = "color_gantt"
+
+                        load_group_id_name = "resource_id"
+                        load_bar_model = "project.task.detail.plan"
+                        load_bar_record_row = "project_id"
+                        load_id = "task_id"
+                        load_id_from = "resource_id"
+                        load_ids_from = "resource_id"
+                        load_data_id = "resource_id"
+
+                >
+
+                </ganttaps>
+
+            </field>
+
+            </record>
+
+
+
+        <record id="view_project_task_resource_link_search" model="ir.ui.view">
+            <field name="name">project.task.resource.link.search</field>
+            <field name="model">project.task.resource.link</field>
+            <field name="arch" type="xml">
+                <search string="Search Resource">
+
+                    <field name="name" string="Link Name"/>
+                    <field name="resource_id" string="Resource"/>
+                    <field name="task_id" string="Task"/>
+                    <field name="active_task" string="Archived"/>
+                    <filter string="Archived" name="is_task_not_active" domain="[('active_task', '=', False)]"/>
+                    <filter string="Active" name="is_task_active" domain="[('active_task', '=', True)]"/>
+
+
+                   <group expand="0" string="Group By">
+                       <filter name="groupby_resource" string="Resource" domain="[]" context="{'group_by':'resource_id'}"/>
+                       <filter name="groupby_projecd" string="Project" domain="[]" context="{'group_by':'project_id'}"/>
+                       <filter name="groupby_task" string="Task" domain="[]" context="{'group_by':'task_id'}"/>
+                   </group>
+
+               </search>
+            </field>
+        </record>
+
+
+
+        <record id="action_project_task_resource_link_tree" model="ir.actions.act_window">
+            <field name="name">Resource Task Link</field>
+            <field name="res_model">project.task.resource.link</field>
+            <field name="view_mode">tree,form,ganttaps</field>
+            <field name="context">{"search_default_is_task_active":1}</field>
+            <field name="search_view_id" ref="view_project_task_resource_link_search"/>
+        </record>
+
+
+        <menuitem id="project_task_resource_link_menu"
+        parent="project_resource_menu"
+        action="action_project_task_resource_link_tree"
+        sequence="3"/>
+
+
+  	</data>
+</odoo>
diff --git a/odex25_project/project_native/views/project_task_view.xml b/odex25_project/project_native/views/project_task_view.xml
new file mode 100644
index 000000000..447c9eadf
--- /dev/null
+++ b/odex25_project/project_native/views/project_task_view.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+        <record id="ganttaps_view_task_form2" model="ir.ui.view">
+            <field name="name">project.task.ganttaps.form</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+
+<!--Odoo 14-->
+<!--                <button name="action_open_parent_task" position="attributes">-->
+<!--                        <attribute name="attrs">{'invisible': 1}</attribute>-->
+<!--                </button>-->
+
+
+<!--                <button name="action_subtask" position="attributes">-->
+<!--                        <attribute name="attrs">{'invisible': 0}</attribute>-->
+<!--                </button>-->
+
+                <xpath expr="//field[@name='tag_ids']" position="after">
+                     <field name="date_finished"/>
+                </xpath>
+
+                <xpath expr="//notebook/page[2]" position="after">
+
+                    <page name="gantt_view" string="Gantt View">
+                            <group>
+                                <group>
+
+                                    <field name="fixed_calc_type"/>
+
+                                    <label for="plan_duration" attrs="{'invisible':['|',('schedule_mode', '=' ,'manual'), ('child_ids','!=', [])]}" string="Plan Duration"/>
+                                    <div attrs="{'invisible':['|',('schedule_mode', '=' ,'manual'), ('child_ids','!=', [])]}" >
+                                        <field name="plan_duration" widget="time_delta" options="{'mask_humanize_field': 'duration_scale', 'mask_picker_field' : 'duration_picker'}"  class="oe_inline"/>
+                                    </div>
+
+
+                                    <field name="date_start" attrs="{'readonly': [('schedule_mode', '=', 'auto')]}" />
+                                    <field name="date_end" attrs="{'readonly': [('schedule_mode', '=', 'auto')]}"/>
+
+                                    <label for="duration"/>
+                                    <div>
+                                        <field name="duration" widget="time_delta" options="{'mask_humanize_field': 'duration_scale', 'mask_picker_field' : 'duration_picker'}" class="oe_inline"/>
+                                    </div>
+
+                                    <label for="detail_plan_work"/>
+                                    <div>
+                                        <field name="detail_plan_work" widget="time_delta" options="{'mask_humanize_field': 'duration_work_scale', 'mask_picker_field' : 'duration_picker'}" class="oe_inline"/>
+                                    </div>
+
+
+                                    <field name="duration_scale" invisible="1"/>
+                                    <field name="duration_work_scale" invisible="1"/>
+                                    <field name="duration_picker" invisible="1"/>
+
+                                </group>
+                                <group>
+
+                                    <field name="on_gantt"/>
+                                    <field name="is_milestone"/>
+                                    <field name="schedule_mode" widget='radio'/>
+                                    <field name="constrain_type"/>
+                                    <field name="constrain_date"/>
+
+                                    <field name="color_gantt_set"/>
+                                    <field name="color_gantt" widget="colorpicker" attrs="{'invisible': [('color_gantt_set', '=', False)]}"/>
+
+
+                                    <field name="summary_date_start" invisible="1"/>
+                                    <field name="summary_date_end" invisible="1"/>
+                                    <field name="detail_plan"/>
+
+
+                                </group>
+
+                            </group>
+                    </page>
+
+                    <page name="gantt_predecessor" string="Predecessor">
+
+                        <field name="predecessor_ids" nolabel="1" widget="one2many">
+                            <tree string="Predecessor" editable="bottom" >
+                                <field name="parent_task_id"/>
+                                <field name="type"/>
+                                <field name="lag_qty"/>
+                                <field name="lag_type"/>
+                            </tree>
+                        </field>
+                    </page>
+
+                    <page name="resources" string="Resources">
+                            <field name="task_resource_ids" nolabel="1" widget="one2many">
+                                <tree string="Resources Link" editable="bottom" >
+                                    <field name="resource_id" />
+                                    <field name="load_factor" />
+                                    <field name="resource_type" />
+                                    <field name="load_control" />
+
+                                </tree>
+                            </field>
+
+                    </page>
+
+                    <page name="info_task" string="Info">
+
+                        <field name="info_ids" nolabel="1" widget="one2many">
+                            <tree string="Info" editable="bottom" >
+                                <field name="name"/>
+                                 <field name="start"/>
+                                <field name="end"/>
+                                <field name="left_up"/>
+                                <field name="left_down"/>
+                                <field name="right_up"/>
+                                <field name="right_down"/>
+                                <field name="show"/>
+                            </tree>
+                        </field>
+                    </page>
+
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_task_tree2_gantt" model="ir.ui.view">
+            <field name="name">project.task.tree.gantt</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_tree2" />
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+                <field name="stage_id" position="after">
+                    <field name="duration" widget="time_delta_list"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_task_ganttaps" model="ir.ui.view">
+            <field name="name">project.task.ganttaps</field>
+            <field name="model">project.task</field>
+            <field name="type">ganttaps</field>
+            <field eval="2" name="priority"/>
+
+            <field name="arch" type="xml">
+                <ganttaps
+                        default_group_by = "project_id"
+
+                        action_menu = "project_id"
+                        main_group_id_name = "project_id"
+                        main_group_model = "project.project"
+
+                        name = "name"
+                        date_start="date_start"
+                        date_stop="date_end"
+
+                        user_id = "user_id"
+
+
+                        project_id="project_id"
+                        date_deadline="date_end"
+                        progress="progress"
+
+                        on_gantt="on_gantt"
+                        date_done="date_finished"
+
+                        predecessor_model="project.task.predecessor"
+                        predecessor_task_id="task_id"
+                        predecessor_parent_task_id="parent_task_id"
+                        predecessor_type="type"
+
+                        subtask_project_id = "project_id"
+                        parent_id = "parent_id"
+                        subtask_count = "subtask_count"
+
+                        ghost_id="task_id"
+                        ghost_model="account.analytic.line"
+                        ghost_name="name"
+                        ghost_date_start="date"
+                        ghost_durations="unit_amount"
+
+                        is_milestone="is_milestone"
+                        schedule_mode="schedule_mode"
+                        constrain_type="constrain_type"
+                        constrain_date="constrain_date"
+                        duration="duration"
+                        plan_duration="plan_duration"
+
+                        summary_date_start = "summary_date_start"
+                        summary_date_end   = "summary_date_end"
+
+                        plan_action = "plan_action"
+
+                        color_gantt_set = "color_gantt_set"
+                        color_gantt = "color_gantt"
+
+
+                        duration_scale = "duration_scale"
+
+                        export_wizard="project.native.report"
+
+                        sorting_seq="sorting_seq"
+                        sorting_level="sorting_level"
+
+                        default_seq="sequence"
+                        second_seq_link_field="stage_id"
+                        second_seq_model="project.task.type"
+                        second_seq_field="sequence"
+
+                        fold="fold"
+
+                        limit_view="250"
+
+                        info_model="project.task.info"
+                        info_ids="info_ids"
+
+                        critical_path="critical_path"
+                        cp_shows="cp_shows"
+                        cp_detail="cp_detail"
+
+                        p_loop="p_loop"
+
+                        load_group_id_name = ""
+                        load_bar_model = "project.task.detail.plan"
+                        load_id = "task_id"
+                        load_id_from = "task_id"
+                        load_ids_from = "id"
+                        load_data_id = "id"
+
+                        default_order="date_start asc"
+
+                        doc_count = "message_main_attachment_id"
+
+                >
+
+                </ganttaps>
+
+            </field>
+
+        </record>
+
+
+    
+        <record id="project.action_view_all_task" model="ir.actions.act_window">
+            <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity,ganttaps</field>
+        </record>
+
+
+        <record id="project.action_view_task" model="ir.actions.act_window">
+            <field name="view_mode">kanban,tree,form,calendar,pivot,graph,activity,ganttaps</field>
+        </record>
+
+
+        <record id="project.dblc_proj" model="ir.actions.act_window">
+            <field name="view_mode">tree,form,calendar,graph,kanban,ganttaps</field>
+        </record>
+
+
+        <record id="project.act_project_project_2_project_task_all" model="ir.actions.act_window">
+            <field name="view_mode">kanban,tree,form,calendar,pivot,graph,activity,ganttaps</field>
+        </record>
+
+
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
+                    id="act_res_users_2_project_task_opened" name="Assigned Tasks"
+                    res_model="project.task" view_mode="tree,form,calendar,graph,ganttaps"
+                    binding_model="res.users" binding_views="form"/>
+
+
+
+
+        <record id="edit_project_ganttaps_inherited" model="ir.ui.view">
+            <field name="name">project.project.ganttaps.edit.inherited</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="priority">24</field>
+            <field name="arch" type="xml">
+
+                <xpath expr="//notebook/page[1]" position="after">
+
+                    <page string="Gantt View">
+                        <group>
+
+                            <group string="Tasks in Auto Mode" >
+                                 <field name="scheduling_type" />
+                                 <field name="date_start" attrs="{'invisible':[('scheduling_type','=', 'backward')]}"/>
+                                 <field name="date_end"  attrs="{'invisible':[('scheduling_type','=', 'forward')]}"/>
+                                 <field name="use_calendar" />
+                                 <field name="resource_calendar_id" attrs="{'invisible':[('use_calendar','=', False)]}"/>
+                                 <field name="tz" widget="timezone_mismatch" options="{'tz_offset_field': 'tz_offset'}" readonly="0"/>
+                                 <field name="tz_offset" invisible="1"/>
+                            </group>
+
+                            <group string="Default for Task" >
+                                <field name="task_default_duration" widget="time_delta" />
+                                <field name="task_default_start" widget="time_delta" />
+                                <field name="detail_plan"/>
+
+                            </group>
+
+                            <field name="task_default_start_end"/>
+
+
+                            <group name="duration_scale" string="Duration Scale">
+                                <field name="duration_scale"/>
+                                <field name="duration_picker"/>
+                            </group>
+
+                            <group name="critical_path" string="Critical Path">
+                                <field name="cp_shows"/>
+                                <field name="cp_detail"/>
+
+                            </group>
+
+                        </group>
+                    </page>
+
+                </xpath>
+            </field>
+        </record>
+
+
+</odoo>
diff --git a/odex25_project/project_native/views/resource_views.xml b/odex25_project/project_native/views/resource_views.xml
new file mode 100644
index 000000000..5a9b097f0
--- /dev/null
+++ b/odex25_project/project_native/views/resource_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+	<data>
+          <record id="resource_resource_form_aps" model="ir.ui.view">
+                    <field name="name">resource.resource.form.aps</field>
+                    <field name="model">resource.resource</field>
+                    <field name="inherit_id" ref="resource.resource_resource_form"/>
+                    <field name="arch" type="xml">
+
+                        <field name="user_id" position="replace">
+                            <field name="user_id" attrs="{'readonly':[('resource_type','=','material')]}"/>
+                        </field>
+
+                    </field>
+          </record>
+
+    </data>
+</odoo>
diff --git a/odex25_project/project_native_custom/__init__.py b/odex25_project/project_native_custom/__init__.py
new file mode 100644
index 000000000..13fc2f029
--- /dev/null
+++ b/odex25_project/project_native_custom/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+
+from . import models
+
diff --git a/odex25_project/project_native_custom/__manifest__.py b/odex25_project/project_native_custom/__manifest__.py
new file mode 100644
index 000000000..10d149e51
--- /dev/null
+++ b/odex25_project/project_native_custom/__manifest__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+{
+    "name": """Custom Gantt Native view for Projects""",
+    "category": "Odex25-Project/Odex25-Project",
+    "version": "14.1",
+    "description": """
+        Gantt View for Project and Project Task
+    """,
+    "author": "Expert",
+    "website": "https://exp-sa.com/web",
+
+
+
+    "depends": [
+        "project_base",
+        "project_native",
+        "project_native_report_advance",
+    ],
+
+    "data": [
+        'security/security.xml',
+        'views/project_task_view.xml',
+        'views/project_project_view.xml',
+    ],
+
+    "installable": True,
+    
+}
diff --git a/odex25_project/project_native_custom/i18n/ar_001.po b/odex25_project/project_native_custom/i18n/ar_001.po
new file mode 100644
index 000000000..ae08a9426
--- /dev/null
+++ b/odex25_project/project_native_custom/i18n/ar_001.po
@@ -0,0 +1,63 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project_native_custom
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-05 12:51+0000\n"
+"PO-Revision-Date: 2024-06-05 12:51+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_native_custom
+#: model_terms:ir.ui.view,arch_db:project_native_custom.view_task_form2
+msgid ""
+"<i class=\"fa fa-long-arrow-right mx-2 oe_edit_only\" aria-label=\"Arrow icon\" title=\"Arrow\"/>\n"
+"\t\t                    <i class=\"fa fa-long-arrow-right mx-2 oe_read_only\" aria-label=\"Arrow icon\" title=\"Arrow\" attrs=\"{'invisible': [('date_start', '=', False), ('date_end', '=', False)]}\"/>"
+msgstr ""
+
+#. module: project_native_custom
+#: model:res.groups,name:project_native_custom.group_project_native_admin
+msgid "Manager"
+msgstr ""
+
+#. module: project_native_custom
+#: model_terms:ir.ui.view,arch_db:project_native_custom.view_task_form2
+msgid "Planned Date"
+msgstr "التاريخ المخطط"
+
+#. module: project_native_custom
+#: model:ir.model,name:project_native_custom.model_project_project
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project_native_custom
+#: model:ir.module.category,name:project_native_custom.module_project_native_pdf_cat
+msgid "Project Native PDF"
+msgstr ""
+
+#. module: project_native_custom
+#: model:ir.model.fields,field_description:project_native_custom.field_project_project__scheduling_type
+msgid "Scheduling Type"
+msgstr "نوع الجدولة"
+
+#. module: project_native_custom
+#: model:ir.model.fields,field_description:project_native_custom.field_project_task__color_gantt_set
+msgid "Set Color Task"
+msgstr ""
+
+#. module: project_native_custom
+#: model:ir.model,name:project_native_custom.model_project_task
+msgid "Task"
+msgstr "مهمة"
+
+#. module: project_native_custom
+#: model:ir.model.fields,field_description:project_native_custom.field_project_task__on_gantt
+msgid "Task name on gantt"
+msgstr "اسم المهمة على شكل دياجرام جانت"
diff --git a/odex25_project/project_native_custom/models/__init__.py b/odex25_project/project_native_custom/models/__init__.py
new file mode 100644
index 000000000..64e59a564
--- /dev/null
+++ b/odex25_project/project_native_custom/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import project_task
+
diff --git a/odex25_project/project_native_custom/models/project_task.py b/odex25_project/project_native_custom/models/project_task.py
new file mode 100644
index 000000000..16d9ab1eb
--- /dev/null
+++ b/odex25_project/project_native_custom/models/project_task.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    scheduling_type = fields.Selection('_get_scheduling_type',
+                                       string='Scheduling Type',
+                                       required=True,
+                                       default='manual')
+
+    @api.onchange('start')
+    def _onchange_start_date(self):
+        if self.start:
+            self.date_start = self.start
+            
+    @api.onchange('date')
+    def _onchange_end_date(self):
+        if self.date:
+            self.date_end = self.date
+
+                      
+    
+class ProjectTas(models.Model):
+    _inherit = 'project.task'
+
+    on_gantt = fields.Boolean("Task name on gantt", default=True)
+    color_gantt_set = fields.Boolean("Set Color Task", default=True)
+
+
+
+
+
diff --git a/odex25_project/project_native_custom/security/security.xml b/odex25_project/project_native_custom/security/security.xml
new file mode 100644
index 000000000..07dcb376b
--- /dev/null
+++ b/odex25_project/project_native_custom/security/security.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <data noupdate="1">
+
+        <record model="ir.module.category" id="module_project_native_pdf_cat">
+            <field name="name">Project Native PDF</field>
+            <field name="sequence">7</field>
+        </record>
+
+        <record id="group_project_native_admin" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="category_id" ref="project_native_report_advance.module_project_native_pdf_cat"/>
+            <field name="implied_ids" eval="[(4, ref('project_native_report_advance.group_project_native_pdf_export'))]"/>
+        </record>
+
+    </data>
+
+</odoo>
diff --git a/odex25_project/project_native_custom/views/project_project_view.xml b/odex25_project/project_native_custom/views/project_project_view.xml
new file mode 100644
index 000000000..3d56d05b9
--- /dev/null
+++ b/odex25_project/project_native_custom/views/project_project_view.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+    <data>
+        
+        <record id="edit_project_ganttaps_inherited" model="ir.ui.view">
+            <field name="name">project.project.ganttaps.edit.inherited</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="project_native.edit_project_ganttaps_inherited"/>
+            <field name="arch" type="xml">
+                 <xpath expr="//notebook/page[2]" position="attributes">
+                    <attribute name="groups">project_native_custom.group_project_native_admin</attribute>
+               </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/odex25_project/project_native_custom/views/project_task_view.xml b/odex25_project/project_native_custom/views/project_task_view.xml
new file mode 100644
index 000000000..6de327fcf
--- /dev/null
+++ b/odex25_project/project_native_custom/views/project_task_view.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+        <record id="ganttaps_view_task_form2" model="ir.ui.view">
+            <field name="name">project.task.ganttaps.form.inherited</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project_native.ganttaps_view_task_form2"/>
+            <field name="arch" type="xml">
+               <xpath expr="//field[@name='date_finished']" position="attributes">
+                    <attribute name="attrs">{'invisible':True}</attribute>
+               </xpath>
+               <xpath expr="//field[@name='date_start']" position="replace" />
+               <xpath expr="//field[@name='date_end']" position="replace" />
+           
+               <xpath expr="//page[@name='gantt_view']" position="attributes">
+                    <attribute name="groups">project_native_custom.group_project_native_admin</attribute>
+               </xpath>
+               <xpath expr="//page[@name='info_task']" position="attributes">
+                    <attribute name="groups">project_native_custom.group_project_native_admin</attribute>
+               </xpath>
+               <xpath expr="//page[@name='info_task']" position="attributes">
+                    <attribute name="groups">project_native_custom.group_project_native_admin</attribute>
+               </xpath>
+               <xpath expr="//page[@name='resources']" position="attributes">
+                    <attribute name="attrs">{'invisible':True}</attribute>
+               </xpath>
+            </field>
+        </record>  
+        
+        <record id="view_task_form2" model="ir.ui.view">
+            <field name="name">project.task.form.inherited</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+               <xpath expr="//group/group[2]" position="inside">
+                     <label for="date_start" string="Planned Date"/>
+                        <div name="dates" class="o_row">
+		                    <field name="date_start" />
+		                    <i class="fa fa-long-arrow-right mx-2 oe_edit_only" aria-label="Arrow icon" title="Arrow"/>
+		                    <i class="fa fa-long-arrow-right mx-2 oe_read_only" aria-label="Arrow icon" title="Arrow" attrs="{'invisible': [('date_start', '=', False), ('date_end', '=', False)]}"/>
+		                    <field name="date_end"/>
+		                </div>  
+		                <label for="duration"/>
+                        <div>
+                            <field name="duration" widget="time_delta" options="{'mask_humanize_field': 'duration_scale', 'mask_picker_field' : 'duration_picker'}" class="oe_inline"/>
+                        </div>
+                       
+                </xpath>
+               <xpath expr="//field[@name='date_deadline']" position="attributes">
+                    <attribute name="attrs">{'invisible':True}</attribute>
+               </xpath>
+               <xpath expr="//field[@name='displayed_image_id']" position="after">
+                <field name="color_gantt" widget="colorpicker" />
+               </xpath>
+            </field>
+        </record>               
+
+		<menuitem id="project_native.project_resource_menu"
+					groups="project_native_custom.group_project_native_admin"
+					
+				/>
+
+
+</odoo>
diff --git a/odex25_project/project_native_report_advance/__init__.py b/odex25_project/project_native_report_advance/__init__.py
new file mode 100644
index 000000000..4c1bb08c9
--- /dev/null
+++ b/odex25_project/project_native_report_advance/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import wizard
+
diff --git a/odex25_project/project_native_report_advance/__manifest__.py b/odex25_project/project_native_report_advance/__manifest__.py
new file mode 100644
index 000000000..a5471ec07
--- /dev/null
+++ b/odex25_project/project_native_report_advance/__manifest__.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+{
+    "name": """Gantt Native PDF Advance""",
+    "summary": """One price = web_gant_native, project_native, project_native_report_advance, project_native_exchange hr_holidays_gantt_native, mrp_gantt_native""",
+    "category": "Odex25-Project/Odex25-Project",
+    "images": ['static/description/banner.gif'],
+    "version": "14.22.04.13.0",
+    "description": """
+        PDF report use pycairo for draw/
+        
+    """,
+    "author": "Viktor Vorobjov",
+    "license": "OPL-1",
+    "website": "https://www.youtube.com/watch?v=xbAoC_s5Et0&list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx",
+    "live_test_url": "https://demo13.garage12.eu",
+    "support": "vostraga@gmail.com",
+
+    "depends": [
+        "project",
+        "project_native",
+        "web_gantt_native",
+    ],
+    "external_dependencies": {"python": ["cairo"], "bin": []},
+    "data": [
+        'security/ir.model.access.csv',
+        'security/security.xml',
+
+        'wizard/project_native_pdf_view.xml',
+
+
+
+
+    ],
+    "qweb": [],
+    "demo": [],
+
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+    "installable": True,
+    "auto_install": False,
+    "application": False,
+}
diff --git a/odex25_project/project_native_report_advance/doc/.vscode/settings.json b/odex25_project/project_native_report_advance/doc/.vscode/settings.json
new file mode 100644
index 000000000..3cce948f6
--- /dev/null
+++ b/odex25_project/project_native_report_advance/doc/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "restructuredtext.confPath": ""
+}
\ No newline at end of file
diff --git a/odex25_project/project_native_report_advance/doc/RELEASE_NOTES.md b/odex25_project/project_native_report_advance/doc/RELEASE_NOTES.md
new file mode 100644
index 000000000..304ba9d20
--- /dev/null
+++ b/odex25_project/project_native_report_advance/doc/RELEASE_NOTES.md
@@ -0,0 +1,11 @@
+## Module <Project Native Report Advance>
+
+
+#### Version 14.21.09.16.0
+Color bar Pdf from model
+
+
+#### Version 14.21.01.19.0
+PDF arrows
+
+
diff --git a/odex25_project/project_native_report_advance/doc/index.rst b/odex25_project/project_native_report_advance/doc/index.rst
new file mode 100644
index 000000000..c206d08c1
--- /dev/null
+++ b/odex25_project/project_native_report_advance/doc/index.rst
@@ -0,0 +1,35 @@
+Info demo/video
+==========================
+
+* Youtube: `Odoo Gantt Native Play List <https://www.youtube.com/watch?v=xbAoC_s5Et0&list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx>`_
+
+* Demo: Odoo 14 Gantt - Go to Live Privew (button near Add to Cart)
+    * User: demo
+    * password: demog
+
+
+* Docs:  github.com/straga/gantt_native_doc
+
+  * Calc Type - Resources - Resources Task Link.md
+  * Detail Plan Control in actions.md
+  * Detail Plan Control.md
+  * Duration - Work.md
+  * Update Duration - Work.md
+  * New Task - Sub task.md
+
+* History:
+
+  * Version 22.04.14.0
+      * Resource Name to print.
+
+  * Version 22.02.09.0
+      * Better view - Color bar.
+
+  * Version 21.09.16.0
+      * Color bar Pdf from model
+
+  * ver: 2021-07-06:
+      * Allow pdf from project from anywhere
+
+  * ver: Before :
+      * Look RELEASE_NOTES.md
\ No newline at end of file
diff --git a/odex25_project/project_native_report_advance/i18n/ar_001.po b/odex25_project/project_native_report_advance/i18n/ar_001.po
new file mode 100644
index 000000000..05e20dad3
--- /dev/null
+++ b/odex25_project/project_native_report_advance/i18n/ar_001.po
@@ -0,0 +1,315 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* web_gantt_native
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-05-03 08:56+0000\n"
+"PO-Revision-Date: 2023-05-03 08:56+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "1H"
+msgstr "ساعة واحدة"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "2H"
+msgstr "ساعتان"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "4H"
+msgstr "4 ساعات"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "8H"
+msgstr "8 ساعات"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_timeline_data.js:0
+#, python-format
+msgid "Bar Data Update"
+msgstr "تحديث بيانات الشريط"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Close"
+msgstr "إغلاق"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#: code:addons/web_gantt_native/static/src/js/gantt_timeline_data.js:0
+#, python-format
+msgid "Data updated : "
+msgstr "تم تحديث البيانات:"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Days"
+msgstr "أيام"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Delete"
+msgstr "حذف"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__display_name
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_tool__display_name
+#: model:ir.model.fields,field_description:web_gantt_native.field_ir_ui_view__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Edit in Form View"
+msgstr "تحرير في عرض النموذج"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "Finish to Finish (FF)"
+msgstr "انتهاء إلى انتهاء (FF)"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "Finish to Start (FS)"
+msgstr "انتهاء إلى بدء (FS)"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/native_gantt_renderer.js:0
+#: model:ir.model.fields.selection,name:web_gantt_native.selection__ir_ui_view__type__ganttaps
+#, python-format
+msgid "Gantt APS"
+msgstr "جانت APS"
+
+#. module: web_gantt_native
+#: model:ir.model,name:web_gantt_native.model_gantt_native_tool
+msgid "Gantt Native Tool"
+msgstr "أداة جانت الأصلية"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__id
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_tool__id
+#: model:ir.model.fields,field_description:web_gantt_native.field_ir_ui_view__id
+msgid "ID"
+msgstr "المعرف"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Item Data Update"
+msgstr "تحديث بيانات العنصر"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__lag_qty
+msgid "Lag"
+msgstr "تأخير"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__lag_type
+msgid "Lag type"
+msgstr "نوع التأخير"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor____last_update
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_tool____last_update
+#: model:ir.model.fields,field_description:web_gantt_native.field_ir_ui_view____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Month"
+msgstr "شهر"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/native_gantt_view.js:0
+#, python-format
+msgid "Native Gantt"
+msgstr "جانت الأصلية"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Ops"
+msgstr "العمليات"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "PDF Report for Project"
+msgstr "تقرير PDF للمشروع"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_options.js:0
+#, python-format
+msgid "PDF Report for Screen"
+msgstr "تقرير PDF للشاشة"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Please Select Project First For Task"
+msgstr "يرجى تحديد المشروع أولاً للمهمة"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_tool.py:0
+#, python-format
+msgid ""
+"Please install module first: Gantt Native PDF Advance "
+"(project_native_report_advance). It free parts for: web_gantt_native "
+msgstr ""
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Quarter"
+msgstr "ربع"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "Start to Finish (SF)"
+msgstr "من البداية إلى النهاية (SF)"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "Start to Start (SS)"
+msgstr "من البداية إلى البداية (SS)"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Today"
+msgstr "اليوم"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Tree Data Update"
+msgstr "تحديث بيانات الشجرة"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "Try update"
+msgstr "حاول التحديث"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_gantt_native_predecessor__type
+msgid "Type"
+msgstr "النوع"
+
+#. module: web_gantt_native
+#: model:ir.model,name:web_gantt_native.model_ir_ui_view
+msgid "View"
+msgstr "عرض"
+
+#. module: web_gantt_native
+#: model:ir.model.fields,field_description:web_gantt_native.field_ir_ui_view__type
+#: model:ir.model.fields,field_description:web_gantt_native.field_website_page__type
+msgid "View Type"
+msgstr "نوع واجهة العرض"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/xml/web_gantt_template.xml:0
+#, python-format
+msgid "Weeks"
+msgstr "أسابيع"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "You are trying add task to not select Project!"
+msgstr "أنت تحاول إضافة مهمة إلى مشروع غير محدد!"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_item_ztree.js:0
+#, python-format
+msgid "You are trying to edit on a read-only field! : '%s' "
+msgstr "أنت تحاول تحرير حقل للقراءة فقط! : '%s'"
+
+#. module: web_gantt_native
+#. openerp-web
+#: code:addons/web_gantt_native/static/src/js/gantt_timeline_data.js:0
+#: code:addons/web_gantt_native/static/src/js/gantt_timeline_data.js:0
+#, python-format
+msgid "You are trying to write on a read-only field! : '%s' "
+msgstr "أنت تحاول الكتابة في حقل للقراءة فقط! : '%s'"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "day"
+msgstr "يوم"
+
+#. module: web_gantt_native
+#: model:ir.model,name:web_gantt_native.model_gantt_native_predecessor
+msgid "gantt.native.predecessor"
+msgstr "السلف"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "hour"
+msgstr "ساعة"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "minute"
+msgstr "دقيقة"
+
+#. module: web_gantt_native
+#: code:addons/web_gantt_native/models/gantt_native_predecessor.py:0
+#, python-format
+msgid "percent"
+msgstr "نسبة مئوية"
\ No newline at end of file
diff --git a/odex25_project/project_native_report_advance/security/ir.model.access.csv b/odex25_project/project_native_report_advance/security/ir.model.access.csv
new file mode 100644
index 000000000..8ed6adf26
--- /dev/null
+++ b/odex25_project/project_native_report_advance/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+access_project_native_report,project.native.report,model_project_native_report,project.group_project_user,1,1,1,1
diff --git a/odex25_project/project_native_report_advance/security/security.xml b/odex25_project/project_native_report_advance/security/security.xml
new file mode 100644
index 000000000..4d20e2e13
--- /dev/null
+++ b/odex25_project/project_native_report_advance/security/security.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <data noupdate="1">
+
+        <record model="ir.module.category" id="module_project_native_pdf_cat">
+            <field name="name">Project Native PDF</field>
+            <field name="sequence">7</field>
+        </record>
+
+        <record id="group_project_native_pdf_export" model="res.groups">
+            <field name="name">PDF export</field>
+            <field name="category_id" ref="module_project_native_pdf_cat"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
+    </data>
+
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_1.png b/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_1.png
new file mode 100644
index 000000000..6a0801bb4
Binary files /dev/null and b/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_1.png differ
diff --git a/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_2.png b/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_2.png
new file mode 100644
index 000000000..97a3612d4
Binary files /dev/null and b/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_2.png differ
diff --git a/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_3.png b/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_3.png
new file mode 100644
index 000000000..fa54bd18a
Binary files /dev/null and b/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_3.png differ
diff --git a/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_4.png b/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_4.png
new file mode 100644
index 000000000..09e4daf5d
Binary files /dev/null and b/odex25_project/project_native_report_advance/static/description/Gantt_native_pdf_4.png differ
diff --git a/odex25_project/project_native_report_advance/static/description/banner.gif b/odex25_project/project_native_report_advance/static/description/banner.gif
new file mode 100644
index 000000000..548c2cb38
Binary files /dev/null and b/odex25_project/project_native_report_advance/static/description/banner.gif differ
diff --git a/odex25_project/project_native_report_advance/static/description/icon.png b/odex25_project/project_native_report_advance/static/description/icon.png
new file mode 100644
index 000000000..66c7cf244
Binary files /dev/null and b/odex25_project/project_native_report_advance/static/description/icon.png differ
diff --git a/odex25_project/project_native_report_advance/static/description/index.html b/odex25_project/project_native_report_advance/static/description/index.html
new file mode 100644
index 000000000..bff9ef4eb
--- /dev/null
+++ b/odex25_project/project_native_report_advance/static/description/index.html
@@ -0,0 +1,120 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Main UI Gannt Module. It Only Web Gantt Framework. It is Main cost dependence module. Odoo 13</h2>
+            <p class="oe_mt32">299.00 Eur <a href="https://apps.odoo.com/apps/modules/13.0/web_gantt_native/">Main UI Web Gannt Module</a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/13.0/project_native/">Gantt Native view for Projects </a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/13.0/project_native_exchange/">Save/Load project in xml</a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/13.0/mrp_gantt_native/">Gantt Native view for MRP / Manufacture </a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/13.0/hr_holidays_gantt_native/">Gantt Native view for Leave </a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video PlayList <a href="https://www.youtube.com/playlist?list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx">Odoo Gantt Native</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Info - Gantt Native - PDF</h2>
+            <p class="oe_mt32">First release.
+                In future releases everything will be improved and added what is missing.
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Demo</h2>
+            <p class="oe_mt32">user: demo Password:demog <a href="https://demo13.garage12.eu/">Odoo Gantt Demo </a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">PyCairo: install first: <a href="https://pycairo.readthedocs.io/en/latest/">pycairo docs </a> </h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                apt install libcairo2-dev pkg-config
+            </p>
+            <p class="oe_mt32 oe_mb32 text-justify">
+                pip3 install pycairo
+            </p>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">In project you can generate Gantt PDF</h2>
+        <h3 class="oe_slogan"></h3>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+            On Gantt Item: project name -> click: right arrow
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_native_pdf_1.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Wizard Open: select scale
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_native_pdf_2.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Generated PDF
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_native_pdf_3.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+             Print PDF: use Foxit for split by printer size paper.
+            </p>
+            <img class="oe_picture oe_screenshot" src="Gantt_native_pdf_4.png"/>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video <a href="https://youtu.be/mxN2HuSENM0">Generate PDF</a>
+        </div>
+    </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Need our service?</h2>
+            <p class="oe_mt32">Contact us by <a href="mailto:vostraga@gmail.com">email</a>
+            <ul>
+                <li><a href="mailto:vostraga@gmail.com">vostraga@gmail.com <i class="fa fa-envelope-o"></i></a></li>
+            </ul>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_separator">
+</section>
diff --git a/odex25_project/project_native_report_advance/wizard/__init__.py b/odex25_project/project_native_report_advance/wizard/__init__.py
new file mode 100644
index 000000000..9a9fa09dd
--- /dev/null
+++ b/odex25_project/project_native_report_advance/wizard/__init__.py
@@ -0,0 +1 @@
+from . import project_native_pdf
diff --git a/odex25_project/project_native_report_advance/wizard/project_native_pdf.py b/odex25_project/project_native_report_advance/wizard/project_native_pdf.py
new file mode 100644
index 000000000..8dd0310ef
--- /dev/null
+++ b/odex25_project/project_native_report_advance/wizard/project_native_pdf.py
@@ -0,0 +1,1392 @@
+
+from odoo import api, fields, models, _
+
+import cairo
+
+import base64
+
+from io import BytesIO
+
+from dateutil.relativedelta import relativedelta
+
+import logging
+_logger = logging.getLogger(__name__)
+
+from odoo.exceptions import UserError
+from datetime import datetime, timedelta
+
+import json
+import pytz
+
+class ProjectNativeReport(models.TransientModel):
+    _name = "project.native.report"
+    _description = "project.native.report"
+
+
+
+    @api.model
+    def _get_scale(self):
+        value = [
+            ('day_1hour', _('1-Hrs')),
+            ('day_2hour', _('2-Hrs')),
+            ('day_4hour', _('4-Hrs')),
+            ('day_8hour', _('8-Hrs')),
+            ('month_day', _('Day')),
+            ('year_month', _('Month')),
+            ('year_week', _('Week')),
+            ('year_quarter', _('Quarter')),
+
+        ]
+        return value
+
+
+
+    screen = fields.Boolean(string='Screen', default=False, readonly=True)
+
+    project_id = fields.Many2one('project.project', 'Project', readonly=True)
+
+    name = fields.Char(string='Name', default='Report', readonly=True)
+    file_save = fields.Binary(string='Bin File', readonly=True)
+    report_scale = fields.Selection('_get_scale',
+                                       string='Scale',
+                                       required=True,
+                                       default='month_day')
+
+    data_json = fields.Text(string='Data')
+    pre_json = fields.Text(string='Precedessor')
+
+
+
+    def rectangle_draw(self, ctx, width, start_w, start_h, size_w, size_h):
+
+        ctx.set_line_width(width)
+
+        ctx.rectangle(start_w, start_h, size_w, size_h)
+        ctx.set_line_join(cairo.LINE_JOIN_ROUND)
+        ctx.stroke()
+
+
+
+    def textwidth(self, ctx, text):
+        x, y, width, height, dx, dy = ctx.text_extents(text)
+        return width
+
+
+    def huminize_duration(self, duration):
+
+        text_list = ''
+        if duration:
+
+            attrs = ['years', 'months', 'days', 'hours', 'minutes', 'seconds']
+            human_readable = lambda delta: ['%d %s' % (getattr(delta, attr), getattr(delta, attr) > 1 and attr or attr[:-1])
+                                            for attr in attrs if getattr(delta, attr)]
+
+            text_list = human_readable(relativedelta(seconds=duration))
+
+        return ' '.join(text_list)
+
+    def draw_info(self, ctx, plot_param, from_left):
+
+        tz_name = self.env.context.get('tz') or self.env.user.tz
+
+        from_top = plot_param["margin_top"]
+        line_width = plot_param["line_width"]
+        font = plot_param["font_face"]
+
+        ctx.select_font_face(font)
+
+        idx_col = "tzname: {}".format(tz_name)
+
+        space_lft = 2
+
+        pad_from_left = from_left + space_lft + (2 * line_width)
+        pad_from_top = from_top - 12
+
+        ctx.move_to(pad_from_left, pad_from_top)
+        ctx.show_text(idx_col)
+
+
+
+
+    def col_draw_wbs(self, ctx, data_list, plot_param, from_left):
+
+
+        from_top = plot_param["margin_top"]
+        line_width = plot_param["line_width"]
+        font = plot_param["font_face"]
+
+        ctx.select_font_face(font)
+
+        pad_from_left = 0
+        idx_col_len = []
+        space_lft = 2
+        space_rgh = 5
+
+        i_next = 1
+
+        for idx, val in enumerate(data_list):
+
+            if val["wbs"]:
+                idx_col = val["wbs"]
+                i_next = 0
+            else:
+                if val["separate"]:
+                    i_next = 0
+                    idx_col = ""
+                else:
+                    idx_col = i_next
+
+            idx_col = "{}".format(idx_col)
+
+            pad_from_left = from_left + space_lft + (2 * line_width)
+            pad_from_top = from_top + 12 + line_width + (idx * 20)
+
+            ctx.move_to(pad_from_left, pad_from_top)
+            ctx.show_text(idx_col)
+
+            idx_col_width = self.textwidth(ctx, idx_col)
+            idx_col_len.append(idx_col_width + space_rgh)
+
+            i_next += 1
+
+
+        if idx_col_len:
+            from_left = int(max(idx_col_len)) + pad_from_left
+            ctx.set_source_rgba(0, 0, 0, 0.5)
+            #vertical Line
+            ctx.set_dash([])
+            ctx.set_line_width(0.5)
+            ctx.set_line_width(line_width)
+            ctx.move_to(from_left, from_top)
+            ctx.line_to(from_left, plot_param["margin_top"]+plot_param["plot_height"])
+            ctx.stroke()
+
+        return from_left
+
+
+
+    def col_draw_stuff(self, ctx, data_list, plot_param, from_left):
+
+        from_top = plot_param["margin_top"]
+        line_width = plot_param["line_width"]
+        font = plot_param["font_face"]
+
+        ctx.select_font_face(font)
+
+        pad_from_left = 0
+        idx_col_len = []
+
+        space_lft = 2
+        space_rgh = 5
+
+        for idx, val in enumerate(data_list):
+
+            if val["stuff"]:
+                idx_col = val["stuff"]
+
+                idx_col = "{}".format(idx_col)
+
+                pad_from_left = from_left + space_lft + (2 * line_width)
+                pad_from_top = from_top + 12 + line_width + (idx * 20)
+
+                ctx.move_to(pad_from_left, pad_from_top)
+                ctx.show_text(idx_col)
+
+                idx_col_width = self.textwidth(ctx, idx_col)
+                idx_col_len.append(idx_col_width + space_rgh)
+
+
+        if idx_col_len:
+            from_left = int(max(idx_col_len)) + pad_from_left
+            ctx.set_source_rgba(0, 0, 0, 0.5)
+            # vertical Line
+            ctx.set_dash([])
+            ctx.set_line_width(0.5)
+            ctx.set_line_width(line_width)
+            ctx.move_to(from_left, from_top)
+            ctx.line_to(from_left, plot_param["margin_top"] + plot_param["plot_height"])
+            ctx.stroke()
+
+        return from_left
+
+    def col_draw_item(self, ctx, data_list, plot_param, from_left):
+
+        from_top = plot_param["margin_top"]
+        line_width = plot_param["line_width"]
+        font = plot_param["font_face"]
+        ctx.set_font_size(10)
+
+        ctx.select_font_face(font)
+
+        pad_from_left = 0
+        idx_col_len = []
+
+        padding_depth = 15
+        space_lft = 2
+        space_rgh = 5
+
+        for idx, val in enumerate(data_list):
+
+            if val["name"]:
+                idx_col = val["name"]
+
+                idx_col = "{}".format(idx_col)
+
+                if val["subtask_count"] > 0:
+                    ctx.select_font_face(font, cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD)
+                else:
+                    ctx.select_font_face(font)
+
+                level = val["sorting_level"]
+                paddepth = padding_depth * level
+
+                pad_from_left = from_left + space_lft + (2 * line_width) + paddepth
+                pad_from_top = from_top + 12 + line_width + (idx * 20)
+
+                ctx.move_to(pad_from_left, pad_from_top)
+                ctx.show_text(idx_col)
+
+                idx_col_width = self.textwidth(ctx, idx_col)
+                idx_col_len.append(idx_col_width + space_rgh)
+
+
+        if idx_col_len:
+            from_left = int(max(idx_col_len)) + pad_from_left
+            ctx.set_source_rgba(0, 0, 0, 0.5)
+            # vertical Line
+            ctx.set_dash([])
+            ctx.set_line_width(0.5)
+            ctx.set_line_width(line_width)
+            ctx.move_to(from_left, from_top)
+            ctx.line_to(from_left, plot_param["margin_top"] + plot_param["plot_height"])
+            ctx.stroke()
+
+        return from_left
+
+
+    def col_draw_custom(self, ctx, data_list, plot_param, from_left):
+
+        from_top = plot_param["margin_top"]
+        line_width = plot_param["line_width"]
+        font = plot_param["font_face"]
+
+        ctx.select_font_face(font)
+        space_lft = 2
+        space_rgh = 5
+        ctx.set_font_size(9)
+
+        for custom_field in plot_param["custom_fields"]:
+
+            pad_from_left = 0
+            idx_col_len = []
+
+            for idx, val in enumerate(data_list):
+
+                if val[custom_field]:
+                    idx_col = val[custom_field]
+
+                    if isinstance(idx_col, datetime):
+                        idx_col = fields.Datetime.to_string(idx_col)
+                    else:
+                        idx_col = "{}".format(idx_col)
+
+                    pad_from_left = from_left + space_lft + (2 * line_width)
+                    pad_from_top = from_top + 12 + line_width + (idx * 20)
+
+                    ctx.move_to(pad_from_left, pad_from_top)
+                    ctx.show_text(idx_col)
+
+                    idx_col_width = self.textwidth(ctx, idx_col)
+                    idx_col_len.append(idx_col_width + space_rgh)
+
+
+            if idx_col_len:
+                from_left = int(max(idx_col_len)) + pad_from_left
+                ctx.set_source_rgba(0, 0, 0, 0.5)
+                # vertical Line
+                ctx.set_dash([])
+                ctx.set_line_width(0.5)
+                ctx.set_line_width(line_width)
+                ctx.move_to(from_left, from_top)
+                ctx.line_to(from_left, plot_param["margin_top"] + plot_param["plot_height"])
+                ctx.stroke()
+
+        return from_left
+
+
+    def col_draw_duration(self, ctx, data_list, plot_param, from_left):
+
+        from_top = plot_param["margin_top"]
+        line_width = plot_param["line_width"]
+        font = plot_param["font_face"]
+        ctx.set_font_size(10)
+
+        ctx.select_font_face(font)
+
+        text_duration_list = []
+        len_duration = []
+
+        for idx, val in enumerate(data_list):
+
+            if val["subtask_count"] > 0:
+                ctx.select_font_face(font, cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD)
+            else:
+                ctx.select_font_face(font)
+
+            text_duration = self.huminize_duration(val["duration"])
+            text_duration_width = self.textwidth(ctx, text_duration)
+            text_duration_list.append([text_duration, text_duration_width, val["subtask_count"] ])
+
+            len_duration.append(text_duration_width)
+
+        from_left = max(len_duration) + from_left + 5
+
+
+        # draw duration
+        ctx.select_font_face(font)
+        for idx, val in enumerate(text_duration_list):
+
+            if val[2] > 0:
+                ctx.select_font_face(font, cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD)
+            else:
+                ctx.select_font_face(font)
+
+            ctx.move_to(from_left - val[1], from_top + 12 + line_width + (idx * 20))
+            ctx.show_text(val[0])
+
+        return from_left
+
+
+
+    def item_draw(self, ctx, data_list,  plot_param, calc_width=False):
+
+        from_left = plot_param["margin_left"]
+        from_top = plot_param["margin_top"]
+        line_width = plot_param["line_width"]
+        font = plot_param["font_face"]
+
+        ctx.set_line_width(line_width)
+
+        self.draw_info(ctx, plot_param, from_left)
+        # WBS Column
+        from_left = self.col_draw_wbs(ctx, data_list, plot_param, from_left)
+
+        # Stuff Column
+        from_left = self.col_draw_stuff(ctx, data_list, plot_param, from_left)
+
+        # item Name Column
+        from_left = self.col_draw_item(ctx, data_list, plot_param, from_left)
+
+        # Custom Column
+        from_left = self.col_draw_custom(ctx, data_list, plot_param, from_left)
+
+        # Custom Column
+        from_left = self.col_draw_duration(ctx, data_list, plot_param, from_left)
+
+
+        duration_from = from_left + 5
+        if calc_width:
+            return duration_from
+
+        ctx.stroke()
+
+        #vertical line finish items
+
+        ctx.set_dash([])
+        ctx.set_line_width(0.5)
+        ctx.set_line_width(plot_param["line_width"])
+        ctx.move_to(plot_param["item_width"], plot_param["margin_top"])
+        ctx.line_to(plot_param["item_width"], plot_param["margin_top"]+plot_param["plot_height"])
+        ctx.stroke()
+
+
+
+        # #dash line horizontal items
+        ctx.set_source_rgb(0.5, 0.5, 0.5)
+        ctx.set_line_width(0.5)
+        for i in range(1, plot_param["tasks_list_len"]):
+            ctx.set_dash([2.0])
+
+            draw_line_top = plot_param["margin_top"] + (i*plot_param["element_height"])
+            ctx.move_to(plot_param["margin_left"], draw_line_top)
+            ctx.line_to(plot_param["item_width"], draw_line_top)
+            ctx.stroke()
+
+        ctx.set_dash([])
+
+
+
+
+
+
+    def first_date_of_month(self, dt):
+
+        first_day = dt.replace(day=1)
+        dt_day = dt.day
+
+        if 4 < dt_day:
+            first = dt - timedelta(days=4)
+        else:
+            first = first_day
+
+        return first.replace(minute=0, hour=0, second=0)
+
+
+
+    def last_date_of_month(self, dt):
+
+        next_month = dt.replace(day=28) + timedelta(days=4)
+        last_day = next_month - timedelta(days=next_month.day)
+
+        dt_day = dt.day
+
+        if dt_day > 15:
+            first = dt + timedelta(days=12)
+        else:
+            first = last_day
+
+        return first.replace(minute=0, hour=0, second=0)
+
+
+
+
+    def min_max_range(self, task_ids):
+
+        f_date_start = "date_start"
+        f_date_end = "date_end"
+        date_start = None
+        date_end = None
+
+        date_start_range = []
+        date_end_range = []
+
+        for item in task_ids:
+
+            # r_date_start = fields.Datetime.from_string(item[f_date_start])
+            # r_date_end = fields.Datetime.from_string(item[f_date_end])
+
+            r_date_start = item[f_date_start]
+            r_date_end = item[f_date_end]
+
+            if not r_date_start:
+                r_date_start = r_date_end
+            if not r_date_end:
+                r_date_end = r_date_start
+
+            if r_date_start and r_date_end:
+                date_start_range.append(r_date_start)
+                date_end_range.append(r_date_end)
+
+        if date_start_range:
+            date_start_range = min(date_start_range)
+            date_start = self.first_date_of_month(date_start_range)
+
+
+
+
+        if date_end_range:
+            date_end_range = max(date_end_range)
+            date_end = self.last_date_of_month(date_end_range)
+
+        return date_start, date_end
+
+
+
+    def get_scale(self, date_start, date_end, plot_param):
+
+        first_day_scale = date_start.timestamp()
+        time_scale = date_end.timestamp() - date_start.timestamp()
+
+        timeline_width = 0
+        px_scale = 0
+
+        if plot_param["scale"] == "year_week":
+
+            for dt in self.daterange(date_start, date_end, type_range="week"):
+                timeline_width += 1
+
+        elif plot_param["scale"] == "year_month":
+
+            for dt in self.daterange(date_start, date_end, type_range="month"):
+                timeline_width += 1
+
+        elif plot_param["scale"] == "month_day":
+
+            for dt in self.daterange(date_start, date_end, type_range="day"):
+                timeline_width += 1
+
+        elif plot_param["scale"] == "day_8hour":
+
+            for dt in self.daterange(date_start, date_end, type_range="8hour"):
+                timeline_width += 1
+
+        elif plot_param["scale"] == "day_4hour":
+
+            for dt in self.daterange(date_start, date_end, type_range="4hour"):
+                timeline_width += 1
+
+        elif plot_param["scale"] == "day_2hour":
+
+            for dt in self.daterange(date_start, date_end, type_range="2hour"):
+                timeline_width += 1
+
+        elif plot_param["scale"] == "day_1hour":
+
+            for dt in self.daterange(date_start, date_end, type_range="1hour"):
+                timeline_width += 1
+
+        elif plot_param["scale"] == "year_quarter":
+
+            for dt in self.daterange(date_start, date_end, type_range="quarter"):
+                timeline_width += 1
+
+
+
+        if timeline_width:
+            timeline_width = plot_param["cell_scale"] * timeline_width
+            px_scale = time_scale / timeline_width
+
+        return first_day_scale, px_scale, timeline_width
+
+
+    def daterange(self, date1, date2, type_range):
+
+
+        result = []
+        if type_range == "year":
+            while date1 <= date2:
+                result.append(date1)
+                date1 += relativedelta(years=1)
+            result.append(date2)
+
+
+        elif type_range == "quarter":
+            while date1 <= date2:
+                result.append(date1)
+                date1 += relativedelta(weeks=3)
+
+        elif type_range == "week":
+            while date1 <= date2:
+                result.append(date1)
+                date1 += relativedelta(weeks=1)
+
+        elif type_range == "day":
+            while date1 <= date2:
+                result.append(date1)
+                date1 += relativedelta(days=1)
+
+        elif type_range == "month":
+
+            date2_last_day = self.last_day_of_month(date2)
+
+            while date1 <= date2_last_day:
+                result.append(date1)
+                date1 += relativedelta(months=1)
+
+        elif type_range == "8hour":
+            while date1 <= date2:
+                result.append(date1)
+                date1 += relativedelta(hours=8)
+
+        elif type_range == "4hour":
+            while date1 <= date2:
+                result.append(date1)
+                date1 += relativedelta(hours=4)
+
+        elif type_range == "2hour":
+            while date1 <= date2:
+                result.append(date1)
+                date1 += relativedelta(hours=2)
+
+        elif type_range == "1hour":
+            while date1 <= date2:
+                result.append(date1)
+                date1 += relativedelta(hours=1)
+
+
+
+        return result
+
+
+
+    def item_size(self, tasks_list, plot_param, ctx=None):
+
+        dummy_width = 500
+
+        plot_width = dummy_width + plot_param["margin_left"]
+
+        # start draw
+        if not ctx:
+            buffered = BytesIO()
+            report_surface = cairo.PDFSurface(buffered, plot_param["timeline_width"],  plot_param["plot_height"])
+            ctx = cairo.Context(report_surface)
+            # svg = cairo.SVGSurface(buffered, dummy_width + plot_param["timeline_width"],  plot_param["plot_height"])
+            # ctx = cairo.Context(svg)
+
+        # border
+        self.rectangle_draw(ctx, plot_param["line_width"],
+                                 plot_param["margin_left"],
+                                 plot_param["margin_top"],
+                                 plot_width,
+                                 plot_param["plot_height"])
+
+        item_width = self.item_draw(ctx, tasks_list, plot_param , calc_width=True)
+
+
+        return item_width
+
+
+
+    def last_day_of_month(self, any_day):
+        next_month = any_day.replace(day=28) + timedelta(days=4)
+        return next_month - timedelta(days=next_month.day)
+
+    def convert_datetime(self, dt_date):
+
+        tz_name = self.env.context.get('tz') or self.env.user.tz
+
+        if not isinstance(dt_date, datetime):
+
+            try:
+                dt_date = fields.Datetime.from_string(dt_date)
+            finally:
+                pass
+
+        if isinstance(dt_date, datetime):
+
+            if tz_name:
+                user_tz = pytz.timezone(tz_name)
+                dt_date = dt_date.replace(tzinfo=pytz.utc).astimezone(user_tz)
+
+        return dt_date
+
+
+    def record_params(self, val):
+
+        params = {
+            "id": val.id,
+            "name": val.name,
+            "duration": val.duration,
+            "date_start": self.convert_datetime(val.date_start),
+            "date_end": self.convert_datetime(val.date_end),
+            "sorting_level": val.sorting_level,
+            "subtask_count": val.subtask_count,
+            "wbs": None,
+            "stuff": "",
+            "separate": False,
+            "color_gantt": val.color_gantt,
+
+        }
+
+        return params
+
+    def get_resource(self, tasks, screen=False):
+        resource_list = []
+        if screen and self.pre_json:
+            pass
+        else:
+            uids = map(lambda x: x["id"], tasks)
+            task_ids = list(uids)
+            domain = [('task_id', 'in', task_ids)]
+
+            resource = self.env['project.task.resource.link'].sudo().search(domain)
+
+
+            for val in resource:
+                pre_params = {
+                    "task_id": val.task_id.id,
+                    "res_name": val.resource_id.name
+                }
+                resource_list.append(pre_params)
+        return resource_list
+
+    def get_predecessor(self, tasks, screen=False):
+        predecessors_list = []
+        if screen and self.pre_json:
+            pre_data = json.loads(self.pre_json)
+            pre_params = {
+                "task_id": 0,
+                "parent_task_id": 0,
+                "type": None
+            }
+
+            for val in pre_data:
+
+                for k, v in pre_params.items():
+                    if k not in val:
+                        val[k] = v
+
+            return pre_data
+
+
+        else:
+            uids = map(lambda x: x["id"], tasks)
+            task_ids = list(uids)
+            domain = [('task_id', 'in', task_ids)]
+
+            predecessors = self.env['project.task.predecessor'].sudo().search(domain)
+
+
+            for val in predecessors:
+                pre_params = {
+                    "task_id": val.task_id.id,
+                    "parent_task_id": val.parent_task_id.id,
+                    "type": val.type
+                }
+                predecessors_list.append(pre_params)
+        return predecessors_list
+
+    def get_source(self, screen=False):
+
+        prj_params = {
+            "id": 0,
+            "name": "name",
+            "duration": None,
+            "date_start": None,
+            "date_end": None,
+            "sorting_level": 0,
+            "subtask_count": 1,
+            "wbs": None,
+            "stuff": "",
+            "separate": True,
+            "color_gantt": None
+        }
+
+
+        if screen:
+
+            data_json = json.loads(self.data_json)
+
+            for val in data_json:
+
+                for k, v in prj_params.items():
+                    if k not in val:
+                        val[k] = v
+
+
+                val["date_start"] = self.convert_datetime(val["date_start"])
+                val["date_end"] = self.convert_datetime(val["date_end"])
+
+            return data_json
+
+
+        else:
+            # Task List
+            project_id = self.project_id.id
+
+            domain = [('project_id', '=', project_id), '|', ('active', '=', True), ('active', '=', False)]
+
+            self.env['project.task'].do_sorting(project_id)
+            arch_tasks = self.env['project.task'].sudo().search(domain)
+            tasks_data = arch_tasks.sorted(key=lambda x: x.sorting_seq)
+            tasks_list_len = len(tasks_data)
+            tasks_list = []
+
+            prj_params = {
+                "id": project_id * -1,# Negative value for project
+                "name": self.project_id.name,
+                "duration": None,
+                "date_start": None,
+                "date_end": None,
+                "sorting_level": 0,
+                "subtask_count": 1,
+                "wbs": None,
+                "stuff": "",
+                "separate": True,
+                "color_gantt": None
+            }
+
+            tasks_list.append(prj_params)
+
+            for val in tasks_data:
+
+                params = self.record_params(val)
+
+                if val.plan_action:
+                    params["stuff"] = "!"
+
+                tasks_list.append(params)
+
+            return tasks_list
+
+
+    def header_draw(self, ctx, plot_param):
+
+        first_header = "month"
+        second_header = "day"
+        first_header_count = 0
+
+
+        if plot_param["scale"] == "year_week":
+            first_header = "year"
+            second_header = "week"
+
+        elif plot_param["scale"] == "year_month":
+            first_header = "year"
+            second_header = "month"
+
+
+        elif plot_param["scale"] == "month_day":
+            first_header = "month"
+            second_header = "day"
+
+
+        elif plot_param["scale"] == "day_8hour":
+            first_header = "day"
+            second_header = "8hour"
+
+
+        elif plot_param["scale"] == "day_4hour":
+            first_header = "day"
+            second_header = "4hour"
+
+
+        elif plot_param["scale"] == "day_2hour":
+            first_header = "day"
+            second_header = "2hour"
+
+        elif plot_param["scale"] == "day_1hour":
+            first_header = "day"
+            second_header = "1hour"
+
+
+        next_cell = plot_param["item_width"]
+
+        f_header = False
+        plot_first_header = True
+
+        for dt in self.daterange(plot_param["date_start"], plot_param["date_end"], second_header):
+
+
+            ctx.set_source_rgba(0, 0, 0, 0.5)
+            f_header_compare = False
+
+            if first_header == "day":
+                f_header_compare = "{}".format(dt.strftime("%a %b %d - %Y"))
+
+            elif first_header == "year":
+                f_header_compare = "{}".format(dt.strftime("%Y"))
+
+            elif first_header == "month":
+                f_header_compare = "{}".format(dt.strftime("%b - %Y"))
+
+
+            if f_header_compare and f_header != f_header_compare:
+                f_header = f_header_compare
+                plot_first_header = True
+
+            if plot_first_header:
+                ctx.move_to(next_cell, plot_param["margin_top"] - 28)
+                ctx.line_to(next_cell, plot_param["margin_top"] + plot_param["plot_height"])
+
+                ctx.move_to(next_cell + 4, plot_param["margin_top"] - 18)
+                ctx.set_font_size(10)
+                ctx.show_text(f_header)
+
+                plot_first_header = False
+
+
+            ctx.set_source_rgba(0, 0, 0, 0.5)
+            ctx.set_font_size(10)
+
+            draw_text = ""
+
+            if second_header == "week":
+                draw_text = "{}".format(dt.strftime("%W"))
+
+            elif second_header == "month":
+                draw_text = "{}".format(dt.strftime("%b"))
+
+            elif second_header == "day":
+                draw_text = "{}".format(dt.strftime("%d"))
+
+            elif second_header == "8hour":
+                draw_text = "{}".format(dt.strftime("%H:%M"))
+            elif second_header == "4hour":
+                draw_text = "{}".format(dt.strftime("%H:%M"))
+            elif second_header == "2hour":
+                draw_text = "{}".format(dt.strftime("%H:%M"))
+            elif second_header == "1hour":
+                draw_text = "{}".format(dt.strftime("%H:%M"))
+
+            ctx.move_to(next_cell + 4, plot_param["margin_top"] - 4)
+            ctx.show_text(draw_text)
+            ctx.move_to(next_cell, plot_param["margin_top"] - 14)
+
+            ctx.line_to(next_cell, plot_param["margin_top"] + plot_param["plot_height"])
+
+            ctx.stroke()
+
+            if dt.isoweekday() in [6, 7]:
+                ctx.set_source_rgba(0, 0, 0, 0.05)
+                ctx.rectangle(next_cell, plot_param["margin_top"] - 14, plot_param["cell_scale"], plot_param["plot_height"] + 14)
+                ctx.fill()
+                ctx.stroke()
+
+
+            next_cell = next_cell + plot_param["cell_scale"]
+            # ctx.move_to(next_cell + 4, plot_param["margin_top"] - 4)
+
+
+
+        ctx.set_source_rgba(0, 0, 0, 0.5)
+        ctx.stroke()
+
+        next_cell = plot_param["item_width"]
+
+        # Header horizontal line
+        ctx.set_line_width(0.5)
+        ctx.move_to(next_cell, plot_param["margin_top"] - 14)
+        ctx.line_to(next_cell + plot_param["timeline_width"], plot_param["margin_top"] - 14)
+
+        ctx.move_to(next_cell, plot_param["margin_top"] - 28)
+        ctx.line_to(next_cell + plot_param["timeline_width"], plot_param["margin_top"] - 28)
+        ctx.stroke()
+
+        #####
+        next_cell = plot_param["item_width"]
+        ctx.move_to(next_cell, plot_param["margin_top"] - 28)
+        ctx.line_to(next_cell, plot_param["margin_top"])
+        ctx.move_to(next_cell + 4, plot_param["margin_top"] - 18)
+
+    def bar_draw(self, ctx, tasks_list, plot_param, resource_list):
+
+        step_left = plot_param["item_width"]
+        step_top = plot_param["margin_top"]
+        ctx.set_line_width(0.5)
+        bar_height = 12
+
+        for numbar, task_bar in enumerate(tasks_list):
+
+            if task_bar["date_start"] and task_bar["date_end"]:
+
+                task_start_time = task_bar["date_start"].timestamp()
+                task_stop_time = task_bar["date_end"].timestamp()
+
+                if task_stop_time >= task_start_time:
+
+                    task_start_pxscale = round( (task_start_time - plot_param["first_day_scale"]) / plot_param["px_scale"])
+                    task_stop_pxscale = round( (task_stop_time - plot_param["first_day_scale"]) / plot_param["px_scale"])
+
+                    if task_start_pxscale == task_stop_pxscale:
+                        task_stop_pxscale = task_stop_pxscale+1
+
+                    bar_left = task_start_pxscale + plot_param["item_width"]
+                    bar_width = task_stop_pxscale - task_start_pxscale
+
+
+                    color_bar_gen = [210/100, 105/100, 30/100, 0.5] #210,105,30  112,128,144
+                    if task_bar["color_gantt"]:
+                        rgba = task_bar["color_gantt"].replace("rgba(", "")
+                        rgba = rgba.replace(")", "")
+                        rgba = rgba.split(",")
+                        color_bar_gen = [float(rgba[0])/100, float(rgba[1])/100, float(rgba[2])/100, 0.5]
+
+                    if task_bar["subtask_count"]:
+                        color_bar_gen = [0.5, 0.5, 0.5, 0.25]
+
+                    ctx.set_source_rgba(*color_bar_gen)
+
+                    x = bar_left
+                    y = plot_param["margin_top"] + (numbar*plot_param["element_height"])
+                    width = bar_width
+                    height = bar_height
+
+                    element = {
+                        'task_id': task_bar["id"],
+                        'x': x,
+                        'y': y,
+                        'width': width,
+                        'height': height}
+
+
+                    # bar
+                    ctx.rectangle(x, y, width, height)
+                    ctx.fill()
+
+                    # bar border
+                    ctx.rectangle(x, y, width, height)
+                    ctx.set_source_rgba(0.5, 0.5, 0.5, 0.35)
+                    ctx.set_line_width(1)
+                    ctx.stroke()
+
+                    task_bar["bar_elemnt"] = element
+                    task_bar["bar_left"] = bar_left
+                    task_bar["bar_width"] = bar_width
+
+
+                    ctx.set_source_rgba(0.5, 0.5, 0.5, 0.80)
+                    ctx.move_to(bar_left, plot_param["margin_top"] + (numbar*plot_param["element_height"]) + bar_height-3)
+                    ctx.set_font_size(9)
+
+                    bar_text = "{}".format(task_bar["name"])
+
+                    resource_toprint = list(filter(lambda x: x["task_id"] == task_bar["id"], resource_list))
+                    if resource_toprint:
+                        res_text = ', '.join(str(x["res_name"]) for x in resource_toprint)
+                        bar_text = "{} - res: {}".format(bar_text, res_text)
+
+                    # bar_text_width = self.textwidth(ctx, bar_text)
+
+                    # if bar_text_width > bar_width:
+                    #
+                    #     bar_teext_len = len(bar_text)
+                    #     gg= ((bar_width - 10) * bar_teext_len) / bar_text_width
+                    #     bar_text = bar_text[:int(round(gg))]
+
+                    ctx.show_text(bar_text)
+
+                    # Color for next step
+                    ctx.set_source_rgba(0.2, 0.15, 0.07, 1)
+
+
+        ctx.stroke()
+
+    def arrow_step(self, bar_from, bar_to, arrow_type):
+
+        step = [None, None]
+        from_x = bar_from["x"]
+        to_x = bar_to["x"]
+
+        if arrow_type == "FF":
+            from_x = bar_from["x"] + bar_from["width"]
+            to_x = bar_to["x"] + bar_to["width"]
+
+        if arrow_type == "SF":
+            to_x = bar_to["x"] + bar_to["width"]
+
+        if arrow_type == "FS":
+            from_x = bar_from["x"] + bar_from["width"]
+
+        if bar_to["y"] < bar_from["y"]:
+            #go up
+            if to_x - from_x > 15:
+                #go right
+                if arrow_type == "SS":
+                    step = ["up_", "right>"]
+                if arrow_type == "SF":
+                    step = ["up", "right", "up_", "left<"]
+                if arrow_type == "FS":
+                    step = ["up_", "right>"]
+            else:
+                #go left
+                if arrow_type == "SS":
+                    step = ["up", "left", "up_", "right>"]
+                if arrow_type == "SF":
+                    step = ["up_", "left<"]
+                if arrow_type == "FS":
+                    step = ["up", "left", "up_", "right>"]
+
+            if arrow_type == "FF":
+                step = ["up_", "left<"]
+                if to_x > from_x:
+                    step = ["up", "right", "up_", "left<"]
+
+
+        if bar_to["y"] > bar_from["y"]:
+            #go down
+                if to_x - from_x > 15:
+                    #go right
+                    if arrow_type == "SS":
+                        step = ["down_", "right>"]
+
+                    if arrow_type == "SF":
+                        step = ["down", "right", "down_", "left<"]
+
+                    if arrow_type == "FS":
+                        step = ["down_", "right>"]
+                    if arrow_type == "FF":
+                        step = ["down", "right", "down_", "left<"]
+
+                else:
+                    #go left
+                    if arrow_type == "SS":
+                        step = ["down", "left", "down_", "right>"]
+
+                    if arrow_type == "SF":
+                        step = ["down_", "left<"]
+
+                    if arrow_type == "FS":
+                        step = ["down", "left","down_", "right>"]
+
+                    if arrow_type == "FF":
+                        step = ["down_", "left<"]
+                        if to_x >= from_x:
+                            step = ["down", "right", "down_", "left<"]
+
+        return step
+
+
+    def arrow_draw(self, ctx, tasks_list, predecessor_list, plot_param):
+
+        for predecessor in predecessor_list:
+            to_task = predecessor["task_id"]
+            from_task = predecessor["parent_task_id"]
+
+            from_obj_list = list(filter(lambda x: x["id"] == from_task, tasks_list))
+            to_obj_list = list(filter(lambda x: x["id"] == to_task, tasks_list))
+
+            type_direction = predecessor["type"]
+
+            ctx.set_dash([])
+            ctx.set_line_width(0.8)
+
+            if from_obj_list and to_obj_list:
+
+                from_obj = from_obj_list[0]
+                to_obj = to_obj_list[0]
+
+
+                from_x = from_obj["bar_elemnt"]["x"]
+                from_width = from_obj["bar_elemnt"]["width"]
+                from_y = from_obj["bar_elemnt"]["y"]
+
+                to_x = to_obj["bar_elemnt"]["x"]
+                to_width = to_obj["bar_elemnt"]["width"]
+                to_y = to_obj["bar_elemnt"]["y"]+6
+
+                #start and end point
+
+                if type_direction == "FF":
+                    from_x = from_x + from_width + 5
+                    to_x = to_x + to_width + 10
+
+                if type_direction == "SF":
+                    from_x = from_x - 5
+                    to_x = to_x + to_width + 10
+
+                if type_direction == "FS":
+                    from_x = from_x + from_width + 5
+                    to_x = to_x - 10
+
+                if type_direction == "SS":
+                    to_x = to_x - 10
+                    from_x = from_x - 5
+
+                # start from middle bar
+                step_x = from_x
+                step_y = from_y + 6
+                ctx.move_to(step_x, step_y)
+
+                ctx.arc(step_x, step_y, 1, 0, 2 * 3.14)
+
+                ctx.move_to(step_x, step_y)
+
+                steps = self.arrow_step(from_obj["bar_elemnt"], to_obj["bar_elemnt"], predecessor["type"] )
+                for step in steps:
+                    if step == "up":
+                        step_y = step_y-10
+                        ctx.line_to(step_x, step_y)
+
+                    if step == "up_":
+                        ctx.line_to(step_x, to_y)
+
+                    if step == "left":
+                        step_x = to_x-10
+                        ctx.line_to(step_x, step_y)
+
+                    if step == "right":
+                        step_x = to_x+10
+                        ctx.line_to(step_x, step_y)
+
+                    if step == "right>":
+                        ctx.line_to(to_x, to_y)
+                        self.arrow_right(ctx, to_x, to_y-1.5, 3, 3, 2, 2)
+
+                    if step == "left<":
+                        ctx.line_to(to_x, to_y)
+                        self.arrow_left(ctx, to_x, to_y-1.5, 3, 3, 2, 2)
+
+                    if step == "down":
+                        step_y = step_y+10
+                        ctx.line_to(step_x, step_y)
+
+                    if step == "down_":
+                        ctx.line_to(step_x, to_y)
+
+            ctx.stroke()
+
+    def arrow_right(self, ctx, x, y, width, height, a, b):
+        ctx.move_to(x, y + b)
+        ctx.line_to(x, y + height - b)
+        ctx.line_to(x + a, y + height - b)
+        ctx.line_to(x + a, y + height)
+        ctx.line_to(x + width, y + height/2)
+        ctx.line_to(x + a, y)
+        ctx.line_to(x + a, y + b)
+        ctx.close_path()
+
+    def arrow_left(self, ctx, x, y, width, height, a, b):
+        ctx.move_to(x, y + b)
+        ctx.line_to(x, y + height - b)
+        ctx.line_to(x - a, y + height - b)
+        ctx.line_to(x - a, y + height)
+        ctx.line_to(x - width, y + height/2)
+        ctx.line_to(x - a, y)
+        ctx.line_to(x - a, y + b)
+        ctx.close_path()
+
+
+    # @api.multi
+    def action_report(self):
+
+        allow = self.env['res.users'].has_group('project_native_report_advance.group_project_native_pdf_export')
+
+        if allow:
+            # SOURCE
+
+            tasks_list = self.get_source(self.screen)
+            predecessor_list = self.get_predecessor(tasks_list, self.screen)
+            resource_list = self.get_resource(tasks_list, self.screen)
+
+            tasks_list_len = len(tasks_list)
+            custom_fields = ["date_start", "date_end"]
+
+            scale = "month_day"
+            cell_scale = 20
+
+            if self.report_scale == "day_1hour":
+                scale = "day_1hour"
+                cell_scale = 40
+
+            elif self.report_scale == "day_2hour":
+                scale = "day_2hour"
+                cell_scale = 40
+
+            elif self.report_scale == "day_4hour":
+                scale = "day_4hour"
+                cell_scale = 40
+
+            elif self.report_scale == "day_8hour":
+                scale = "day_8hour"
+                cell_scale = 40
+
+            elif self.report_scale == "year_month":
+                scale = "year_month"
+                cell_scale = 40
+
+            elif self.report_scale == "year_week":
+                scale = "year_week"
+                cell_scale = 40
+
+            elif self.report_scale == "year_month":
+                scale = "year_month"
+                cell_scale = 40
+
+            elif self.report_scale == "year_quarter":
+                scale = "year_quarter"
+                cell_scale = 40
+
+            plot_param = {
+                "font_face": "Liberation Sans",
+                "margin_left": 20,
+                "margin_right": 20,
+                "margin_buttom": 20,
+                "margin_top": 10,
+                "element_height": 20,
+                "cell_scale": cell_scale,
+                "line_width": 1,
+                "head_height": 50,
+                "tasks_list_len": tasks_list_len,
+                "scale": scale,
+                "custom_fields": custom_fields
+
+            }
+
+            plot_param["margin_top"] = plot_param["head_height"] + plot_param["margin_top"]
+
+            # min max date
+            date_start, date_end = self.min_max_range(tasks_list)
+
+            if date_start and date_end:
+
+                plot_param["date_start"] = date_start
+                plot_param["date_end"] = date_end
+
+                # scale for time
+                first_day_scale, px_scale, timeline_width, = self.get_scale(date_start, date_end, plot_param)
+                plot_param["first_day_scale"] = first_day_scale
+                plot_param["px_scale"] = px_scale
+                plot_param["timeline_width"] = timeline_width
+
+                # total height
+                plot_param["plot_height"] = tasks_list_len * plot_param["element_height"]
+                plot_param["surface_height"] = plot_param["plot_height"] + plot_param["margin_top"] + plot_param[
+                    "margin_buttom"]
+
+                plot_param["date_start"] = date_start
+                plot_param["date_end"] = date_end
+                plot_param["first_day_scale"] = first_day_scale
+                plot_param["px_scale"] = px_scale
+                plot_param["timeline_width"] = timeline_width
+
+                # items width with fake CTX
+                plot_param["item_width"] = self.item_size(tasks_list, plot_param)
+
+                # Real Size
+                plot_param["plot_width"] = plot_param["item_width"] + plot_param["timeline_width"]
+                plot_param["surface_width"] = plot_param["margin_left"] + plot_param["plot_width"] + plot_param[
+                    "margin_right"]
+
+                # Generate CTX
+                buffered = BytesIO()
+
+                report_surface = cairo.PDFSurface(buffered, plot_param["surface_width"], plot_param["surface_height"])
+                ctx = cairo.Context(report_surface)
+
+                # svg = cairo.SVGSurface(buffered, plot_param["surface_width"], plot_param["surface_height"])
+                # ctx = cairo.Context(svg)
+
+                self.rectangle_draw(ctx, plot_param["line_width"],
+                                    plot_param["margin_left"],
+                                    plot_param["margin_top"],
+                                    plot_param["plot_width"],
+                                    plot_param["plot_height"])
+
+                ctx.stroke()
+
+                # ITEMS DRAW
+                self.item_draw(ctx, tasks_list, plot_param)
+
+                # HEADER DRAW
+                self.header_draw(ctx, plot_param)
+
+                # BAR DRAW
+                self.bar_draw(ctx, tasks_list, plot_param, resource_list)
+
+                # Arrows DRAW
+                self.arrow_draw(ctx, tasks_list, predecessor_list, plot_param)
+
+
+
+
+
+                report_surface.finish()
+                img_str = base64.b64encode(buffered.getvalue())
+
+                if img_str:
+                    self.write({
+                        'file_save': img_str,
+                    })
+
+            else:
+                self.write({
+                    'name': "Error: imposbile PDF",
+                })
+
+        else:
+            raise UserError(_("You can't export pdf. Ask manager for permission."))
+
+
+
+
+        # return {
+        #     'type': 'ir.actions.act_window',
+        #     'res_model': self._name,
+        #     'view_mode': 'form',
+        #     'target': 'self',
+        #     'res_id': self.id,
+        # }
+
+
+
diff --git a/odex25_project/project_native_report_advance/wizard/project_native_pdf_view.xml b/odex25_project/project_native_report_advance/wizard/project_native_pdf_view.xml
new file mode 100644
index 000000000..77c579177
--- /dev/null
+++ b/odex25_project/project_native_report_advance/wizard/project_native_pdf_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<odoo>
+	<record id="project_native_report_form" model="ir.ui.view">
+		<field name="name">project.native.report.form</field>
+		<field name="model">project.native.report</field>
+		<field name="arch" type="xml">
+			<form string="Export xml">
+				<sheet>
+					<group>
+
+						<group>
+							<field name="screen" invisible="1"/>
+
+							<field name="project_id" attrs="{'invisible': [('screen', '=', True)]}"/>
+
+							<field name="name"/>
+							<field name="file_save" filename="name"/>
+							<field name="report_scale"/>
+						</group>
+					</group>
+				</sheet>
+
+				<footer>
+					<button string="Generate report file" type="object" name="action_report" class="oe_highlight"/>
+
+				</footer>
+
+			</form>
+		</field>
+	</record>
+
+</odoo>
diff --git a/odex25_project/project_risk_register/__init__.py b/odex25_project/project_risk_register/__init__.py
new file mode 100644
index 000000000..601ffa6a9
--- /dev/null
+++ b/odex25_project/project_risk_register/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models
+
diff --git a/odex25_project/project_risk_register/__manifest__.py b/odex25_project/project_risk_register/__manifest__.py
new file mode 100644
index 000000000..4b45b5184
--- /dev/null
+++ b/odex25_project/project_risk_register/__manifest__.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Project Risk Register",
+    'summary': """Project Risk Register""",
+    'description': """
+Add Risk Register Log in your Projects
+    """,
+    'category': 'Odex25-Project/Odex25-Project',
+    'version': '1.0',
+    'depends': ['project_base'],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/project_views.xml',
+    ],
+}
diff --git a/odex25_project/project_risk_register/i18n/ar_001.po b/odex25_project/project_risk_register/i18n/ar_001.po
new file mode 100644
index 000000000..a0e9fdc53
--- /dev/null
+++ b/odex25_project/project_risk_register/i18n/ar_001.po
@@ -0,0 +1,152 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project_risk_register
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-05-12 12:17+0000\n"
+"PO-Revision-Date: 2024-05-12 12:17+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__action
+msgid "Action(s)"
+msgstr "الاجراء"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__plan
+msgid "Contingency Plan"
+msgstr "خطة الطوارئ"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__name
+msgid "Description"
+msgstr "وصف"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: project_risk_register
+#: model:ir.model.fields.selection,name:project_risk_register.selection__project_risk_register__source__external
+msgid "External"
+msgstr "خارجي"
+
+#. module: project_risk_register
+#: model:ir.model.fields.selection,name:project_risk_register.selection__project_risk_register__impact__high
+msgid "High"
+msgstr "عالي"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__id
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__risk_id
+msgid "ID"
+msgstr "الرقم"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__impact
+msgid "Impact of the risk"
+msgstr "الاثر"
+
+#. module: project_risk_register
+#: model:ir.model.fields.selection,name:project_risk_register.selection__project_risk_register__source__internal
+msgid "Internal"
+msgstr "داخلي"
+
+#. module: project_risk_register
+#: model:ir.model.fields.selection,name:project_risk_register.selection__project_risk_register__type__issue
+msgid "Issue"
+msgstr "مشكلة"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__lock
+msgid "Lock"
+msgstr ""
+
+#. module: project_risk_register
+#: model:ir.model.fields.selection,name:project_risk_register.selection__project_risk_register__impact__low
+msgid "Low"
+msgstr "منخفض"
+
+#. module: project_risk_register
+#: model:ir.model.fields.selection,name:project_risk_register.selection__project_risk_register__impact__medium
+msgid "Medium"
+msgstr "متوسط"
+
+#. module: project_risk_register
+#: model:ir.model,name:project_risk_register.model_project_project
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__responsible_id
+msgid "Responsible"
+msgstr "المسؤول"
+
+#. module: project_risk_register
+#: model:ir.model.fields.selection,name:project_risk_register.selection__project_risk_register__type__risk
+msgid "Risk"
+msgstr "خطر"
+
+#. module: project_risk_register
+#: model_terms:ir.ui.view,arch_db:project_risk_register.view_edit_project_inherit_form
+msgid "Risk Register"
+msgstr "المخاطر"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_project__risk_register_id
+msgid "Risk register"
+msgstr "المخاطر"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__source
+msgid "Source"
+msgstr "المصدر"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__type
+msgid "Type"
+msgstr "النوع"
+
+#. module: project_risk_register
+#: model:ir.model.fields,field_description:project_risk_register.field_project_risk_register__project_id
+msgid "project"
+msgstr "المشروع"
+
+#. module: project_risk_register
+#: model:ir.model,name:project_risk_register.model_project_risk_register
+msgid "project.risk.register"
+msgstr ""
diff --git a/odex25_project/project_risk_register/models/__init__.py b/odex25_project/project_risk_register/models/__init__.py
new file mode 100644
index 000000000..a0097b786
--- /dev/null
+++ b/odex25_project/project_risk_register/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import project
diff --git a/odex25_project/project_risk_register/models/project.py b/odex25_project/project_risk_register/models/project.py
new file mode 100644
index 000000000..3ccab887a
--- /dev/null
+++ b/odex25_project/project_risk_register/models/project.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    risk_register_id = fields.One2many('project.risk.register', 'project_id', string="Risk register")
+
+class ProjectRiskRegister(models.Model):
+    _name = "project.risk.register"
+
+    name = fields.Char(string="Description")
+    risk_id = fields.Char(string="ID")
+    action = fields.Char(string="Action(s)")
+    project_id = fields.Many2one('project.project', string="project")
+    source = fields.Selection([
+        ('internal', 'Internal'),
+        ('external', 'External')], string='Source', copy=False)
+    type = fields.Selection([
+        ('risk', 'Risk'),
+        ('issue', 'Issue')], string='Type', copy=False)
+    impact = fields.Selection([
+        ('high', 'High'),
+        ('medium', 'Medium'),
+        ('low', 'Low')], string='Impact of the risk', copy=False)
+    responsible_id = fields.Char(string="Responsible", copy=False)
+    plan = fields.Text(string="Contingency Plan")
+    lock = fields.Boolean('Lock')
+
+    def do_lock(self):
+        return self.write({'lock': True})
+
+    def do_unlock(self):
+        return self.write({'lock': False})
+
+
diff --git a/odex25_project/project_risk_register/security/ir.model.access.csv b/odex25_project/project_risk_register/security/ir.model.access.csv
new file mode 100644
index 000000000..2437d3b32
--- /dev/null
+++ b/odex25_project/project_risk_register/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_risk_register,project.risk.register,model_project_risk_register,,1,1,1,1
diff --git a/odex25_project/project_risk_register/views/project_views.xml b/odex25_project/project_risk_register/views/project_views.xml
new file mode 100644
index 000000000..e19541ac8
--- /dev/null
+++ b/odex25_project/project_risk_register/views/project_views.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+
+    <!-- Project Project -->
+    <record id="view_edit_project_inherit_form" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='settings']" position="before">
+                <page name="risk" string="Risk Register">
+                    <group>
+                        <field name="risk_register_id" nolabel="1">
+                            <tree editable="top" order="risk_id" decoration-warning="impact in ('medium')" decoration-info="impact in ('low')" decoration-danger="impact in ('high')" >
+                                <field name="risk_id" attrs="{'readonly':[('lock','=',True)],'required':True}"/>
+                                <field name="name" attrs="{'readonly':[('lock','=',True)],'required':True}"/>
+                                <field name="source" attrs="{'readonly':[('lock','=',True)],'required':True}"/>
+                                <field name="type" attrs="{'readonly':[('lock','=',True)],'required':True}"/>
+                                <field name="responsible_id" attrs="{'readonly':[('lock','=',True)],'required':True}"/>
+                                <field name="plan" attrs="{'readonly':[('lock','=',True)],'required':True}"/>
+                                <field name="action" attrs="{'readonly':[('lock','=',True)],'required':True}"/>
+                                <field name="impact" attrs="{'readonly':[('lock','=',True)],'required':True}"/>
+                                <field name="lock" invisible="1"/>
+                            </tree>
+                        </field>
+                    </group>
+                </page>
+            </xpath>
+                
+        </field>
+    </record>
+
+  
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/LICENSE/LICENSE b/odex25_project/project_scrum_agile/LICENSE/LICENSE
new file mode 100644
index 000000000..5a62efca0
--- /dev/null
+++ b/odex25_project/project_scrum_agile/LICENSE/LICENSE
@@ -0,0 +1,166 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2021-TODAY Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/odex25_project/project_scrum_agile/README.rst b/odex25_project/project_scrum_agile/README.rst
new file mode 100644
index 000000000..baf10ca2d
--- /dev/null
+++ b/odex25_project/project_scrum_agile/README.rst
@@ -0,0 +1,97 @@
+==========================================
+Project Scrum Management Agile Methodology
+==========================================
+
+This application respects the scrum.org protocol and has been developed and 
+is maintained by ITIL Certified Member (in course of certification)
+
+=========
+Features
+=========
+
+- Project roles
+    - Scrum Master
+    - Product Owner
+    - Development Team
+    
+- Sprint Releases
+
+- Sprints
+    - date_start and date_stop
+    - Standup meetings for each user of team
+    - Sprint review
+    - Sprint retrospective
+    - Planned velocity (you write velocity desired and displayed on Sprint Velocity Chart)
+    - Effective velocity (it is computed by all users stories affected to the sprint)
+    - Effective velocity done (it is computed by all users stories done and displayed on Sprint Velocity Chart)
+
+- Product Backlog (users stories)
+    - New kanban view
+    - Date_open and date_done
+    - Story complexity points
+    - Text area for describe tests acceptance
+    
+- Display charts
+    -Burdown Chart (based on story points)
+    - Sprints Velocity (for each Scrum project)
+    - BurnDown Charts - Bar Chart, Line Chart, Pie Chart
+    
+- Sandbox
+    - A developer of development team can add a user story to sandbox
+    - The product owner can valid it (transfer into product backlog) or delete it
+    
+- Scrum
+    - Product Backlog
+    - Sandbox
+    - Sprints
+    - Sprint Releases
+    - Scrum Meeting
+
+- Daily Scrum Meeting
+    - Meeting Creation
+    - Rescheduling
+    - Email Generation
+
+============
+Similar Apps
+============
+
+Project Scrum Management Agile Methodology
+agile project management using scrum
+scrum agile project management methodology
+scrum program management
+scrum project methodology
+scrum software open source
+scrum project management methodology
+agile project management with scrum
+project scrum portal agile methodology
+Agile Project Management Software
+Agile project management with Scrum
+Agile Project Management and Scrum
+Agile Project Management
+project scrum portal agile office
+project scrum portal agile online
+project scrum portal agile payroll
+project scrum portal agile software
+project scrum portal agile solutions
+project scrum portal agile training
+Project Scrum Management Agile Methodology
+Project Scrum Management
+Project Agile Scrum
+scrum in software project management
+Project Management
+Scrum management
+Agile Management
+project agile
+odoo scrum
+Scrum Project
+odoo Project management
+Project scrum management
+odoo management project 
+scrum portal
+odoo scrum agile
+Scrum methodology
+Odoo Scrum
+Odoo Agile
+Agile
+scrum
diff --git a/odex25_project/project_scrum_agile/__init__.py b/odex25_project/project_scrum_agile/__init__.py
new file mode 100644
index 000000000..8f000ebe5
--- /dev/null
+++ b/odex25_project/project_scrum_agile/__init__.py
@@ -0,0 +1,4 @@
+# See LICENSE file for full copyright and licensing details.
+
+from . import models
+from . import wizards
diff --git a/odex25_project/project_scrum_agile/__manifest__.py b/odex25_project/project_scrum_agile/__manifest__.py
new file mode 100644
index 000000000..b2a36f973
--- /dev/null
+++ b/odex25_project/project_scrum_agile/__manifest__.py
@@ -0,0 +1,105 @@
+# See LICENSE file for full copyright and licensing details.
+{
+    # Module Info.
+    'name': 'Project Scrum Management Agile Methodology',
+    'version': '14.0.1.0.0',
+    'license': 'LGPL-3',
+    'category': 'Odex25-Project/Odex25-Project',
+    'summary': '''
+        This application respects the scrum.org protocol
+        and has been developed and is maintained by ITIL Certified Member
+        (in course of certification).
+        ''',
+    'description': """This application respects the scrum.org protocol
+        and has been developed and is maintained by ITIL Certified Member
+        (in course of certification)
+        Project Scrum Portal Agile
+        agile project management using scrum
+		scrum agile project management methodology
+		scrum program management
+		scrum project methodology
+		scrum software open source
+		scrum project management methodology
+		agile project management with scrum
+		project scrum portal agile methodology
+		Agile Project Management Software
+		Agile project management with Scrum
+		Agile Project Management and Scrum
+		Agile Project Management
+		project scrum portal agile office
+		project scrum portal agile online
+		project scrum portal agile payroll
+		project scrum portal agile software
+		project scrum portal agile solutions
+		Project Scrum Management Agile Methodology
+		Project Scrum Management
+		Project Agile Scrum
+		scrum task management
+		scrum management system
+		scrum management software
+		scrum project management software
+		scrum project management
+		Project Scrum Management
+		project scrum portal agile development
+		project scrum portal agile online
+		Project Scrum Portal
+		Scrum management portal
+		Agile Management portal
+		project agile
+		odoo scrum portal
+		Scrum Project
+		odoo Project management
+		Project scrum management
+		Agile
+		odoo portal project management
+		scrum portal
+		odoo scrum agile
+		odoo user account
+		Scrum methodology
+		scrum
+		""",
+		
+		
+     # Author
+    'author': 'Serpent Consulting Services Pvt. Ltd.,David DRAPEAU',
+    "website": "http://www.serpentcs.com",
+    "maintainer": "Serpent Consulting Services Pvt. Ltd.",
+    
+    		
+    # Dependencies
+    'depends': [
+        'sale_timesheet',
+        'calendar',
+    ],
+    
+    # Data
+    'data': [
+        'security/project_scrum_security.xml',
+        'security/ir.model.access.csv',
+        'views/email_template.xml',
+        'views/hr_employee_view.xml',
+        'views/project_scrum_view.xml',
+        'views/account_analytic_line_view.xml',
+        'views/project_scrum_release_view.xml',
+        'views/project_view.xml',
+        'wizards/user_story_sandbox_to_backlog_view.xml',
+        'wizards/project_scrum_backlog_create_task_view.xml',
+        'views/project_scrum_sandbox_view.xml',
+        'views/project_scrum_role_view.xml',
+        'wizards/project_scrum_email_view.xml',
+        'wizards/analytic_timesheet_view.xml',
+        'views/project_scrum_devteam_view.xml',
+    ],
+    'demo': ['data/project_scrum_extended_data.xml'],
+    
+    # Odoo App Store Specific
+    'images': ['static/description/Project-Scrum-Management-Agile-banner.png'],
+    'live_test_url': 'https://www.youtube.com/watch?v=5Za9ShZfa5s',
+    
+    # Technical
+    'installable': True,
+    'application': True,
+    'sequence': 1,
+    'price': 145,
+    'currency': 'EUR',
+}
diff --git a/odex25_project/project_scrum_agile/data/project_scrum_extended_data.xml b/odex25_project/project_scrum_agile/data/project_scrum_extended_data.xml
new file mode 100644
index 000000000..0fd20d2e7
--- /dev/null
+++ b/odex25_project/project_scrum_agile/data/project_scrum_extended_data.xml
@@ -0,0 +1,321 @@
+<odoo>
+
+    <data noupdate="1">
+        <record id="project_tt_analysis" model="project.task.type">
+            <field name="sequence">1</field>
+            <field name="name">Analysis</field>
+            <field name="default_view">True</field>
+            <field name="state">analysis</field>
+        </record>
+        <record id="project_tt_specification" model="project.task.type">
+            <field name="sequence">2</field>
+            <field name="name">Specification</field>
+            <field name="default_view">True</field>
+            <field name="state">specification</field>
+        </record>
+        <record id="project_tt_design" model="project.task.type">
+            <field name="sequence">3</field>
+            <field name="name">Design</field>
+            <field name="default_view">True</field>
+            <field name="state">design</field>
+        </record>
+        <record id="project_tt_development" model="project.task.type">
+            <field name="sequence">4</field>
+            <field name="name">Development</field>
+            <field name="default_view">True</field>
+            <field name="state">development</field>
+        </record>
+        <record id="project_tt_testing" model="project.task.type">
+            <field name="sequence">5</field>
+            <field name="name">Testing</field>
+            <field name="default_view">True</field>
+            <field name="state">testing</field>
+        </record>
+        <record id="project.project_stage_2" model="project.task.type">
+            <field name="sequence">20</field>
+            <field name="name">Done</field>
+            <field name="fold" eval="True"/>
+            <field name="default_view">True</field>
+            <field name="state">done</field>
+        </record>
+        <record id="project.project_stage_3" model="project.task.type">
+            <field name="sequence">30</field>
+            <field name="name">Cancelled</field>
+            <field name="legend_done">Ready to reopen</field>
+            <field name="fold" eval="True"/>
+            <field name="default_view">True</field>
+            <field name="state">cancelled</field>
+        </record>
+
+        <!-- TASK -->
+        <record id="project.mt_task_new" model="mail.message.subtype">
+            <field name="name">Created Task</field>
+            <field name="res_model">project.task</field>
+            <field name="sequence">1</field>
+            <field name="default" eval="True"/>
+            <field name="description">Task Created</field>
+        </record>
+        <record id="project.mt_task_stage" model="mail.message.subtype">
+            <field name="name">Change of State Task</field>
+            <field name="res_model">project.task</field>
+            <field name="sequence">2</field>
+            <field name="default" eval="True"/>
+            <field name="description">Change of State Task</field>
+        </record>
+        <record id="mt_task_assigned" model="mail.message.subtype">
+            <field name="name">Assigned Task</field>
+            <field name="res_model">project.task</field>
+            <field name="sequence">3</field>
+            <field name="default" eval="True"/>
+            <field name="description">Assigned Task</field>
+        </record>
+        <record id="mt_task_started" model="mail.message.subtype">
+            <field name="name">Development Task</field>
+            <field name="res_model">project.task</field>
+            <field name="sequence">4</field>
+            <field name="default" eval="True"/>
+            <field name="description">Development Task</field>
+        </record>
+        <record id="project.mt_task_blocked" model="mail.message.subtype">
+            <field name="name">Blocked Task</field>
+            <field name="res_model">project.task</field>
+            <field name="sequence">5</field>
+            <field name="default" eval="True"/>
+            <field name="description">Blocked Task</field>
+        </record>
+        <record id="mt_task_closed" model="mail.message.subtype">
+            <field name="name">Closed Task</field>
+            <field name="res_model">project.task</field>
+            <field name="sequence">6</field>
+            <field name="default" eval="True"/>
+            <field name="description">Closed Task</field>
+        </record>
+
+        <record id="mt_issue_assigned" model="mail.message.subtype">
+            <field name="name">Assigned Incidence</field>
+            <field name="res_model">project.issue</field>
+            <field name="sequence">3</field>
+            <field name="default" eval="True"/>
+            <field name="description">Assigned Incidence</field>
+        </record>
+        <record id="mt_issue_started" model="mail.message.subtype">
+            <field name="name">Developmental Impact</field>
+            <field name="res_model">project.issue</field>
+            <field name="sequence">4</field>
+            <field name="default" eval="True"/>
+            <field name="description">Developmental Impact</field>
+        </record>
+        <record id="mt_issue_closed" model="mail.message.subtype">
+            <field name="name">Issue Closed</field>
+            <field name="res_model">project.issue</field>
+            <field name="sequence">6</field>
+            <field name="default" eval="True"/>
+            <field name="description">Issue Closed</field>
+        </record>
+
+        <!-- SCRUM PRODUCT BACKLOG -->
+        <record id="mt_story_new" model="mail.message.subtype">
+            <field name="name">Requirement Created</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="sequence">1</field>
+            <field name="default" eval="True"/>
+            <field name="description">Requirement Created</field>
+        </record>
+        <record id="mt_story_stage" model="mail.message.subtype">
+            <field name="name">Requirement Change of State</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="sequence">2</field>
+            <field name="default" eval="True"/>
+            <field name="description">Requirement Change of State</field>
+        </record>
+        <record id="mt_story_assigned" model="mail.message.subtype">
+            <field name="name">Assigned Requirement</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="sequence">3</field>
+            <field name="default" eval="True"/>
+            <field name="description">Assigned Requirement</field>
+        </record>
+        <record id="mt_story_started" model="mail.message.subtype">
+            <field name="name">Developmental Requirements</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="sequence">4</field>
+            <field name="default" eval="True"/>
+            <field name="description">Developmental Requirements</field>
+        </record>
+        <record id="mt_story_blocked" model="mail.message.subtype">
+            <field name="name">Blocked Requirement</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="sequence">5</field>
+            <field name="default" eval="True"/>
+            <field name="description">Blocked Requirement</field>
+        </record>
+        <record id="mt_story_closed" model="mail.message.subtype">
+            <field name="name">Requirement Closed</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="sequence">6</field>
+            <field name="default" eval="True"/>
+            <field name="description">Requirement Closed</field>
+        </record>
+        <record id="mt_requerimiento_task_new" model="mail.message.subtype">
+            <field name="name">Created Task</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">1</field>
+            <field name="parent_id" eval="ref('project.mt_task_new')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+        <record id="mt_requerimiento_task_stage" model="mail.message.subtype">
+            <field name="name">Change of State Task</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">2</field>
+            <field name="parent_id" eval="ref('project.mt_task_stage')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+        <record id="mt_requerimiento_task_assigned"
+                model="mail.message.subtype">
+            <field name="name">Assigned Task</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">3</field>
+            <field name="parent_id" eval="ref('mt_task_assigned')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+        <record id="mt_requerimiento_task_started"
+                model="mail.message.subtype">
+            <field name="name">Developmental Task</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">4</field>
+            <field name="parent_id" eval="ref('mt_task_started')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+        <record id="mt_requerimiento_task_blocked"
+                model="mail.message.subtype">
+            <field name="name">Blocked Task</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">5</field>
+            <field name="parent_id" eval="ref('project.mt_task_blocked')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+        <record id="mt_requerimiento_task_closed" model="mail.message.subtype">
+            <field name="name">Finished homework</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">6</field>
+            <field name="parent_id" eval="ref('mt_task_closed')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+        <record id="mt_backlog_assigned" model="mail.message.subtype">
+            <field name="name">Assigned Incidence</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">3</field>
+            <field name="parent_id" eval="ref('mt_issue_assigned')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+        <record id="mt_backlog_started" model="mail.message.subtype">
+            <field name="name">Incidence In Development</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">4</field>
+            <field name="parent_id" eval="ref('mt_issue_started')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+        <record id="mt_backlog_closed" model="mail.message.subtype">
+            <field name="name">Incidence Terminated</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">6</field>
+            <field name="parent_id" eval="ref('mt_issue_closed')"/>
+            <field name="relation_field">product_backlog_id</field>
+        </record>
+
+        <!-- Project-related subtypes for messaging / Chatter -->
+        <record id="mt_project_story_new" model="mail.message.subtype">
+            <field name="name">Requirement Created</field>
+            <field name="res_model">project.project</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">1</field>
+            <field name="parent_id" eval="ref('mt_story_new')"/>
+            <field name="relation_field">project_id</field>
+        </record>
+        <record id="mt_project_story_stage" model="mail.message.subtype">
+            <field name="name">Requirement Change of State</field>
+            <field name="res_model">project.project</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">2</field>
+            <field name="parent_id" eval="ref('mt_story_stage')"/>
+            <field name="relation_field">project_id</field>
+        </record>
+        <record id="mt_project_story_assigned" model="mail.message.subtype">
+            <field name="name">Assigned Requirement</field>
+            <field name="res_model">project.project</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">3</field>
+            <field name="parent_id" eval="ref('mt_story_assigned')"/>
+            <field name="relation_field">project_id</field>
+        </record>
+        <record id="mt_project_story_started" model="mail.message.subtype">
+            <field name="name">Developmental Requirements</field>
+            <field name="res_model">project.project</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">4</field>
+            <field name="parent_id" eval="ref('mt_story_started')"/>
+            <field name="relation_field">project_id</field>
+        </record>
+        <record id="mt_project_story_blocked" model="mail.message.subtype">
+            <field name="name">Blocked Requirement</field>
+            <field name="res_model">project.project</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">5</field>
+            <field name="parent_id" eval="ref('mt_story_blocked')"/>
+            <field name="relation_field">project_id</field>
+        </record>
+        <record id="mt_project_story_closed" model="mail.message.subtype">
+            <field name="name">Completed Requirement</field>
+            <field name="res_model">project.project</field>
+            <field name="default" eval="True"/>
+            <field name="sequence">6</field>
+            <field name="parent_id" eval="ref('mt_story_closed')"/>
+            <field name="relation_field">project_id</field>
+        </record>
+
+        <record id="seq_task_number" model="ir.sequence">
+            <field name="name">Task Number</field>
+            <field name="code">project.task.number</field>
+            <field name="prefix">TAR-</field>
+            <field name="padding">10</field>
+        </record>
+
+        <record id="seq_issue_number" model="ir.sequence">
+            <field name="name">Issue Number</field>
+            <field name="code">project.issue.number</field>
+            <field name="prefix">INC-</field>
+            <field name="padding">10</field>
+        </record>
+
+        <record id="seq_story_number" model="ir.sequence">
+            <field name="name">Story Number</field>
+            <field name="code">product.backlog.number</field>
+            <field name="prefix">REQ-</field>
+            <field name="padding">10</field>
+        </record>
+
+        <record id="seq_sprint_number" model="ir.sequence">
+            <field name="name">Sprint Number</field>
+            <field name="code">product.sprint.number</field>
+            <field name="prefix">SPR-</field>
+            <field name="padding">10</field>
+        </record>
+
+        <record id="seq_release_number" model="ir.sequence">
+            <field name="name">Release Number</field>
+            <field name="code">project.scrum.release</field>
+            <field name="prefix">MOD-</field>
+            <field name="padding">10</field>
+        </record>
+    </data>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/models/__init__.py b/odex25_project/project_scrum_agile/models/__init__.py
new file mode 100644
index 000000000..6e1872fc3
--- /dev/null
+++ b/odex25_project/project_scrum_agile/models/__init__.py
@@ -0,0 +1,9 @@
+# See LICENSE file for full copyright and licensing details.
+
+from . import hr_employee
+from . import project
+from . import project_scrum
+from . import project_scrum_devteam
+from . import project_scrum_release
+from . import project_scrum_role
+from . import project_scrum_sandbox
diff --git a/odex25_project/project_scrum_agile/models/hr_employee.py b/odex25_project/project_scrum_agile/models/hr_employee.py
new file mode 100644
index 000000000..4a76aea86
--- /dev/null
+++ b/odex25_project/project_scrum_agile/models/hr_employee.py
@@ -0,0 +1,11 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class HrEmployee(models.Model):
+    _inherit = "hr.employee"
+
+    product_id = fields.Many2one('product.product', 'Product')
+    journal_id = fields.Many2one('account.journal', 'Analytic Journal')
+    project_task_id = fields.Many2one('project.task', 'Task')
diff --git a/odex25_project/project_scrum_agile/models/project.py b/odex25_project/project_scrum_agile/models/project.py
new file mode 100644
index 000000000..1d067492c
--- /dev/null
+++ b/odex25_project/project_scrum_agile/models/project.py
@@ -0,0 +1,108 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class ProjectProject(models.Model):
+    _inherit = 'project.project'
+
+    def _compute_count(self):
+        product_backlog_obj = self.env['project.scrum.product.backlog']
+        sprint_obj = self.env['project.scrum.sprint']
+        release_obj = self.env['project.scrum.release']
+        for project in self:
+            domain = [('project_id', '=', project.id)]
+            project.backlog_count = product_backlog_obj.search_count(domain)
+            project.sprint_count = sprint_obj.search_count(domain)
+            project.release_count = release_obj.search_count(domain)
+
+    is_scrum = fields.Boolean('Is it a Scrum Project ?', default=True)
+    goal = fields.Text(
+        'Goal',
+        help="The document that includes the project,"
+             "jointly between the team and the customer")
+    scrum_master_id = fields.Many2one(
+        'res.users',
+        'Scrum Master',
+        domain=lambda self: [('groups_id', 'in', self.env.ref(
+            'project_scrum_agile.group_scrum_master').ids)],
+        ondelete='restrict')
+    product_owner_id = fields.Many2one(
+        'res.users',
+        'Product Owner',
+        domain=lambda self: [('groups_id', 'in', self.env.ref(
+            'project_scrum_agile.group_scrum_owner').ids)],
+        ondelete='restrict')
+    team_id = fields.Many2one('project.scrum.devteam', 'Team')
+    backlog_count = fields.Integer(
+        "Number of Backlog",
+        compute='_compute_count'
+    )
+    sprint_count = fields.Integer(
+        'Number of Sprints',
+        compute='_compute_count'
+    )
+    release_count = fields.Integer(
+        'Number of Releases',
+        compute='_compute_count'
+    )
+
+    @api.model
+    def create(self, vals):
+        res = super(ProjectProject, self).create(vals)
+        for stage_ids in self.env['project.task.type'].search([
+            '|', ('default_view', '=', True), ('fold', '=', True)
+        ]):
+            stage_ids.write({'project_ids': [(4, res.id)]})
+        return res
+
+
+class ProjectTaskType(models.Model):
+    _inherit = 'project.task.type'
+
+    default_view = fields.Boolean(
+        'Default View',
+        help="This stage will show you in kanban and form as well"
+    )
+
+    state = fields.Selection([('analysis', 'Analysis'),
+                              ('specification', 'Specification'),
+                              ('design', 'Design'),
+                              ('new', 'New'),
+                              ('in_progress', 'In Progress'),
+                              ('pending', 'Pending'),
+                              ('development', 'Development'),
+                              ('testing', 'Testing'),
+                              ('done', 'Done'),
+                              ('cancelled', 'Cancelled'),
+                              ])
+
+    @api.constrains('state')
+    def _check_state(self):
+        for task_type in self:
+            if self.search_count([('state', '=', task_type.state)]) > 1:
+                raise ValidationError(_("You cannot create stage with same"
+                                        " state!!"))
+
+
+class ResUserExtended(models.Model):
+    _inherit = 'res.users'
+
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=50):
+        """
+        This method used to filter as per group in the dropdown,
+        Scrum master, product owner in project.
+
+        """
+        if self._context.get('filter_product_owner', False):
+            scrum_owner = self.env.ref('project_scrum_agile.group_scrum_owner')
+            if scrum_owner and scrum_owner.users:
+                args += [('id', 'in', scrum_owner.users.ids)]
+        if self._context.get('filter_scrum_master', False):
+            scrum_mst = self.env.ref('project_scrum_agile.group_scrum_master')
+            if scrum_mst and scrum_mst.users:
+                args += [('id', 'in', scrum_mst.users.ids)]
+        return super(ResUserExtended, self).name_search(
+            name=name, args=args, operator=operator, limit=limit)
diff --git a/odex25_project/project_scrum_agile/models/project_scrum.py b/odex25_project/project_scrum_agile/models/project_scrum.py
new file mode 100644
index 000000000..744c1ef03
--- /dev/null
+++ b/odex25_project/project_scrum_agile/models/project_scrum.py
@@ -0,0 +1,1349 @@
+# See LICENSE file for full copyright and licensing details.
+
+import re
+import time
+from datetime import datetime, timedelta
+
+from odoo import api, fields, models, _, tools
+from odoo import tools, SUPERUSER_ID
+from odoo.exceptions import UserError, ValidationError
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
+
+
+class Meeting(models.Model):
+    _inherit = "calendar.event"
+
+    @api.depends('allday', 'start', 'stop')
+    def _compute_dates(self):
+        """ Adapt the value of start_date(time)/stop_date(time) according to start/stop fields and allday. Also, compute
+            the duration for not allday meeting ; otherwise the duration is set to zero, since the meeting last all the day.
+        """
+        for meeting in self:
+            if meeting.allday and meeting.start and meeting.stop:
+                meeting.start_date = meeting.start.date()
+                meeting.stop_date = meeting.stop.date()
+                meeting.duration = 0.0
+            else:
+                meeting.start_date = meeting.start
+                meeting.stop_date = meeting.stop
+
+                meeting.duration = self._get_duration(meeting.start, meeting.stop)
+
+    def _inverse_dates(self):
+        for meeting in self:
+            if meeting.allday and meeting.start_date and meeting.stop_date:
+                end_date = fields.Datetime.from_string(meeting.stop_date)
+                end_date = end_date.replace(hour=18)
+
+                start_date = fields.Datetime.from_string(meeting.start_date)
+                start_date = start_date.replace(hour=10)
+
+                meeting.write({
+                    'start': start_date.replace(tzinfo=None),
+                    'stop': end_date.replace(tzinfo=None)
+                })
+            else:
+                meeting.write({'start': meeting.start,
+                               'stop': meeting.stop})
+
+    start = fields.Datetime(
+        'Start', required=True, tracking=True, default=datetime.now(),
+        help="Start date of an event, without time for full days events")
+    stop = fields.Datetime(
+        'Stop', required=True, tracking=True, default=datetime.now(),
+        compute='_compute_stop', readonly=False, store=True,
+        help="Stop date of an event, without time for full days events")
+
+    status = fields.Selection([
+        ('new', 'New'),
+        ('confirm', 'Confirmed'),
+        ('performed', 'Performed'),
+        ('canceled', 'Canceled')],
+        'State', index=True,
+        default='new'
+    )
+    project_id = fields.Many2one('project.project', 'Project')
+    scrum_meeting_id = fields.Many2one(
+        'project.scrum.meeting',
+        'Meeting Sprint'
+    )
+    analytic_timesheet_id = fields.Many2one(
+        'account.analytic.line',
+        'Related Timeline',
+        ondelete='set null'
+    )
+
+    def to_extend_sprint(self):
+        """ Create Sprint Meeting
+        @param self: The object pointer
+        """
+        vals = {}
+        for meeting in self:
+            if meeting.duration:
+                vals['start'] = meeting.start
+                vals['duration'] = meeting.duration
+                start_datetime = vals.get('start')
+                start_string_date = datetime.strftime(start_datetime, DEFAULT_SERVER_DATETIME_FORMAT)
+                stop_date = datetime.strptime(start_string_date,
+                                              DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(
+                    hours=vals.get('duration'))
+                vals['stop_date'] = datetime.strftime(stop_date,
+                                                      DEFAULT_SERVER_DATETIME_FORMAT)
+            if meeting.allday is True:
+                vals['start_date'] = meeting.start_date
+                vals['stop_date'] = meeting.stop_date
+            if not meeting.scrum_meeting_id:
+                vals['meeting_id'] = meeting.id
+                self.env['project.scrum.meeting'].create(vals)
+
+    def set_new(self):
+        self.write({'status': 'new'})
+
+    def set_cancel(self):
+        for meeting in self:
+            meeting.analytic_timesheet_id.unlink()
+            meeting.write({'status': 'canceled'})
+
+    def set_confirm(self):
+        for meeting in self:
+            meeting.write({'status': 'confirm'})
+
+    def set_validate(self):
+        for meeting in self:
+            self.validate(meeting)
+            meeting.write({'status': 'performed'})
+
+    def validate(self, meeting):
+        """ Create Account Analytic Line from Meeting
+        @param self: The object pointer
+        """
+        project_obj = self.env['project.project']
+        vals_line = {}
+        if not meeting.project_id:
+            raise ValidationError(_('Please select the Project before '
+                                    'validating Meeting!!'))
+        project = meeting.project_id
+        emp_id = self.env.user.employee_id
+        if not emp_id.product_id:
+            raise ValidationError(_("""Define Product On Employee %s"""
+                                    % emp_id.name))
+        if not emp_id.journal_id:
+            raise ValidationError(_("""Define Journal On Related
+            Employee %s""" % emp_id.name))
+
+        acc_id = emp_id.product_id.property_account_expense_id.id
+        if not acc_id:
+            acc_id = \
+                emp_id.product_id.categ_id.property_account_expense_categ_id.id
+            if not acc_id:
+                raise ValidationError(
+                    _('Please define product and product category \
+                        property account on the related employee.\nFill\
+                         in the timesheet tab of the employee form.'))
+        vals_line['name'] = \
+            'Reunion %s: %s' % (tools.ustr(project_obj.name), tools.ustr(
+                meeting.name or '/'))
+        vals_line['user_id'] = meeting.user_id.id or self.env.user
+        vals_line['date'] = meeting.start_date
+        vals_line['meeting_id'] = meeting.id
+        vals_line['unit_amount'] = 8 if meeting.allday else meeting.duration
+        vals_line['product_id'] = emp_id.product_id.id
+        vals_line['general_account_id'] = acc_id
+        vals_line['product_uom_id'] = emp_id.product_id.uom_id.id
+        vals_line['account_id'] = project.analytic_account_id.id
+        if vals_line['product_id']:
+            amount = \
+                self.env['product.product']. \
+                    browse(vals_line['product_id']).standard_price
+            vals_line['amount'] = amount * vals_line['unit_amount']
+        timeline_id = self.env['account.analytic.line'].create(vals_line)
+        meeting.write({'analytic_timesheet_id': timeline_id.id})
+        return True
+
+
+class ProjectScrumSprint(models.Model):
+    _name = 'project.scrum.sprint'
+    _description = 'Project Scrum Sprint'
+    _inherit = ['mail.thread']
+    _order = "date_start desc"
+
+    def button_open(self):
+        for record in self:
+            stories = record.product_backlog_ids
+            if not stories:
+                raise ValidationError(_(
+                    "You can not open sprint with no stories affected in"))
+            else:
+                record.write({'state': 'open'})
+
+    def button_cancel(self):
+        for sprint in self:
+            sprint.write({'state': 'cancel'})
+
+    def button_draft(self):
+        for sprint in self:
+            sprint.write({'state': 'draft'})
+
+    def button_close(self):
+        for sprint in self:
+            sprint.write({'state': 'done'})
+            sprint.meeting_ids.write({'status': 'performed'})
+
+    def button_pending(self):
+        for sprint in self:
+            sprint.write({'state': 'pending'})
+
+    def update_burndownchart(self):
+        """ This Method Calculate Burndown Chart Data from Backlogs
+        @param self: The object pointer
+        """
+        for sprint in self:
+            today = fields.Date.context_today(self)
+            sprint.burndown_ids.unlink()
+            date_start = sprint.date_start
+            date_stop = sprint.date_stop
+            total_days = (date_stop - date_start).days
+            sums = sprint.expected_hours
+            assign = sums
+            for day in range(-1, total_days + 2):
+                date_date = (date_start + timedelta(days=day))
+                date = date_date
+                sum_points = 0
+                if date <= today:
+                    for backlog in sprint.product_backlog_ids:
+                        if (not backlog.date_done) or \
+                            (backlog.date_done and \
+                             backlog.date_done < date):
+                            sum_points += backlog.complexity
+                        for task in backlog.tasks_id:
+                            for work in task.timesheet_ids:
+                                if work.date == date:
+                                    sums -= work.unit_amount
+                                    assign = sums
+                else:
+                    assign = 0
+                data = {
+                    'sprint_id': sprint.id,
+                    'date': date,
+                    'remaining_hours': assign,
+                    'remaining_points': sum_points,
+                    'date_day': date,
+                }
+                self.env['project.scrum.sprint.burndown.log'].create(data)
+
+    def _compute_effective_velocity(self):
+        """ Calculate complexity of backlog
+        @param self: The object pointer
+        """
+        user_story_obj = self.env['project.scrum.product.backlog']
+        for sprint in self:
+            user_story_recs = user_story_obj.search_read([
+                ('sprint_id', '=', sprint.id)], ['complexity'])
+            velocity = \
+                sum(rec.get('complexity') for rec in user_story_recs)
+            sprint.effective_velocity = velocity
+
+    @api.depends('product_backlog_ids', 'product_backlog_ids.expected_hours',
+                 'product_backlog_ids.effective_hours')
+    def _compute_hours(self):
+        for sprint in self:
+            tot = prog = effective = progress = 0.0
+            for backlog_id in sprint.product_backlog_ids:
+                tot += backlog_id.expected_hours
+                effective += backlog_id.effective_hours
+                prog += backlog_id.expected_hours * backlog_id.progress / 100.0
+
+            if tot > 0:
+                progress = round(prog / tot * 100)
+            sprint.progress = progress
+            sprint.expected_hours = tot
+            sprint.effective_hours = effective
+
+    def _compute_meeting_count(self):
+        """ Compute number of Meeting for particular Sprint
+        @param self: The object pointer
+        """
+        for sprint_id in self:
+            sprint_id.meeting_count = len(sprint_id.meeting_ids)
+
+    name = fields.Char('Sprint Name')
+    date_start = fields.Date(
+        'Starting Date',
+        default=lambda *a: time.strftime('%Y-%m-%d')
+    )
+    date_stop = fields.Date('Ending Date')
+    release_id = fields.Many2one(
+        'project.scrum.release',
+        'Release'
+    )
+    project_id = fields.Many2one(
+        'project.project',
+        string='Project'
+    )
+    product_owner_id = fields.Many2one(
+        'res.users',
+        'Product Owner',
+        domain=lambda self: [('groups_id', 'in', self.env.ref(
+            'project_scrum_agile.group_scrum_owner').ids)],
+        help="The person who is responsible for the product"
+    )
+    scrum_master_id = fields.Many2one(
+        'res.users',
+        'Scrum Master',
+        domain=lambda self: [('groups_id', 'in', self.env.ref(
+            'project_scrum_agile.group_scrum_master').ids)],
+        help="The person who maintains the process for the product"
+    )
+    meeting_ids = fields.One2many(
+        'project.scrum.meeting',
+        'sprint_id',
+        'Daily Scrum'
+    )
+    review = fields.Text('Sprint Review')
+    retrospective_start_to_do = fields.Text('Start to do')
+    retrospective_continue_to_do = fields.Text('Continue to do')
+    retrospective_stop_to_do = fields.Text('Stop to do')
+    backlog_ids = fields.One2many(
+        'project.scrum.product.backlog',
+        'sprint_id',
+        'Sprint Backlog'
+    )
+    effective_hours = fields.Float(
+        "Effective hours",
+        compute='_compute_hours',
+        help="Computed using the sum of the task work done.",
+    )
+    progress = fields.Float(
+        'Progress (0-100)',
+        compute='_compute_hours',
+        help="Computed as: Time Spent / Total Time.",
+        group_operator="avg",
+    )
+    expected_hours = fields.Float(
+        "Expected Hours",
+        compute='_compute_hours',
+        help='Expected hours to do the task.',
+    )
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('open', 'Open'),
+        ('pending', 'Pending'),
+        ('cancel', 'Cancelled'),
+        ('done', 'Done')],
+        'State', tracking=True,
+        default='draft'
+    )
+    goal = fields.Char("Goal")
+    effective_velocity = fields.Integer(
+        "Effective Velocity",
+        compute='_compute_effective_velocity',
+        help="Computed using the sum of the task work done."
+    )
+    burndown_ids = fields.One2many(
+        'project.scrum.sprint.burndown.log',
+        'sprint_id',
+        'BurndownChart'
+    )
+    product_backlog_ids = fields.One2many(
+        'project.scrum.product.backlog',
+        'sprint_id',
+        "User Stories",
+
+    )
+    project_id = fields.Many2one(
+        'project.project',
+        "Project"
+    )
+    sprint_number = fields.Char(
+        'Sprint number',
+        readonly=True,
+        copy=False,
+        help="Sprint number sequence"
+    )
+    color = fields.Integer('Color Index')
+    meeting_count = fields.Integer(
+        "Number of Meeting",
+        compute='_compute_meeting_count',
+    )
+
+    @api.model
+    def create(self, vals):
+        if not vals.get('sprint_number'):
+            vals['sprint_number'] = self.env['ir.sequence'].next_by_code(
+                'product.sprint.number') or '/'
+        return super(ProjectScrumSprint, self).create(vals)
+
+    @api.depends('name', 'sprint_number')
+    def name_get(self):
+        res = []
+        for sprint in self:
+            name = tools.ustr(sprint.name)
+            if sprint.sprint_number:
+                name = '[' + tools.ustr(sprint.sprint_number) + ']' + ' ' + name
+            res.append((sprint.id, name))
+        return res
+
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=100):
+        if not args:
+            args = []
+        if name:
+            positive_operators = ['=', 'ilike', '=ilike', 'like', '=like']
+            sprint = self.env['project.scrum.sprint']
+            if operator in positive_operators:
+                sprint = self.search(
+                    [('sprint_number', operator, name)] + args, limit=limit)
+                if not sprint:
+                    sprint = self.search(args + [
+                        ('sprint_number', operator, name)], limit=limit)
+                    if not limit or len(sprint) < limit:
+                        limit2 = (limit - len(sprint)) if limit else False
+                        sprint += self.search(args + [
+                            ('name', operator, name)], limit=limit2)
+                if not sprint:
+                    ptrn = re.compile('(\[(.*?)\])')
+                    pattern_name = ptrn.search(name)
+                    if pattern_name:
+                        sprint = self.search([
+                                                 ('sprint_number', '=',
+                                                  pattern_name.group(2)
+                                                  )] + args,
+                                             limit=limit)
+        else:
+            sprint = self.search(args, limit=limit)
+        return sprint.name_get()
+
+    @api.constrains('date_start', 'date_stop')
+    def _check_dates(self):
+        for sprint in self:
+            if sprint.date_start > sprint.date_stop:
+                raise ValidationError(_(
+                    'The start date must be anterior to the end date !'))
+
+    @api.onchange('project_id')
+    def _onchange_project_id(self):
+        self.release_id = False
+
+    def unlink(self):
+        for sprint in self:
+            if sprint.state not in ['draft', 'cancel']:
+                raise ValidationError(_('You can delete sprint in '
+                                        'draft or cancel state only!!'))
+        return super(ProjectScrumSprint, self).unlink()
+
+
+class ScrumMeeting(models.Model):
+    _name = 'project.scrum.meeting'
+    _description = 'Project Scrum Meeting'
+    _order = 'start_date desc'
+
+    meeting_id = fields.Many2one(
+        'calendar.event',
+        'Meeting Related',
+        delegate=True,
+        required=True
+    )
+    sprint_id = fields.Many2one('project.scrum.sprint', 'Sprint')
+    scrum_master_id = fields.Many2one(
+        'res.users',
+        'Scrum Master',
+        related='sprint_id.scrum_master_id',
+    )
+    product_owner_id = fields.Many2one(
+        'res.users',
+        'Product Owner',
+        related='sprint_id.product_owner_id',
+    )
+    question_yesterday = fields.Text('Tasks since yesterday')
+    question_today = fields.Text('Tasks for today')
+    question_blocks = fields.Text('Blocks encountered')
+    what_we_did = fields.Text('What was done during the meeting')
+    task_ids = fields.Many2many(
+        'project.task',
+        'project_scrum_meeting_task_rel',
+        'meeting_id', 'task_id',
+        'Tasks'
+    )
+    user_story_ids = fields.Many2many(
+        'project.scrum.product.backlog',
+        'project_scrum_meeting_story_rel',
+        'meeting_id',
+        'story_id',
+        'Stories'
+    )
+    sandbox_ids = fields.One2many(
+        'project.scrum.sandbox',
+        'meeting_id',
+        'Sandbox'
+    )
+
+    @api.model
+    def create(self, vals):
+        duration = 0
+        if vals.get('duration'):
+            duration = vals.get('duration')
+        if vals.get('start_date') and vals.get('duration'):
+            vals['start_date'] = vals.get('start_date')
+            vals['start'] = vals.get('start')
+        if vals.get('start_date') and vals.get('duration'):
+            start = datetime.strptime(vals.get('start_date'), '%Y-%m-%d')
+            start_datetime = datetime.strftime(start, DEFAULT_SERVER_DATETIME_FORMAT)
+            stop_date = datetime.strptime(start_datetime,
+                                          DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(
+                hours=duration)
+            vals['stop_date'] = datetime.strftime(stop_date,
+                                                  DEFAULT_SERVER_DATETIME_FORMAT)
+        if vals.get('start_date'):
+            if isinstance(vals.get('start_date'), str):
+                start = datetime.strptime(vals.get('start_date'), '%Y-%m-%d')
+                start_datetime = datetime.strftime(start, DEFAULT_SERVER_DATETIME_FORMAT)
+                stop_date = datetime.strptime(start_datetime,
+                                              DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(
+                    hours=duration)
+                vals['stop_date'] = datetime.strftime(stop_date,
+                                                      DEFAULT_SERVER_DATETIME_FORMAT)
+            else:
+                start = datetime.strftime(vals.get('start_date'), DEFAULT_SERVER_DATETIME_FORMAT)
+                start_datetime = datetime.strptime(start, DEFAULT_SERVER_DATETIME_FORMAT)
+                stop_date = datetime.strftime(start_datetime,
+                                              DEFAULT_SERVER_DATETIME_FORMAT)
+                vals['stop_date'] = datetime.strptime(stop_date,
+                                                      DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(
+                    hours=duration)
+        if not vals.get('start'):
+            vals.update({'start': vals.get('start_date')})
+        create_id = super(ScrumMeeting, self).create(vals)
+        self.write({'scrum_meeting_id': create_id.id})
+
+        return create_id
+
+    def send_email(self):
+        """ Send Email individual to Owner and Master
+        @param self: The object pointer
+        """
+        context = self._context or {}
+        if context.get('type') == 'master':
+            if self.sprint_id.scrum_master_id.partner_id and self.sprint_id. \
+                scrum_master_id.partner_id.email:
+                res = self.email_send(self.sprint_id.scrum_master_id.
+                                      partner_id)
+                if not res:
+                    raise ValidationError(_(
+                        'Email notification'
+                        ' could not be sent to the scrum master %s')
+                                          % self.sprint_id.
+                                          scrum_master_id.name)
+            else:
+                raise ValidationError(_(
+                    'Please provide email address'
+                    ' for scrum master defined on sprint.'))
+        if context.get('type') == 'owner':
+            if self.sprint_id.product_owner_id.partner_id and self.sprint_id. \
+                product_owner_id.partner_id.email:
+                res = self.email_send(self.sprint_id.product_owner_id.
+                                      partner_id)
+                if res is False:
+                    raise ValidationError(_(
+                        'Email notification could not be sent'
+                        ' to the product owner %s') % self.sprint_id.
+                                          product_owner_id.name)
+            else:
+                raise ValidationError(_(
+                    'Please provide email address for product owner'
+                    ' defined on sprint.'))
+
+    def email_send(self, partner_id):
+        """ Send Email To Owner and Master Both From Wizard
+        @param self: The object pointer
+        """
+        email_from = tools.config.get('email_from', False)
+        user = self.env.user
+        user_email = email_from or user.partner_id.email
+        vals = {}
+        mail_temp = self.env.ref('project_scrum_agile.email_template_project_scrum', raise_if_not_found=True)
+        body = """
+                <div>
+                Hello %s,
+                <br/>
+                <p style="margin:10px;">Meeting is done successfully.Details are mentioned below:</p>
+                </div>
+                <div style="margin:10px;">
+                <p>Project  : %s</p>
+                <p>Sprint : %s</p>
+                <p>Tasks since yesterday : %s</p>
+                <p>Task for Today : %s</p>
+                <p>Blocking points encountered : %s</p>
+                <p>Thank you, %s</p>
+                <p>%s</p>
+                </div>
+                """ \
+               % (self.partner_id.name,
+                  self.project_id.name,
+                  self.sprint_id.name,
+                  self.question_yesterday or '',
+                  self.question_today or '',
+                  self.question_blocks or '',
+                  user.name, user.signature
+                  )
+        vals['email_from'] = user_email
+        vals['email_to'] = partner_id.email
+        vals['body_html'] = body
+        mail_temp.write(vals)
+        mail_id = mail_temp.send_mail(self.id, force_send=True)
+        return True
+
+    def set_new(self):
+        for meeting in self:
+            meeting.write({'status': 'new'})
+
+    def set_cancel(self):
+        for meeting in self:
+            meeting.analytic_timesheet_id.unlink()
+            meeting.write({'status': 'canceled'})
+
+    def set_confirm(self):
+        for meeting in self:
+            meeting.write({'status': 'confirm'})
+
+    def set_validate(self):
+        for meeting_id in self:
+            self.validate(meeting_id.meeting_id)
+            meeting_id.write({'status': 'performed'})
+
+    def unlink(self):
+        for meeting in self:
+            if meeting.status not in ['new', 'canceled']:
+                raise ValidationError(_('You can delete Scrum Meeting in '
+                                        'new or cancel state only!!'))
+        return super(ScrumMeeting, self).unlink()
+
+    def validate(self, meeting):
+        """ Create Analytic Line For Meeting
+        @param self: The object pointer
+        @param meeting: Meeting Id
+        """
+        project_obj = self.env['project.project']
+        vals_line = {}
+        if not meeting.project_id:
+            raise ValidationError(_('Please select the Project before '
+                                    'validating Meeting!!'))
+        project = meeting.project_id
+        result = self.get_user_related_details(meeting.user_id and meeting.
+                                               user_id.id or self.env.user)
+        vals_line['name'] = 'Reunion %s: %s' % (tools.ustr(project_obj.name),
+                                                tools.ustr(meeting.name or '/')
+                                                )
+        vals_line['user_id'] = meeting.user_id and meeting.user_id.id or \
+                               self.env.user
+        vals_line['product_id'] = result['product_id']
+        vals_line['date'] = meeting.start_date
+        vals_line['meeting_id'] = meeting.id
+        vals_line['unit_amount'] = meeting.allday and 8 or meeting.duration
+        vals_line['account_id'] = project.analytic_account_id.id
+        vals_line['general_account_id'] = result['general_account_id']
+        vals_line['product_uom_id'] = result['product_uom_id']
+        if result['product_id']:
+            amount = self.env['product.product'].browse(
+                result['product_id']).standard_price
+            vals_line['amount'] = amount * vals_line['unit_amount']
+        timeline_id = self.env['account.analytic.line'].create(vals_line)
+        meeting.write({'analytic_timesheet_id': timeline_id.id})
+        return True
+
+    def get_user_related_details(self, user_id):
+        """ Find User Related Details
+        @param self: The object pointer
+        @param user_id: User Id
+        """
+        res = {}
+        emp_id = self.env.user.employee_id
+        user_id = self.env.user
+        if not emp_id.product_id:
+            raise ValidationError(_("""Define Product On Employee %s"""
+                                    % emp_id.name))
+        if not emp_id.journal_id:
+            raise ValidationError(_("""Define Journal On Related
+            Employee %s""" % emp_id.name))
+        acc_id = emp_id.product_id.property_account_expense_id.id
+        if not acc_id:
+            acc_id = emp_id.product_id.categ_id. \
+                property_account_expense_categ_id.id
+            if not acc_id:
+                raise ValidationError(
+                    _('Please define product and product category property'
+                      'account on the related employee.'
+                      '\nFill in the timesheet tab of the employee form.'))
+        res['product_id'] = emp_id.product_id.id
+        res['general_account_id'] = acc_id
+        res['journal_id'] = emp_id.journal_id.id
+        res['product_uom_id'] = emp_id.product_id.uom_id.id
+        return res
+
+    def copy(self, default=None):
+        default.update({'status': 'new'})
+        return super(ScrumMeeting, self).copy(default)
+
+    @api.onchange('project_id')
+    def _onchange_project_id(self):
+        self.sprint_id = self.env.context.get('default_sprint_id', False)
+
+    @api.onchange('partner_ids')
+    def _onchange_partner_ids(self):
+        """ The basic purpose of this method is to check that destination
+        partners
+            effectively have email addresses. Otherwise a warning is thrown.
+        @param self: The object pointer
+        """
+        res = {'value': {}}
+        if not self.partner_ids:
+            return {}
+        res.update(self.check_partners_email(self.partner_ids))
+        return res
+
+    def check_partners_email(self, partner_ids):
+        """ Verify that selected partner_ids have an email_address defined.
+            Otherwise throw a warning.
+        @param self: The object pointer
+        @param partner_ids: List Of Parters
+        """
+        partner_email_lst = [partner for partner in partner_ids
+                             if not partner.email]
+        if not partner_email_lst:
+            return {}
+        warning_msg = _('The following contacts have no email address :')
+        for partner in partner_email_lst:
+            warning_msg += '\n- %s' % partner.name
+        raise UserError(_('Email addresses not found.\n%s.') % warning_msg)
+
+
+class ProjectScrumSprintBurndownLog(models.Model):
+    _name = 'project.scrum.sprint.burndown.log'
+    _description = 'Project Scrum Sprint Burndown Log'
+
+    sprint_id = fields.Many2one('project.scrum.sprint', 'Sprint',
+                                required=True)
+    date = fields.Date('Date')
+    remaining_hours = fields.Float('Hours left')
+    remaining_points = fields.Float('Remaining Points')
+    real_data = fields.Boolean('Real data')
+    date_day = fields.Char("Date Day")
+
+
+class ProjectScrumProductBacklog(models.Model):
+    _name = 'project.scrum.product.backlog'
+    _description = "Product backlog where are user stories"
+    _inherit = ['mail.thread']
+    _order = "sequence"
+
+    @api.depends('name', 'backlog_number')
+    def name_get(self):
+        res = []
+        for record in self:
+            name = tools.ustr(record.name)
+            if record.backlog_number and name:
+                name = '[' + tools.ustr(record.backlog_number) + ']' + ' ' + name
+            res.append((record.id, name))
+        return res
+
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=100):
+        if not args:
+            args = []
+        if name:
+            positive_operators = ['=', 'ilike', '=ilike', 'like', '=like']
+            backlog = self.env['project.scrum.product.backlog']
+            if operator in positive_operators:
+                backlog = self.search(
+                    [('backlog_number', operator, name)] + args, limit=limit)
+                if not backlog:
+                    backlog = \
+                        self.search(args +
+                                    [('backlog_number', operator, name)],
+                                    limit=limit)
+                    if not limit or len(backlog) < limit:
+                        limit2 = (limit - len(backlog)) if limit else False
+                        backlog += self.search(args +
+                                               [('name', operator, name)],
+                                               limit=limit2)
+                if not backlog:
+                    ptrn = re.compile('(\[(.*?)\])')
+                    pattern_name = ptrn.search(name)
+                    if pattern_name:
+                        backlog = self.search([
+                                                  ('backlog_number', '=', pattern_name.group(2))
+                                              ] + args, limit=limit)
+        else:
+            backlog = self.search(args, limit=limit)
+        return backlog.name_get()
+
+    @api.depends('tasks_id',
+                 'tasks_id.effective_hours', 'tasks_id.planned_hours')
+    def _compute_hours(self):
+        for backlog in self:
+            tot = prog = effective = task_hours = progress = 0.0
+            for task in backlog.tasks_id:
+                task_hours += task.planned_hours
+                effective += task.effective_hours
+                tot += task.planned_hours
+                prog += task.planned_hours * task.progress / 100.0
+            if tot > 0:
+                progress = round(prog / tot * 100)
+            # TODO display an error message if tot==0
+            #             (division by 0 is impossible)
+            backlog.progress = progress
+            backlog.effective_hours = effective
+            backlog.task_hours = task_hours
+
+    def _get_default_stage_id(self):
+        """ Gives default stage_id
+        @param self: The object pointer
+        """
+        project_id = self.env.context.get('default_project_id')
+        if not project_id:
+            return False
+        return self.stage_find(project_id, [('fold', '=', False)])
+
+    @api.model
+    def _read_group_stage_ids(self, stages, domain, order):
+        search_domain = ['|', ('default_view', '=', True), ('fold', '=', True)]
+        if 'default_project_id' in self.env.context:
+            search_domain = \
+                ['|', ('project_ids', '=',
+                       self.env.context['default_project_id'])] + search_domain
+        stage_ids = stages._search(search_domain, order=order,
+                                   access_rights_uid=SUPERUSER_ID)
+        return stages.browse(stage_ids)
+
+    def stage_find(self, section_id, domain=[], order='sequence'):
+        """ Override of the base.stage method
+            Parameter of the stage search taken from the lead:
+            - section_id: if set, stages must belong to this section or
+              be a default stage; if not set, stages must be default
+              stages
+        """
+        # collect all section_ids
+        section_ids = []
+        if section_id:
+            section_ids.append(section_id)
+        section_ids.extend(self.mapped('project_id').ids)
+        search_domain = []
+        if section_ids:
+            search_domain = [('|')] * (len(section_ids) - 1)
+            for section_id in section_ids:
+                search_domain.append(('project_ids', '=', section_id))
+        search_domain += list(domain)
+        # perform search, return the first found
+        return self.env['project.task.type'].search(search_domain, order=order,
+                                                    limit=1).id
+
+    name = fields.Char(
+        'Title',
+        required=True,
+        translate=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]}
+    )
+    for_then = fields.Text(
+        'For',
+        translate=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]}
+    )
+    acceptance_testing = fields.Text(
+        "Proof of acceptance",
+        translate=True,
+        readonly=False,
+        states={'done': [('readonly', True)]}
+    )
+    description = fields.Text(
+        "Wants",
+        translate=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]}
+    )
+    sequence = fields.Integer(
+        'Sequences',
+        help="Gives the sequence order when"
+             "displaying a list of product backlog.",
+        default=1000
+    )
+    expected_hours = fields.Float(
+        'Planned Hours',
+        help='Estimated total time to do the Backlog'
+    )
+    complexity = fields.Integer(
+        'Story Points',
+        help='Complexity of the User Story'
+    )
+    active = fields.Boolean(
+        'Active',
+        help="If Active field is set to true, it will allow you to hide"
+             "the product backlog without removing it.",
+        default=True
+    )
+    value_to_user = fields.Integer("Value for the user", default=50)
+    open = fields.Boolean('Open', tracking=True, default=True)
+    date_open = fields.Date("Start date")
+    date_done = fields.Date("End date")
+    project_id = fields.Many2one('project.project', "Project", readonly=True,
+                                 states={'draft': [('readonly', False)]})
+    release_id = fields.Many2one(
+        'project.scrum.release',
+        "Release",
+        readonly=True,
+        states={'draft': [('readonly', False)]}
+    )
+    sprint_id = fields.Many2one(
+        'project.scrum.sprint',
+        "Sprint", readonly=True,
+        states={'draft': [('readonly', False)]}
+    )
+    user_id = fields.Many2one(
+        'res.users',
+        'Author',
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+        default=lambda self: self.env.user
+    )
+    task_id = fields.Many2one(
+        'project.task',
+        "Related Task",
+        ondelete='restrict',
+        help='Task-related data of the user story'
+    )
+    tasks_id = fields.One2many(
+        'project.task',
+        'product_backlog_id',
+        'Tasks Details'
+    )
+    progress = fields.Float(
+        'Progress',
+        compute='_compute_hours',
+        group_operator="avg",
+        help="Computed as: Time Spent / Total Time.",
+    )
+    effective_hours = fields.Float(
+        'Spent Hours',
+        compute='_compute_hours',
+        help="Computed using the sum of the time spent"
+             "on every related tasks",
+        store=True,
+    )
+    task_hours = fields.Float(
+        'Task Hours',
+        compute='_compute_hours',
+        help='Estimated time of the total hours of the tasks'
+    )
+    color = fields.Integer('Color Index')
+    note = fields.Text('Internal Note', translate=True)
+    responsible_id = fields.Many2one(
+        'res.users',
+        'Responsible',
+        tracking=True,
+        default=lambda self: self.env.user
+    )
+    role_job_id = fields.Many2one('hr.job', 'Who')
+    role_id = fields.Many2one(
+        'res.partner',
+        "Listener",
+        readonly=True,
+        states={'draft': [('readonly', False)]}
+    )
+    delivery_date = fields.Date('Deliver date')
+    backlog_number = fields.Char(
+        'Number Requirement',
+        readonly=True,
+        copy=False,
+        help="Sequence number of request"
+    )
+    asked_date = fields.Date('Application Date')
+    company_id = fields.Many2one(
+        'res.company',
+        'Company',
+        default=lambda self: self.env.user.company_id
+    )
+    kanban_state = fields.Selection([
+        ('normal', 'Normal'),
+        ('blocked', 'Blocked'),
+        ('done', 'Ready for next stage')],
+        'Kanban State',
+        tracking=True,
+        help="A task's kanban state indicates special"
+             "situations affecting it:\n"
+             " * Normal is the default situation\n"
+             " * Blocked indicates something is preventing"
+             "the progress of this task\n"
+             " * Ready for next stage indicates the"
+             "task is ready to be pulled to the next stage",
+        readonly=True,
+        default='normal'
+    )
+    # remove below field "backlog_stage_state" from next version onwards
+    backlog_stage_state = fields.Selection(related='stage_id.state')
+    state = fields.Selection([
+        ('draft', 'New'),
+        ('open', 'In Progress'),
+        ('pending', 'Pending'),
+        ('done', 'Done'),
+        ('cancelled', 'Cancelled')],
+        "Status",
+        store=True,
+        tracking=True,
+        readonly=True,
+        help='The status is set to \'Draft\', when a case is created.\
+        If the case is in progress the status is set to \'Open\'.\
+        When the case is over, the status is set to \'Done\'.\
+        If the case needs to be reviewed then the status is \
+        set to \'Pending\'.',
+        default='draft'
+    )
+    stage_id = fields.Many2one(
+        'project.task.type',
+        'Stage',
+        tracking=True,
+        index=True,
+        default=_get_default_stage_id,
+        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]",
+        group_expand='_read_group_stage_ids',
+        copy=False
+    )
+    categ_ids = fields.Many2many('project.tags', string='Tags')
+
+    @api.onchange('project_id')
+    def _onchange_project(self):
+        if self.project_id:
+            self.stage_id = self.stage_find(self.project_id.id, [
+                ('fold', '=', False)])
+        else:
+            self.stage_id = False
+
+    def set_hours(self):
+        context = self._context
+        remain_time = 1.0
+        remain_time = 1.0 if context.get('context_id') == 1.0 else remain_time
+        remain_time = 2.0 if context.get('context_id') == 2.0 else remain_time
+        remain_time = 4.0 if context.get('context_id') == 4.0 else remain_time
+        remain_time = 8.0 if context.get('context_id') == 8.0 else remain_time
+        remain_time = 16.0 if context. \
+                                  get('context_id') == 16.0 else remain_time
+        remain_time = 32.0 if context. \
+                                  get('context_id') == 32.0 else remain_time
+        remain_time = 64.0 if context. \
+                                  get('context_id') == 64.0 else remain_time
+        self.write({'expected_hours': remain_time})
+
+    def write(self, vals):
+        """ Add Message Follower when user and responsible user changed
+        @param self: The object pointer
+        """
+        if 'user_id' in vals:
+            user = self.env['res.users'].browse(vals.get('user_id'))
+            for req in self:
+                message_follower_ids = req.message_follower_ids or []
+                for partner_ids in message_follower_ids:
+                    if user.partner_id.id != partner_ids.partner_id.id:
+                        self.env['mail.followers']._insert_followers(
+                            self._name, [req.id], [user.partner_id.id],
+                            None, {}, None, [])
+
+        if 'responsible_id' in vals:
+            user = self.env['res.users'].browse(vals.get('responsible_id'))
+            for req in self:
+                message_follower_ids = req.message_follower_ids or []
+                for partner_ids in message_follower_ids:
+                    if user.partner_id.id != partner_ids.partner_id.id:
+                        self.env['mail.followers']._insert_followers(
+                            self._name, [req.id], [user.partner_id.id], None,
+                            {}, None, [])
+        return super(ProjectScrumProductBacklog, self).write(vals)
+
+    def button_open(self):
+        for backlog_id in self:
+            stage_id = self.env['project.task.type'].search(
+                [('state', '=', 'in_progress')], limit=1)
+            if not stage_id:
+                raise ValidationError(_(
+                    'In Progress stage not found! Please Create one'))
+            if not backlog_id.sprint_id or not backlog_id.acceptance_testing:
+                raise ValidationError(_("""
+                One of the following configuration is still missing.\n
+                    Please configure all the following details \n
+                    * You must affect this user story in a
+                    sprint before open it.
+                    * You must define acceptance testing
+                    before open this user story
+                                        """))
+
+            date = fields.Date.today()
+            backlog_id.write({'state': 'open',
+                              'date_open': date,
+                              'stage_id': stage_id.id
+                              })
+            for tasks_id in backlog_id.tasks_id:
+                tasks_id.write({'stage_id': stage_id.id, 'active': True})
+
+    def button_cancel(self):
+        stage_id = self.env['project.task.type'].search(
+            [('state', '=', 'cancelled')], limit=1)
+        if not stage_id:
+            raise ValidationError(_(
+                'Cancelled stage not found! Please Create one'))
+        for backlog in self:
+            backlog.write({
+                'stage_id': stage_id.id,
+                'state': 'cancelled',
+                'active': True
+            })
+            for tasks_id in backlog.tasks_id:
+                tasks_id.write({'stage_id': stage_id.id, 'active': True})
+
+    def button_close(self):
+        stage_id = self.env['project.task.type'].search(
+            [('state', '=', 'done')], limit=1)
+        if not stage_id:
+            raise ValidationError(_('Done Stage Not Found! Please Create one'))
+        for backlog in self:
+            for task in backlog.tasks_id:
+                if task.stage_id.state != 'done':
+                    raise ValidationError(_('All tasks must be completed'))
+                else:
+                    self._get_velocity_sprint_done()
+                    for (sprint_id, name) in backlog.sprint_id.name_get():
+                        self.message_post(body=_(
+                            "The sprint '%s' has been closed." % name),
+                            subject="Record Updated")
+            backlog.write({'stage_id': stage_id.id})
+
+    def button_reactivate(self):
+        stage_id = self.env['project.task.type'].search(
+            [('state', '=', 'design')], limit=1)
+        if not stage_id:
+            raise ValidationError(_('Design Stage Not Found! Please Create one'))
+        for backlog in self:
+            backlog.write({
+                'stage_id': stage_id.id,
+                'state': 'open',
+                'active': True
+            })
+            for task_id in backlog.tasks_id:
+                task_id.write({'active': True})
+                if task_id.stage_id.name != 'Done':
+                    task_id.write({'active': True})
+
+    def _get_velocity_sprint_done(self):
+        velocity = 0
+        stage_id = self.env['project.task.type'].search(
+            [('state', '=', 'design')], limit=1)
+        if not stage_id:
+            raise ValidationError(_('Design Stage Not Found! Please Create one'))
+        for backlog_id in self.search([('sprint_id', '=', self.sprint_id.id)]):
+            backlog_id.write({'stage_id': stage_id.id, 'state': 'open'})
+            velocity += backlog_id.complexity
+        self.sprint_id.write({'effective_velocity': velocity})
+
+    @api.model
+    def create(self, vals):
+        if not vals.get('backlog_number'):
+            vals['backlog_number'] = self.env['ir.sequence'].next_by_code(
+                'product.backlog.number') or '/'
+        return super(ProjectScrumProductBacklog, self).create(vals)
+
+    @api.constrains('date_open', 'date_done')
+    def _check_dates(self):
+        for backlog in self:
+            if (backlog.date_open and backlog.date_done) and (
+                backlog.date_open > backlog.date_done):
+                raise ValidationError(_(
+                    'The start date must be anterior to the end date !'))
+
+
+class ProjectTask(models.Model):
+    _inherit = 'project.task'
+
+    name = fields.Char('Homework', translate=True)
+    product_backlog_id = fields.Many2one(
+        'project.scrum.product.backlog',
+        'User Story',
+        help="Related product backlog that contains this task."
+             "Used in SCRUM methodology"
+    )
+    sprint_id = fields.Many2one(
+        'project.scrum.sprint',
+        'Sprint',
+        related='product_backlog_id.sprint_id',
+    )
+    release_id = fields.Many2one(
+        'project.scrum.release',
+        'Release',
+        related='sprint_id.release_id',
+        store=True,
+        readonly=True
+    )
+    description = fields.Html('Description', translate=True)
+    warn = fields.Boolean('Email alert')
+    creator_id = fields.Many2one('res.users', 'Created By')
+    email = fields.Char(
+        'Send mail',
+        help='An email will be sent upon completion and upon validation of the'
+             'Task to the following recipients. Separate with comma (,)'
+             'each recipient ex: example@email.com, test@email.com'
+    )
+    write_date = fields.Date('Modified Date')
+    partner_ids = fields.Many2many(
+        'res.partner',
+        'task_mail_compose_message_res_partner_rel',
+        'task_id',
+        'partner_id',
+        'Contacts to notify'
+    )
+    incidents = fields.One2many('project.task', 'task_id', 'Incidents')
+    task_id = fields.Many2one('project.task', 'Task')
+    task_number = fields.Char(
+        'Task Number',
+        readonly=True,
+        copy=False,
+        help="Sequence of the task number"
+    )
+    type = fields.Selection([
+        ('task', 'Task'),
+        ('issue', 'Bug'),
+    ], default='task', help="The 'Type' is used for bifurcation of "
+             "Task and Issue.")
+
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if 'kanban_state' in init_values and self.kanban_state == 'blocked':
+            return self.env.ref('project.mt_task_blocked')
+        elif 'kanban_state' in init_values and self.kanban_state == 'done':
+            return self.env.ref('project_scrum_agile.mt_task_started')
+        elif 'user_id' in init_values and self.user_id:  # assigned -> new
+            return self.env.ref('project.mt_task_new')
+        elif 'stage_id' in init_values and self.stage_id and self.stage_id. \
+            sequence <= 1:  # start stage -> new
+            return self.env.ref('project.mt_task_new')
+        elif 'stage_id' in init_values:
+            return self.env.ref('project.mt_task_stage')
+        return super(ProjectTask, self)._track_subtype(init_values)
+
+    @api.depends('name', 'task_number')
+    def name_get(self):
+        res = []
+        for task_id in self:
+            name = tools.ustr(task_id.name)
+            if task_id.task_number:
+                name = '[' + tools.ustr(task_id.task_number) + ']' + ' ' + name
+            res.append((task_id.id, name))
+        return res
+
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=100):
+        if not args:
+            args = []
+        if name:
+            positive_operators = ['=', 'ilike', '=ilike', 'like', '=like']
+            tasks = self.env['project.task']
+            if operator in positive_operators:
+                tasks = self.search(
+                    [('task_number', operator, name)] + args, limit=limit)
+                if not tasks:
+                    tasks = self.search(args +
+                                        [('task_number', operator, name)],
+                                        limit=limit)
+                    if not limit or len(tasks) < limit:
+                        limit2 = (limit - len(tasks)) if limit else False
+                        tasks += self.search(args +
+                                             [('name', operator, name)],
+                                             limit=limit2)
+                if not tasks:
+                    ptrn = re.compile('(\[(.*?)\])')
+                    pattern_name = ptrn.search(name)
+                    if pattern_name:
+                        tasks = self.search([
+                                                ('task_number', '=', pattern_name.group(2))
+                                            ] + args, limit=limit)
+        else:
+            tasks = self.search(args, limit=limit)
+        return tasks.name_get()
+
+    @api.onchange('product_backlog_id')
+    def _onchange_backlog_id(self):
+        if not self.product_backlog_id:
+            return {}
+        self.project_id = self.product_backlog_id.project_id.id
+
+    @api.onchange('type')
+    def _onchange_type(self):
+        if self.type == 'issue' and self.incidents:
+            self.incidents = [(5,)]
+
+    # @api.model
+    # def create(self, vals):
+    #     if not vals.get('task_number'):
+    #         vals['task_number'] = self.env['ir.sequence'].next_by_code(
+    #             'project.task.number') or '/'
+    #     return super(ProjectTask, self).create(vals)
+
+
+class AccountAnalyticLine(models.Model):
+    _inherit = 'account.analytic.line'
+
+    date_to = fields.Datetime(
+        'Date Up',
+        default=lambda *a: time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+    )
+    meeting_id = fields.Many2one('calendar.event', 'Related Meeting')
+    task_id = fields.Many2one('project.task', 'Related Tasks')
+    date = fields.Date('Date', required=True)
+    project_id = fields.Many2one(
+        'project.project',
+        'Project'
+    )
+
+
+class MailAlias(models.Model):
+    _inherit = 'mail.alias'
+
+    @api.model
+    def create(self, vals):
+        """ Creates an email.alias record according to the values provided in ``vals``,
+            with 2 alterations: the ``alias_name`` value may be suffixed in order to
+            make it unique (and certain unsafe characters replaced), and
+            he ``alias_model_id`` value will set to the model ID of the ``model_name``
+            context value, if provided.
+        """
+        model_name = self._context.get('alias_model_name')
+        parent_model_name = self._context.get('alias_parent_model_name')
+        if vals.get('alias_name'):
+            vals['alias_name'] = self._clean_and_check_unique(vals.get('alias_name'))
+        if model_name:
+            model = self.env['ir.model']._get(model_name)
+            vals['alias_model_id'] = model.id
+        if parent_model_name:
+            model = self.env['ir.model']._get(parent_model_name)
+            vals['alias_parent_model_id'] = model.id
+        return super(MailAlias, self).create(vals)
+
+
+class ProjectProject(models.Model):
+    _inherit = 'project.project'
+
+    release_ids = fields.One2many(
+        'project.scrum.release',
+        'project_id',
+        "Releases",
+        readonly=True
+    )
+
+    @api.model
+    def create(self, vals):
+        alias_name = vals.get('alias_name')
+        res = super(ProjectProject, self).create(vals)
+        default_alias_name = self.env['mail.alias']. \
+            with_context(alias_model_name='project.task',
+                         alias_parent_model_name='project.project').create(
+            {'alias_name': self.alias_name})
+        res.update({
+            'alias_name': default_alias_name.alias_name if alias_name is False
+            else alias_name
+        })
+        return res
diff --git a/odex25_project/project_scrum_agile/models/project_scrum_devteam.py b/odex25_project/project_scrum_agile/models/project_scrum_devteam.py
new file mode 100644
index 000000000..e6dc24044
--- /dev/null
+++ b/odex25_project/project_scrum_agile/models/project_scrum_devteam.py
@@ -0,0 +1,26 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class ProjectScrumDevteam(models.Model):
+    _name = 'project.scrum.devteam'
+    _description = "Project Scrum Development Team"
+
+    name = fields.Char("Name", required=True)
+    code = fields.Char("Code")
+    active = fields.Boolean("Active", default=True)
+    developer_ids = fields.One2many(
+        'res.users',
+        'scrum_devteam_id',
+        "Developers"
+    )
+
+
+class ResUsers(models.Model):
+    _inherit = "res.users"
+
+    scrum_devteam_id = fields.Many2one(
+        'project.scrum.devteam',
+        "Scrum Development Team"
+    )
diff --git a/odex25_project/project_scrum_agile/models/project_scrum_release.py b/odex25_project/project_scrum_agile/models/project_scrum_release.py
new file mode 100644
index 000000000..6c1134248
--- /dev/null
+++ b/odex25_project/project_scrum_agile/models/project_scrum_release.py
@@ -0,0 +1,53 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class ProjectScrumRelease(models.Model):
+    _name = 'project.scrum.release'
+    _description = 'Project Release'
+    _inherit = ['mail.thread']
+    _order = "release_number desc"
+
+    name = fields.Char("Name", required=True)
+    goal = fields.Text("Goal")
+    note = fields.Text("Note")
+    project_id = fields.Many2one('project.project', "Project",
+                                 domain=[('is_scrum', '=', True)])
+    date_start = fields.Date('Starting Date')
+    date_stop = fields.Date('Ending Date')
+    delivery_date_estimated = fields.Date("Estimated Date of Delivery")
+    delivery_date_effective = fields.Date("Effective Date of Delivery")
+    sprint_ids = fields.One2many(
+        'project.scrum.sprint',
+        'release_id',
+        "Sprints"
+    )
+    backlog_ids = fields.One2many(
+        'project.scrum.product.backlog',
+        'release_id',
+        "Product Backlog",
+        readonly=True
+    )
+    release_number = fields.Char(
+        'Release Number',
+        copy=False,
+        help="Sequence of the release number"
+    )
+
+    @api.model
+    def create(self, vals):
+        if not vals.get('release_number'):
+            vals['release_number'] = \
+                self.env['ir.sequence'].next_by_code('project.scrum.release') \
+                or '/'
+        return super(ProjectScrumRelease, self).create(vals)
+
+    @api.constrains('date_start', 'date_stop')
+    def _check_dates(self):
+        for scrum in self:
+            if (scrum.date_start and scrum.date_stop) and (
+                    scrum.date_start > scrum.date_stop):
+                raise ValidationError(_(
+                    'The start date must be anterior to the end date !'))
diff --git a/odex25_project/project_scrum_agile/models/project_scrum_role.py b/odex25_project/project_scrum_agile/models/project_scrum_role.py
new file mode 100644
index 000000000..065de0a9b
--- /dev/null
+++ b/odex25_project/project_scrum_agile/models/project_scrum_role.py
@@ -0,0 +1,14 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class ProjectScrumRole(models.Model):
+    _name = 'project.scrum.role'
+    _description = 'Project Scrum Role'
+
+    name = fields.Char('Name',required=True)
+    code = fields.Char('Code')
+    project_id = fields.Many2one('project.project', "Project")
+    person_name = fields.Char('Person Name')
+    person_description = fields.Text('Person Description')
diff --git a/odex25_project/project_scrum_agile/models/project_scrum_sandbox.py b/odex25_project/project_scrum_agile/models/project_scrum_sandbox.py
new file mode 100644
index 000000000..673be9d80
--- /dev/null
+++ b/odex25_project/project_scrum_agile/models/project_scrum_sandbox.py
@@ -0,0 +1,28 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class ProjectScrumSandbox(models.Model):
+    _name = 'project.scrum.sandbox'
+    _description = 'Project Scrum Sandbox'
+
+    role_id = fields.Many2one('res.partner', "Who", required=True)
+    name = fields.Char('Wants', required=True)
+    for_then = fields.Char('For', required=True)
+    project_id = fields.Many2one(
+        'project.project',
+        "Project",
+        required=True,
+        domain=[('is_scrum', '=', True)]
+    )
+    developer_id = fields.Many2one(
+        'res.users',
+        'Author',
+        default=lambda self: self.env.user
+    )
+    create_date = fields.Date('Date taken')
+    meeting_id = fields.Many2one(
+        'project.scrum.meeting',
+        'Meeting'
+    )
diff --git a/odex25_project/project_scrum_agile/security/ir.model.access.csv b/odex25_project/project_scrum_agile/security/ir.model.access.csv
new file mode 100644
index 000000000..a4eba87eb
--- /dev/null
+++ b/odex25_project/project_scrum_agile/security/ir.model.access.csv
@@ -0,0 +1,62 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_scrum_project_owner,project_scrum.project_owner,project.model_project_project,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_project_master,project_scrum.scrum_project_master,project.model_project_project,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_project_developer,project_scrum.project_developer,project.model_project_project,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_scrum_task_owner,project_scrum.scrum_task_owner,project.model_project_task,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_task_master,project_scrum.scrum_task_master,project.model_project_task,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_task_developer,project_scrum.scrum_task_developer,project.model_project_task,project_scrum_agile.group_scrum_developer,1,1,1,1
+,,,,,,,
+access_scrum_product_backlog_owner,project_scrum.scrum_product_backlog_owner,model_project_scrum_product_backlog,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_product_backlog_master,project_scrum.scrum_product_backlog_master,model_project_scrum_product_backlog,project_scrum_agile.group_scrum_master,1,1,0,0
+access_scrum_product_backlog_developer,project_scrum.scrum_product_backlog_developer,model_project_scrum_product_backlog,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_scrum_sprint_owner,project_scrum.scrum_sprint_owner,model_project_scrum_sprint,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_sprint_master,project_scrum.scrum_sprint_master,model_project_scrum_sprint,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_sprint_developer,project_scrum.scrum_sprint_developer,model_project_scrum_sprint,project_scrum_agile.group_scrum_developer,1,1,1,1
+,,,,,,,
+access_scrum_meeting_owner,projectScrum.scrum_meeting_owner,model_project_scrum_meeting,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_meeting_master,projectScrum.scrum_meeting_master,model_project_scrum_meeting,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_meeting_developer,projectScrum.scrum_meeting_developer,model_project_scrum_meeting,project_scrum_agile.group_scrum_developer,1,1,1,0
+,,,,,,,
+access_scrum_release_owner,project_scrum.scrum_release_owner,model_project_scrum_release,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_release_master,project_scrum.scrum_release_master,model_project_scrum_release,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_release_developer,project_scrum.scrum_release_developer,model_project_scrum_release,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_scrum_sandbox_owner,projectScrum.scrum_sandbox.owner,model_project_scrum_sandbox,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_sandbox_master,projectScrum.scrum_sandbox.master,model_project_scrum_sandbox,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_sandbox_developer,projectScrum.scrum_sandbox.developer,model_project_scrum_sandbox,project_scrum_agile.group_scrum_developer,1,1,1,1
+,,,,,,,
+access_scrum_devteam_owner,projectScrum.scrum_devteam_owner,model_project_scrum_devteam,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_devteam_master,projectScrum.scrum_devteam_master,model_project_scrum_devteam,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_devteam_developer,projectScrum.scrum_devteam_developer,model_project_scrum_devteam,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_scrum_burndown_owner,projectScrum.scrum_burndown_owner,model_project_scrum_sprint_burndown_log,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_burndown_master,projectScrum.scrum_burndown_master,model_project_scrum_sprint_burndown_log,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_burndown_developer,projectScrum.scrum_burndown_developer,model_project_scrum_sprint_burndown_log,project_scrum_agile.group_scrum_developer,1,1,1,1
+,,,,,,,
+access_scrum_analytic_line_owner,project_scrum.scrum_analytic_line_owner,model_account_analytic_line,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_analytic_line_master,project_scrum.scrum_analytic_line_master,model_account_analytic_line,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_analytic_line_developer,project_scrum.scrum_analytic_line_developer,model_account_analytic_line,project_scrum_agile.group_scrum_developer,1,1,1,1
+,,,,,,,
+access_scrum_role_owner,projectScrum.scrum_role_owner,model_project_scrum_role,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_role_master,projectScrum.scrum_role_master,model_project_scrum_role,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_role_developer,projectScrum.scrum_role_developer,model_project_scrum_role,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_scrum_res_partner_developer,ProjectScrum.scrum_res_partner_developer,base.model_res_partner,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_scrum_backlog_owner,project_scrum.backlog_owner,model_project_scrum_sandbox_to_backlog,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_scrum_backlog_master,project_scrum.backlog_master,model_project_scrum_sandbox_to_backlog,project_scrum_agile.group_scrum_master,1,1,1,1
+access_scrum_backlog_developer,project_scrum.backlog_developer,model_project_scrum_sandbox_to_backlog,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_project_scrum_email_owner,access_project_scrum_email_owner,model_project_scrum_email,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_project_scrum_email_master,access_project_scrum_email_master,model_project_scrum_email,project_scrum_agile.group_scrum_master,1,1,1,1
+access_project_scrum_email_developer,access_project_scrum_email_developer,model_project_scrum_email,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_hr_analytic_timesheet_start_time_owner,access_hr_analytic_timesheet_start_time_owner,model_hr_analytic_timesheet_start_time,project_scrum_agile.group_scrum_owner,1,1,1,1
+access_hr_analytic_timesheet_start_time_master,access_hr_analytic_timesheet_start_time_owner,model_hr_analytic_timesheet_start_time,project_scrum_agile.group_scrum_master,1,1,1,1
+access_hr_analytic_timesheet_start_time_developer,access_hr_analytic_timesheet_start_time_owner,model_hr_analytic_timesheet_start_time,project_scrum_agile.group_scrum_developer,1,0,0,0
+,,,,,,,
+access_project_create_task_owner,access_project_scrum_backlog_create_task_owner,model_project_scrum_backlog_create_task,group_scrum_owner,1,1,1,1
+access_project_create_task_master,access_project_scrum_backlog_create_task_master,model_project_scrum_backlog_create_task,group_scrum_master,1,1,1,1
+access_project_create_task_developer,access_project_scrum_backlog_create_task_developer,model_project_scrum_backlog_create_task,group_scrum_developer,1,1,1,1
diff --git a/odex25_project/project_scrum_agile/security/project_scrum_security.xml b/odex25_project/project_scrum_agile/security/project_scrum_security.xml
new file mode 100644
index 000000000..6e8b05db4
--- /dev/null
+++ b/odex25_project/project_scrum_agile/security/project_scrum_security.xml
@@ -0,0 +1,32 @@
+<odoo>
+
+    <record model="ir.module.category" id="module_category_project_scrum">
+        <field name="name">Project Scrum</field>
+    </record>
+
+    <record model="res.groups" id="group_scrum_master">
+        <field name="name">Scrum Master</field>
+        <field name="category_id" ref="module_category_project_scrum"/>
+        <field name="implied_ids"
+               eval="[(4, ref('project.group_project_user'))]"/>
+    </record>
+
+    <record model="res.groups" id="group_scrum_developer">
+        <field name="name">Developer</field>
+        <field name="category_id" ref="module_category_project_scrum"/>
+        <field name="implied_ids"
+               eval="[(4, ref('project.group_project_user'))]"/>
+    </record>
+
+    <record model="res.groups" id="group_scrum_owner">
+        <field name="name">Product Owner</field>
+        <field name="category_id" ref="module_category_project_scrum"/>
+        <field name="implied_ids"
+               eval="[(4, ref('project.group_project_user'))]"/>
+        <field name="users" eval="[(4,ref('base.user_admin'))]"/>
+    </record>
+
+    <!-- todo : so that the leader can add a member to the team, he must be 
+        in the group group_system (Administration : Droit d'accès) -->
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/static/description/Project Scrum Management Agile Methodology 1.jpg b/odex25_project/project_scrum_agile/static/description/Project Scrum Management Agile Methodology 1.jpg
new file mode 100644
index 000000000..580f523c9
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/Project Scrum Management Agile Methodology 1.jpg differ
diff --git a/odex25_project/project_scrum_agile/static/description/Project-Scrum-Management-Agile-banner.png b/odex25_project/project_scrum_agile/static/description/Project-Scrum-Management-Agile-banner.png
new file mode 100644
index 000000000..673354cef
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/Project-Scrum-Management-Agile-banner.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/arrow_img-left.png b/odex25_project/project_scrum_agile/static/description/arrow_img-left.png
new file mode 100644
index 000000000..864da371f
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/arrow_img-left.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/arrow_img-right.png b/odex25_project/project_scrum_agile/static/description/arrow_img-right.png
new file mode 100644
index 000000000..82547fe0a
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/arrow_img-right.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/backlog_1.jpg b/odex25_project/project_scrum_agile/static/description/backlog_1.jpg
new file mode 100644
index 000000000..99ed27094
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/backlog_1.jpg differ
diff --git a/odex25_project/project_scrum_agile/static/description/chart_3.jpg b/odex25_project/project_scrum_agile/static/description/chart_3.jpg
new file mode 100644
index 000000000..5d9473bbc
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/chart_3.jpg differ
diff --git a/odex25_project/project_scrum_agile/static/description/chart_4.jpg b/odex25_project/project_scrum_agile/static/description/chart_4.jpg
new file mode 100644
index 000000000..a2bb15ca3
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/chart_4.jpg differ
diff --git a/odex25_project/project_scrum_agile/static/description/chart_5.jpg b/odex25_project/project_scrum_agile/static/description/chart_5.jpg
new file mode 100644
index 000000000..f47cd2b17
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/chart_5.jpg differ
diff --git a/odex25_project/project_scrum_agile/static/description/customise.png b/odex25_project/project_scrum_agile/static/description/customise.png
new file mode 100644
index 000000000..f1db65230
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/customise.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/div-bg.png b/odex25_project/project_scrum_agile/static/description/div-bg.png
new file mode 100644
index 000000000..de0429657
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/div-bg.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/header-logo.png b/odex25_project/project_scrum_agile/static/description/header-logo.png
new file mode 100644
index 000000000..89e9a4112
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/header-logo.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/hire.png b/odex25_project/project_scrum_agile/static/description/hire.png
new file mode 100644
index 000000000..eb5d592b0
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/hire.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icon.png b/odex25_project/project_scrum_agile/static/description/icon.png
new file mode 100644
index 000000000..ec8140cbe
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icon.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/FSM.png b/odex25_project/project_scrum_agile/static/description/icons/FSM.png
new file mode 100644
index 000000000..144308d3f
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/FSM.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/HRMS.png b/odex25_project/project_scrum_agile/static/description/icons/HRMS.png
new file mode 100644
index 000000000..1d2d350f0
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/HRMS.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/Project-Scrum-Portal-Icon.png b/odex25_project/project_scrum_agile/static/description/icons/Project-Scrum-Portal-Icon.png
new file mode 100644
index 000000000..d032a71d7
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/Project-Scrum-Portal-Icon.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/Web-Auto-Reload-Refresh-icn.png b/odex25_project/project_scrum_agile/static/description/icons/Web-Auto-Reload-Refresh-icn.png
new file mode 100644
index 000000000..422278609
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/Web-Auto-Reload-Refresh-icn.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/Web-Email-Interface-icn.png b/odex25_project/project_scrum_agile/static/description/icons/Web-Email-Interface-icn.png
new file mode 100644
index 000000000..3eec793f1
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/Web-Email-Interface-icn.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/azure_sso.png b/odex25_project/project_scrum_agile/static/description/icons/azure_sso.png
new file mode 100644
index 000000000..a8c1fc480
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/azure_sso.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/biometrics.png b/odex25_project/project_scrum_agile/static/description/icons/biometrics.png
new file mode 100644
index 000000000..7490441fe
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/biometrics.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/education.png b/odex25_project/project_scrum_agile/static/description/icons/education.png
new file mode 100644
index 000000000..d56507d27
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/education.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/fleet.png b/odex25_project/project_scrum_agile/static/description/icons/fleet.png
new file mode 100644
index 000000000..2623f8894
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/fleet.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/freight_mgt.png b/odex25_project/project_scrum_agile/static/description/icons/freight_mgt.png
new file mode 100644
index 000000000..61caf1dc9
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/freight_mgt.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/gym.png b/odex25_project/project_scrum_agile/static/description/icons/gym.png
new file mode 100644
index 000000000..c2b76d604
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/gym.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/hotel.png b/odex25_project/project_scrum_agile/static/description/icons/hotel.png
new file mode 100644
index 000000000..c5c8850b6
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/hotel.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/hr_attendance.jpeg b/odex25_project/project_scrum_agile/static/description/icons/hr_attendance.jpeg
new file mode 100644
index 000000000..3f58727c0
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/hr_attendance.jpeg differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/office365.png b/odex25_project/project_scrum_agile/static/description/icons/office365.png
new file mode 100644
index 000000000..16e69773c
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/office365.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/popup.png b/odex25_project/project_scrum_agile/static/description/icons/popup.png
new file mode 100644
index 000000000..8b97ac147
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/popup.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/property.png b/odex25_project/project_scrum_agile/static/description/icons/property.png
new file mode 100644
index 000000000..039070143
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/property.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/ring.png b/odex25_project/project_scrum_agile/static/description/icons/ring.png
new file mode 100644
index 000000000..478043305
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/ring.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/sale_dost.png b/odex25_project/project_scrum_agile/static/description/icons/sale_dost.png
new file mode 100644
index 000000000..040a0bd59
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/sale_dost.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/singapore.png b/odex25_project/project_scrum_agile/static/description/icons/singapore.png
new file mode 100644
index 000000000..2541bb482
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/singapore.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/spa-salon.png b/odex25_project/project_scrum_agile/static/description/icons/spa-salon.png
new file mode 100644
index 000000000..3326ccb8a
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/spa-salon.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/user_mailbox.png b/odex25_project/project_scrum_agile/static/description/icons/user_mailbox.png
new file mode 100644
index 000000000..e9005af57
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/user_mailbox.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/icons/visa.png b/odex25_project/project_scrum_agile/static/description/icons/visa.png
new file mode 100644
index 000000000..285f72ee8
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/icons/visa.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/implementation.png b/odex25_project/project_scrum_agile/static/description/implementation.png
new file mode 100644
index 000000000..ccf343364
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/implementation.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/index.html b/odex25_project/project_scrum_agile/static/description/index.html
new file mode 100644
index 000000000..5cb2aa8a9
--- /dev/null
+++ b/odex25_project/project_scrum_agile/static/description/index.html
@@ -0,0 +1,1046 @@
+
+<style>
+    @media (max-width: 768px) {
+    .bg-none {
+        display:none;
+    }
+    .bg-gray{
+    background-color:#f3f3f3;
+    }
+    .oe_styling_v8 b {
+    font-weight: 400;
+    font-size: 14px;
+    }
+    .oe_styling_v8 b {
+    font-weight: 400;
+    font-size: 14px;
+    }
+}
+</style>
+<div class="container">
+    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~ HEADER ~~~~~~~~~~~~~~~~~~~~~~~~-->
+    <!-- SerpentCS Logo -->
+    <div class="row">
+        <div class="col-md-12 mt32 mb32">
+            <a class="float-right" href="https://www.serpentcs.com" target="_blank">
+                <img src="header-logo.png" alt="SerpentCS Logo"/>
+            </a>
+        </div>
+    </div>
+    
+    <!-- Heading and Available Version links New SC-->
+    <section class="oe_container">
+        <div class="row o_equal_col_sm position-relative overflow-hidden shadow"
+             style="margin:0 auto;background-color: #C3282D;padding-bottom:0;border-radius:10px;">
+            <div class="container fixed-bottom position-relative"
+                 style="display:block;margin:0 auto;text-align:center;color:#fff">
+                <div class="row">
+                    <div class="col-lg-12 align-items-top d-inline-flex align-items-top px-5 mt64 mb32">
+                        <div class="text-left">
+                            <h2 style="letter-spacing:2px;font-weight:900;color:#fff;text-transform:uppercase;font-size:26px;font-family:'Montserrat', sans-serif">
+                                Project Scrum Management Agile Methodology
+                            </h2>
+                            <span class="o_gradient"
+                                  style="width:150px;height:1px;background-color:#ffffff!important;display:inline-block;border-radius:2px;"></span>
+                            <p style="font-weight:normal;color:#fff;font-size:16px;margin-top:24px;font-family:'Montserrat', sans-serif;">
+                                The Scrum projects and tasks inherit from the real projects and tasks, So you can continue working on normal tasks that will also include tasks from Scrum projects. Following menus will be added to the system:
+                            </p>
+                           <h3 class="mt-3 mb-3">Scrum:</h3>
+                            <div class="d-flex">
+                                <p style="color:#ffffff;font-size:14px;font-weight:bold;font-family:'Montserrat', sans-serif;">
+                                    <i class="fa fa-circle"></i> Product Backlog
+                                    <i class="fa fa-circle ml-2"></i> Sandbox
+                                    <i class="fa fa-circle ml-2"></i> Sprints
+                                    <i class="fa fa-circle ml-2"></i> Sprint Releases
+                                    <i class="fa fa-circle ml-2"></i> Scrum Meeting
+                                </p>
+                            </div>
+                            <div class="mt16 mb16">
+                                <ul class="navbar-nav flex-row ml-md-auto"
+                                    style="color:#ffffff;font-size:16px;font-weight:bold;font-family:'Montserrat', sans-serif;">
+                                    <li class="nav-item">
+                                        <a class="nav-link p-2" 
+											href="https://apps.odoo.com/apps/modules/13.0/project_scrum_agile/" 
+											target="_blank" aria-label="13.0" style="color:#fff;">
+                                            V 13.0
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link p-2"
+                                           href="https://apps.odoo.com/apps/modules/12.0/project_scrum_agile/"
+                                           target="_blank" aria-label="12.0" style="color:#fff;">
+                                            V 12.0
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link p-2"
+                                           href="https://apps.odoo.com/apps/modules/11.0/project_scrum_agile/"
+                                           target="_blank" aria-label="11.0" style="color:#fff;">
+                                            V 11.0
+                                        </a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link p-2"
+                                           href="https://apps.odoo.com/apps/modules/10.0/project_scrum_agile/"
+                                           target="_blank" aria-label="10.0" style="color: #fff;">
+                                            V 10.0
+                                        </a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <!-- Key Features and You tube video link -->
+    <section class="oe_container">
+        <div class="row o_equal_col_sm position-relative overflow-hidden" style="margin:0 auto;padding-bottom:0;">
+            <div class="container fixed-bottom position-relative" style="display:block;margin:0 auto;text-align:center;">
+                <div class="row"> 
+                    <div class="col-lg-12 align-items-top d-inline-flex align-items-top px-5 mt64 mb32">
+                        <div class="text-left" style="width:100%;">
+                            <h2 style="letter-spacing:2px;font-weight:900;color:#000;text-transform:uppercase;font-family:'Montserrat', sans-serif">
+                                Key Features
+                            </h2>
+                             <span class="o_gradient" style="width:150px;height:2px;background-image:linear-gradient(90deg, #e52d27 20%, #b31217 80%)!important;display:inline-block;border-radius:2px;"></span>
+                            <div class="row">
+                                <div class="col-md-6 mt16 mb16" style="display:flex;font-family: 'Montserrat', sans-serif;">
+                                    <div>
+                                        <div style="color:#333333;font-size:18px;font-weight:bold;">
+                                            Project roles
+                                        </div>
+                                        <div class="mt16" style="font-size:16px">
+                                            <ul class="list-unstyled">
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color: #C3282D;line-height: 20px;font-size: 15px;"></i> 
+                                                    Scrum Master
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color: #C3282D;line-height: 20px;font-size: 15px;"></i> 
+                                                    Product Owner
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color: #C3282D;line-height: 20px;font-size: 15px;"></i> 
+                                                    Development Team
+                                                </li>
+                                            </ul>
+                                        </div>
+                                        <div style="color:#333333;font-size:18px;font-weight:bold;">
+                                            Sandbox
+                                        </div>
+                                        <div class="mt16" style="font-size:16px">
+                                            <ul class="list-unstyled">
+                                                <li class="mb8"> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    A developer of development team can add a user story to sandbox
+                                                </li>
+                                                <li class="mb8"> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    The product owner can valid it (transfer into product backlog) or delete it
+                                                </li>
+                                            </ul>
+                                        </div>
+                                        <div style="color:#333333; font-size:18px; font-weight:bold;">
+                                            Sprints
+                                        </div>
+                                        <div class="mt16" style="font-size:16px">
+                                            <ul class="list-unstyled">
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    date_start and date_stop
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    Standup meetings for each user of team
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    Sprint review
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    Sprint retrospective
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    Planned velocity (you write velocity desired and displayed on Sprint Velocity Chart)
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    Effective velocity (it is computed by all users stories affected to the sprint)
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color:#C3282D;line-height:20px;font-size:15px;"></i>
+                                                    Effective velocity done (it is computed by all users stories done and displayed on Sprint Velocity Chart)
+                                                </li>
+                                            </ul>
+                                        </div>
+                                        <div style="color:#333333;font-size:18px;font-weight:bold;">
+                                            Display Charts
+                                        </div>
+                                        <div class="mt16" style="font-size:16px">
+                                            <ul class="list-unstyled">
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color: #C3282D;line-height: 20px;font-size: 15px;"></i> 
+                                                    Burdown Chart (based on story points)
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color: #C3282D;line-height: 20px;font-size: 15px;"></i> 
+                                                    Sprints Velocity (for each Scrum project)
+                                                </li>
+                                            </ul>
+                                        </div>
+                                        <div style="color:#333333;font-size:18px;font-weight:bold;">
+                                            The concepts of project management module:
+                                        </div>
+                                        <div class="mt16" style="font-size:16px">
+                                            <ul class="list-unstyled">
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color: #C3282D;line-height: 20px;font-size: 15px;"></i> 
+                                                   Mid-term, Long-term Road-map
+                                                </li>
+                                                <li> <i class="fa fa-check mr-2 text-center shadow-lg" style="color:#fff;width:20px;height:20px;border-radius:50%;background-color: #C3282D;line-height: 20px;font-size: 15px;"></i> 
+                                                    Customers/Functional Requests VS Technical Ones
+                                                </li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-6 p-16">
+                                    <div class="s_panel_video" data-video-id="5Za9ShZfa5s" style="cursor:pointer;">
+                                        <img class="img-fluid s_tooltip_tabs_tooltip_image s_figure_link pb0" src="Project Scrum Management Agile Methodology 1.jpg" alt="Project Scrum Management Agile Methodology">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div> 
+            </div>
+        </div>
+    </section>
+    
+    
+    <!-- App Featured Screenshots -->
+    <section class="oe_container mt32">
+        <div class="row o_equal_col_sm position-relative overflow-hidden" style="margin:0 auto;padding-bottom:0;">
+            <div class="container fixed-bottom position-relative mt8" style="display:block;margin:0 auto;">
+                <div class="row">
+                    <div class="col-lg-12 align-items-top d-inline-flex align-items-top px-5">
+                        <div class="text-left" style="width:100%;">
+                            <h2 style="letter-spacing:2px;font-weight:900;color:#000;text-transform:uppercase;font-family:'Montserrat', sans-serif">
+                                Featured Screenshots
+                            </h2>
+                            <span class="o_gradient"
+                                  style="width:150px;height:2px;background-image:linear-gradient(90deg, #e52d27 20%, #b31217 80%)!important;display:inline-block;border-radius:2px;">
+                            </span>
+                        </div>
+                    </div>
+                    <div class="container px-5">
+                        <div class="container position-relative">
+                            <div class="row bg-white">
+                                <div class="col-md-12 p-0 overflow-hidden">
+                                    <div>
+                                        <div id="carousel_bridges" class="carousel slide oe_spaced"
+                                             data-ride="carousel">
+                                            <div class="carousel-inner">
+
+                                                <!-- Carousel Item 1 -->
+                                                <div class="carousel-item active" style="min-height:190.4px;">
+                                                    <!-- Must set active class in first slide -->
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto px-5">
+                                                            <div class="mt16 mb16">
+                                                                <img src="backlog_1.jpg"
+                                                                     class="img img-responsive center-block shadow"
+                                                                     alt="Project Scrum Management Agile Methodology"
+                                                                     style="max-width:95%;display:block;margin:auto;border:10px solid #dee2e6;border-radius:10px;">
+                                                            </div>
+                                                            </div>
+                                                            <div class="col-md-12 mt16 mb16">
+                                                                <h3 class="text-left ml8"
+                                                                    style="font-family:'Montserrat', sans-serif;font-weight:900;color:#091E42;">
+                                                                    </br>Product Backlogs
+                                                                </h3>
+                                                            </div>
+                                                            <div class="col-md-12 mt16 mb16">
+                                                            <ul class="mb32"
+                                                                style="font-family:'Montserrat', sans-serif;color:#000;font-size:16px;">
+                                                                <li class="mb8">Product Backlogs Make Your Project Easy
+                                                                </li>
+                                                                <div id="sc1" class="collapse">
+                                                                <li class="mb8">New kanban view
+                                                                </li>
+                                                                <li class="mb8">date_open and date_done
+                                                                </li>
+                                                                <li class="mb8">Story Complexity Points
+                                                                </li>
+                                                                <li class="mb8">Text area for describe tests acceptance
+                                                                </li>
+                                                                </div>
+                                                                 <a class="btn btn-sm text-dark" data-toggle="collapse" data-target="#sc1">Read More</a>
+                                                            </ul>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <!-- Carousel Item 2 -->
+                                                <div class="carousel-item" style="min-height:190.4px;">
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto px-5">
+                                                            <div class="mt16 mb16">
+                                                                <img src="sprint_2.jpg"
+                                                                     class="img img-responsive center-block shadow"
+                                                                     alt="Project Scrum Management Agile Methodology"
+                                                                     style="max-width:95%;display:block;margin:auto;border:10px solid #dee2e6;border-radius:10px;">
+                                                            </div>
+                                                            <div class="col-md-12 mt16 mb16">
+                                                                <h3 class="text-left ml8"
+                                                                    style="font-family:'Montserrat', sans-serif;font-weight:900;color:#091E42;">
+                                                                    </br>Sprint Planning	
+                                                                </h3>
+                                                            </div>
+                                                            <ul class="mb32"
+                                                                style="font-family:'Montserrat', sans-serif;color:#000;font-size:16px;">
+                                                                <li class="mb8">User Stories
+                                                                </li>
+                                                                <div id="sc2" class="collapse">
+                                                                <li class="mb8">Daily Meeting
+                                                                </li>
+                                                                <li class="mb8">Sprint Review
+                                                                </li>
+                                                                <li class="mb8">Sprint Retrospective
+                                                                </li>
+                                                                <li class="mb8">BurnDown Charts
+                                                                </li>
+                                                                <li class="mb8">Pick tasks from the backlog to be completed in your first Sprint,You can decide a time<br> length that works for you.
+                                                                </li>
+                                                                </div>
+                                                                <a class="btn btn-sm text-dark" data-toggle="collapse" data-target="#sc2">Read More</a>
+                                                            </ul>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+
+                                                <!-- Carousel Item 3 -->
+                                                <div class="carousel-item" style="min-height:190.4px;">
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto px-5">
+                                                            <div class="mt16 mb16">
+                                                                <img src="chart_3.jpg"
+                                                                     class="img img-responsive center-block shadow"
+                                                                     alt="Project Scrum Management Agile Methodology"
+                                                                     style="max-width:95%;display:block;margin:auto;border:10px solid #dee2e6;border-radius:10px;">
+                                                            </div>
+                                                            <div class="col-md-12 mt16 mb16">
+                                                                <h3 class="text-left ml8"
+                                                                    style="font-family:'Montserrat', sans-serif;font-weight:900;color:#091E42;">
+                                                                    </br>
+                                                                </h3>
+                                                            </div>
+                                                            <ul class="mb32"
+                                                                style="font-family:'Montserrat', sans-serif;color:#000;font-size:16px;">
+                                                                <li class="mb8">Bar Chart
+                                                                </li>
+                                                            </ul>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <!-- Carousel Item 4 -->
+                                                <div class="carousel-item" style="min-height:190.4px;">
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto px-5">
+                                                            <div class="mt16 mb16">
+                                                                <img src="chart_4.jpg"
+                                                                     class="img img-responsive center-block shadow"
+                                                                     alt="Project Scrum Management Agile Methodology"
+                                                                     style="max-width:95%;display:block;margin:auto;border:10px solid #dee2e6;border-radius:10px;">
+                                                            </div>
+                                                            <div class="col-md-12 mt16 mb16">
+                                                                <h3 class="text-left ml8"
+                                                                    style="font-family:'Montserrat', sans-serif;font-weight:900;color:#091E42;">
+                                                                    </br>
+                                                                </h3>
+                                                            </div>
+                                                            <ul class="mb32"
+                                                                style="font-family:'Montserrat', sans-serif;color:#000;font-size:16px;">
+                                                                <li class="mb8">Line Chart
+                                                                </li>
+                                                            </ul>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <!-- Carousel Item 5 -->
+                                                <div class="carousel-item" style="min-height:190.4px;">
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto px-5">
+                                                            <div class="mt16 mb16">
+                                                                <img src="chart_5.jpg"
+                                                                     class="img img-responsive center-block shadow"
+                                                                     alt="Project Scrum Management Agile Methodology"
+                                                                     style="max-width:95%;display:block;margin:auto;border:10px solid #dee2e6;border-radius:10px;">
+                                                            </div>
+                                                            <div class="col-md-12 mt16 mb16">
+                                                                <h3 class="text-left ml8"
+                                                                    style="font-family:'Montserrat', sans-serif;font-weight:900;color:#091E42;">
+                                                                    </br>
+                                                                </h3>
+                                                            </div>
+                                                            <ul class="mb32"
+                                                                style="font-family:'Montserrat', sans-serif;color:#000;font-size:16px;">
+                                                                <li class="mb8">Pie Chart
+                                                                </li>
+                                                            </ul>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+
+                                                <!-- Carousel Item 6 -->
+                                                <div class="carousel-item" style="min-height:190.4px;">
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto px-5">
+                                                            <div class="mt16 mb16">
+                                                                <img src="meeting_6.jpg"
+                                                                     class="img img-responsive center-block shadow"
+                                                                     alt="Project Scrum Management Agile Methodology"
+                                                                     style="max-width:95%;display:block;margin:auto;border:10px solid #dee2e6;border-radius:10px;">
+                                                            </div>
+                                                            <div class="col-md-12 mt16 mb16">
+                                                                <h3 class="text-left ml8"
+                                                                    style="font-family:'Montserrat', sans-serif;font-weight:900;color:#091E42;">
+                                                                    </br>Daily Scrum Meeting
+                                                                </h3>
+                                                            </div>
+                                                            <ul class="mb32"
+                                                                style="font-family:'Montserrat', sans-serif;color:#000;font-size:16px;">
+                                                                <li class="mb8">Daily Meeting make Your Product Better.
+                                                                </li>
+                                                                 <div id="sc6" class="collapse">
+                                                                <li class="mb8">Meeting Creation
+                                                                </li>
+                                                                <li class="mb8">Rescheduling
+                                                                </li>
+                                                                <li class="mb8">Email Generation
+                                                                </li>
+                                                                <li class="mb8">Time to start working on Sprint!.Team members work on their tasks, and everybody checks<br> in on their progress at the Daily Scrum Meeting
+                                                                </li>
+                                                                 </div>
+                                                                <a class="btn btn-sm text-dark" data-toggle="collapse" data-target="#sc6">Read More</a>
+                                                            </ul>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                            <!-- Carousel Control left, right button -->
+                                            <a class="carousel-control-prev" href="#carousel_bridges" role="button"
+                                               data-slide="prev"
+                                               style="width:1%;justify-content:flex-start;-webkit-justify-content:flex-start;">
+                                                <span class="carousel-control-prev-icon">
+                                                    <img class="img" src="arrow_img-left.png" alt="arrow-left"/>
+                                                </span>
+                                            </a>
+                                            <a class="carousel-control-next" href="#carousel_bridges" role="button"
+                                               data-slide="next"
+                                               style="width:1%;justify-content: flex-end;-webkit-justify-content:flex-end;right:15px;">
+                                                <span class="carousel-control-next-icon">
+                                                    <img class="img" src="arrow_img-right.png" alt="arrow-right"/>
+                                                </span>
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+      
+    </section>
+
+   
+    
+    <!-- Suggested Apps -->
+    <section class="oe_container mt32 mb64">
+
+        <div class="row o_equal_col_sm position-relative overflow-hidden" style="margin:0 auto;padding-bottom:0;">
+            <!--<img src="div-bg.png" class="img position-absolute w-100 h-100 bg-none" alt="background image">-->
+            <div class="container fixed-bottom position-relative" style="display:block;margin:0 auto;">
+                <div class="row mt32 mb32">
+                    <div class="col-lg-12 align-items-top d-inline-flex align-items-top px-5">
+                        <div class="text-left" style="width:100%;">
+                            <h2 style="letter-spacing:2px;font-weight:900;color:#000;text-transform:uppercase;font-family:'Montserrat', sans-serif">
+                                Suggested Apps
+                            </h2>
+                            <span class="o_gradient"
+                                  style="width:150px;height:2px;background-image:linear-gradient(90deg, #e52d27 20%, #b31217 80%)!important;display:inline-block;border-radius:2px;"></span>
+                        </div>
+                    </div>
+                    <div class="container mb32">
+                        <div class=" position-relative">
+                            <div class="row">
+                                <div class="col-md-12   overflow-hidden">
+                                    <div>
+                                        <div id="carousel_suggested" class="carousel slide oe_spaced"
+                                             data-ride="carousel">
+                                            <div class="carousel-inner">
+
+                                                <!-- Carousel Item 1 -->
+                                                <div class="carousel-item active" style="min-height:190.4px;">
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold;font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/project_scrum_portal/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/Project-Scrum-Portal-Icon.png"
+                                                                             alt="Project Scrum Portal Agile"/>
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>Project Scrum<br>Portal Agile</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold; font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/odoo_microsoft_account/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/azure_sso.png"
+                                                                             alt="Microsoft Azure Odoo SSO Integration">
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>Microsoft Azure<br>Odoo SSO<br>Integration</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold; font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/scs_freight/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/freight_mgt.png"
+                                                                             alt="Freight Management">
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>Freight<br>Management</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold; font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/hr_attendances_overtime/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/hr_attendance.jpeg"
+                                                                             alt="HR Attendance OverTime">
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>HR Attendance<br>OverTime</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <!-- Carousel Item 2 -->
+                                                <div class="carousel-item" style="min-height:190.4px;">
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold;font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/odoo_office365_calendar/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/office365.png"
+                                                                             alt="Odoo Office 365 Calendar Integration"/>
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>Odoo Office<br>365 Calendar<br>Integration</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold; font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/popup_reminder/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/popup.png" alt="Pop-up Reminder">
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>Pop-up<br>Reminder</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold; font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/sale_dost/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/sale_dost.png"
+                                                                             alt="DOST-Delivery Order Signed and Tracked">
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>DOST-Delivery<br>Order Signed<br>and Tracked</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold; font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/user_mailbox/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/user_mailbox.png"
+                                                                             alt="User Mailbox">
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>User Mailbox</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <!-- Carousel Item 3 -->
+                                                <div class="carousel-item" style="min-height:190.4px;">
+                                                    <div class="row justify-content-center">
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold;font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/web_auto_reload/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/Web-Auto-Reload-Refresh-icn.png"
+                                                                             alt="Web Auto Refresh and Reload"/>
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>Web Auto<br>Refresh</br> and Reload</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-auto">
+                                                            <div class="d-flex flex-column" style="width:max-content">
+                                                                <h3 class="mt16"
+                                                                    style="font-weight: bold; font-family:'Montserrat', sans-serif">
+                                                                    <a style="color:#000;"
+                                                                       href="https://apps.odoo.com/apps/modules/14.0/web_email/"
+                                                                       target="_blank"
+                                                                       style="font-family:'Montserrat', sans-serif;">
+                                                                        <img class="img m-auto shadow"
+                                                                             style="width:120px;font-size:16px"
+                                                                             src="icons/Web-Email-Interface-icn.png"
+                                                                             alt="Web Auto Refresh and Reload">
+                                                                        <div class="text-center mt-4"
+                                                                             style="font-size:16px;">
+                                                                            <b>Odoo as<br>Inbox Email<br>Interfaces</b>
+                                                                        </div>
+                                                                    </a>
+                                                                </h3>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                            <!-- Carousel Control left, right button -->
+                                            <a class="carousel-control-prev" href="#carousel_suggested" role="button"
+                                               data-slide="prev"
+                                               style="justify-content:flex-start;-webkit-justify-content:flex-start;width:8%;">
+                                                                                        <span>
+                                                                                            <img class="img"
+                                                                                                 src="arrow_img-left.png"
+                                                                                                 alt="arrow-left"/>
+                                                                                        </span>
+                                            </a>
+                                            <a class="carousel-control-next" href="#carousel_suggested" role="button"
+                                               data-slide="next"
+                                               style="justify-content:flex-end;-webkit-justify-content:flex-end;width:8%;">
+                                                                                        <span>
+                                                                                            <img class="img"
+                                                                                                 src="arrow_img-right.png"
+                                                                                                 alt="arrow-right"/>
+                                                                                        </span>
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+     <!-- Business Solutions -->
+    <section class="oe_container mt32 mb64">
+        <div class="row o_equal_col_sm position-relative overflow-hidden" style="margin:0 auto;padding-bottom:0;">
+            <div class="container fixed-bottom position-relative"
+                 style="display:block;margin:0 auto;text-align:center;">
+                <div class="row">
+                    <div class="col-lg-12 align-items-top d-inline-flex align-items-top">
+                        <div class="text-left" style="width:100%;">
+                            <h2 style="letter-spacing:2px;font-weight:900;color:#000;text-transform:uppercase;font-family:'Montserrat', sans-serif">
+                                Business Solutions
+                            </h2>
+                            <span class="o_gradient"
+                                  style="width: 150px;height:2px;background-image: linear-gradient(90deg, #e52d27 20%, #b31217 80%) !important; display: inline-block;border-radius: 2px;"></span>
+                            <div class="row">
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/13.0/school/" target="_blank"
+                                           style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/education.png" alt="Education" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight: bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Education Management
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/12.0/property/#resetCollapse"
+                                           target="_blank" style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/property.png" alt="Property" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Property Management
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/browse?search=Singapore"
+                                           target="_blank" style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/singapore.png" alt="Singapore" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Singapore Localization
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/13.0/gym_management_system/"
+                                           target="_blank" style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/gym.png" alt="Gym" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Gym Management
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/13.0/servisa/" target="_blank"
+                                           style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/visa.png" alt="Visa" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Visa Management
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://www.youtube.com/watch?v=eTETD5lma3w&t=97s" target="_blank"
+                                           style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/biometrics.png" alt="Biometrics" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Biometrics
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://www.youtube.com/watch?v=VQK8v-FAHRU&list=PL4Wugt3LKrSTjlgmyiwEDdkSGyb008QNX&index=2"
+                                           target="_blank" style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/FSM.png" alt="FSM" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Field Serviceman Mangement
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/12.0/scs_hr_interview/"
+                                           target="_blank" style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/HRMS.png" alt="HR" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                HR Management
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/13.0/spa_salon_portal/"
+                                           target="_blank" style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/spa-salon.png" alt="Spa Salon" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Salon and Spa Management
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/13.0/fleet_operations/"
+                                           target="_blank" style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/fleet.png" alt="Fleet" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Fleet Management
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/13.0/hotel/" target="_blank"
+                                           style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/hotel.png" alt="Hotel" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Hotel Management
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <a href="https://apps.odoo.com/apps/modules/13.0/ringcentral/" target="_blank"
+                                           style="font-family:'Montserrat', sans-serif;">
+                                            <img src="icons/ring.png" alt="Ring Central" width="120" height="120"/>
+                                            <h3 class="mt16"
+                                                style="font-weight:bold;font-size:16px;font-family:'Montserrat', sans-serif">
+                                                Ring Central
+                                            </h3>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <!-- Our Odoo Services -->
+    <section class="oe_container mb64">
+        <div class="row o_equal_col_sm position-relative overflow-hidden" style="margin:0 auto;padding-bottom:0;">
+            <img src="div-bg.png" class="img position-absolute w-100 h-100 bg-none"/>
+            <div class="container fixed-bottom position-relative" style="display:block; margin:0 auto;">
+                <div class="mt32 mb32">
+                    <div class="col-lg-12 align-items-top d-inline-flex align-items-top px-5">
+                        <div class="text-left" style="width:100%;">
+                            <h2 style="letter-spacing:2px;font-weight:900;color:#000;text-transform:uppercase;font-family:'Montserrat', sans-serif">
+                                Our Odoo Services
+                            </h2>
+                            <span class="o_gradient"
+                                  style="width:150px;height:2px;background-image:linear-gradient(90deg, #e52d27 20%, #b31217 80%)!important;display:inline-block;border-radius:2px;"></span>
+                        </div>
+                    </div>
+                    <div class="col-12 mb32">
+                        <div class="position-relative">
+                            <div class="row">
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <img src="customise.png" alt="Odoo Customization" width="120" height="120">
+                                        <h3 class="mt16"
+                                            style="font-weight:bold;font-size:17px;font-family:'Montserrat', sans-serif">
+                                            Odoo Customization
+                                        </h3>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <img src="implementation.png" alt="Odoo Implementation" width="120"
+                                             height="120">
+                                        <h3 class="mt16"
+                                            style="font-weight:bold;font-size:17px;font-family:'Montserrat', sans-serif">
+                                            Odoo Implementation
+                                        </h3>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <img src="integration.png" alt="Odoo Integration" width="120" height="120">
+                                        <h3 class="mt16"
+                                            style="font-weight:bold;font-size:17px;font-family:'Montserrat', sans-serif">
+                                            Odoo Integration
+                                        </h3>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <img src="support.png" alt="Odoo Support" width="120" height="120">
+                                        <h3 class="mt16"
+                                            style="font-weight:bold;font-size:17px;font-family:'Montserrat', sans-serif">
+                                            Odoo Support
+                                        </h3>
+                                    </div>
+                                </div>
+                                <div class="col mb16">
+                                    <div class="text-center pt16 pb16">
+                                        <img src="hire.png" alt="Hire Odoo Developer" width="120" height="120">
+                                        <h3 class="mt16"
+                                            style="font-weight:bold;font-size:17px;font-family:'Montserrat', sans-serif">
+                                            Hire Odoo Developers
+                                        </h3>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+    
+    <!-- Footer -->
+    <section class="oe_container mt32 mb-4">
+        <div class="row o_equal_col_sm position-relative overflow-hidden shadow"
+             style="margin:0 auto;background-color:#F5F5F5;padding-bottom:0;border-radius:10px;">
+            <div class="container fixed-bottom position-relative"
+                 style="display:block;margin:0 auto;text-align:center;">
+                <div class="row">
+                    <div class="col-lg-12 align-items-top d-inline-flex align-items-top px-5 mt32 mb32">
+                        <div class="text-left" style="width:100%;">
+                            <h2 style="letter-spacing:2px;font-weight:900;color:#000;text-transform:uppercase;font-family:'Montserrat', sans-serif">
+                                Help And Support
+                            </h2>
+                            <span class="o_gradient"
+                                  style="width:150px;height:2px;background-image:linear-gradient(90deg, #e52d27 20%, #b31217 80%)!important;display:inline-block;border-radius:2px;"></span>
+                            <div class="row">
+                                <div class="col-md-4 mt16">
+                                    <a class="s_figure_link"
+                                       style="font-size:16px;font-weight:bold;padding:8px 16px;display:inline-block;background-color: #C3282D;color:#fff;border-radius:7px;margin:14px 0px;font-family:'Montserrat', sans-serif;"
+                                       href="mailto:contact@serpentcs.com">
+                                        <i class="fa fa-question-circle" style="padding-right:3px"></i>
+                                        For any Query
+                                    </a>
+                                </div>
+                                <div class="col-md-4 mt16 mt16">
+                                    <a class="s_figure_link" style="font-size: 16px;font-weight:bold;padding:8px 16px;display:inline-block;
+background-color: #C3282D;color:#fff;border-radius:7px;margin:14px 0px;font-family:'Montserrat', sans-serif;"
+                                       href="https://apps.odoo.com/apps/modules/browse?author=Serpent%20Consulting%20Services%20Pvt.%20Ltd."
+                                       target="_blank">
+                                        <i class="fa fa-eye" style="padding-right:3px"></i>
+                                        Checkout our Apps
+                                    </a>
+                                </div>
+                                <div class="col-md-4 mt16 mt16">
+                                    <a class="s_figure_link" style="font-size:16px;font-weight:bold;padding:8px 16px;display:inline-block;
+                                   background-color:#C3282D;color:#fff;border-radius:7px;margin:14px 0px;font-family:'Montserrat', sans-serif;"
+                                       href="https://www.youtube.com/channel/UCendM9esn5UiKhgHMO5IS9A/videos"
+                                       target="_blank">
+                                        <i class="fa fa-youtube-play" style="padding-right:3px"></i>
+                                        Check App Demo
+                                    </a>
+                                </div>
+                            </div>
+                            <div class="col-md-12" style="padding-left:0;">
+                                <hr style="border-color:gray;"/>
+                            </div>
+                            <div class="row">
+                                <!-- Email Text -->
+                                <div class="col-md-3 mt8 mb8">
+                                    <p style="color:#555;font-weight:bold;font-size:15px;font-family:'Montserrat', sans-serif;">
+                                        Write a mail to us:</p>
+                                    <a href="mailto:contact@serpentcs.com" class="font-weight-bold"
+                                       style="font-size:16px;font-family:'Montserrat', sans-serif;">contact@serpentcs.com</a>
+                                </div>
+                                <!-- WhatsApp Number -->
+                                <div class="col-md-5 mt8 mb8">
+                                    <p style="color: #555;font-weight:bold;font-size:15px;font-family:'Montserrat', sans-serif;">
+                                        Write a text to us on WhatsApp:</p>
+                                    <a href="tel:919879354457" class="font-weight-bold"
+                                       style="font-size:16px;font-family:'Montserrat', sans-serif;">(+91)
+                                        98793-54457</a>
+                                    <a href="tel:919033472982" class="font-weight-bold"
+                                       style="font-size:16px;font-family:'Montserrat', sans-serif;">(+91)
+                                        90334-72982</a>
+                                </div>
+                                <!-- Visit Website -->
+                                <div class="col-md-4 mt8 mb8">
+                                    <p style="color: #555;font-weight:bold;font-size:15px;font-family:'Montserrat', sans-serif;">
+                                        Visit Our Website:</p>
+                                    <a href="https://www.serpentcs.com/" target="_blank" class="font-weight-bold"
+                                       style="font-size:16px;font-family:'Montserrat', sans-serif;">www.serpentcs.com</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+</div>
diff --git a/odex25_project/project_scrum_agile/static/description/integration.png b/odex25_project/project_scrum_agile/static/description/integration.png
new file mode 100644
index 000000000..0e4be6805
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/integration.png differ
diff --git a/odex25_project/project_scrum_agile/static/description/meeting_6.jpg b/odex25_project/project_scrum_agile/static/description/meeting_6.jpg
new file mode 100644
index 000000000..99a9d62c1
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/meeting_6.jpg differ
diff --git a/odex25_project/project_scrum_agile/static/description/sprint_2.jpg b/odex25_project/project_scrum_agile/static/description/sprint_2.jpg
new file mode 100644
index 000000000..c6d456d7f
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/sprint_2.jpg differ
diff --git a/odex25_project/project_scrum_agile/static/description/support.png b/odex25_project/project_scrum_agile/static/description/support.png
new file mode 100644
index 000000000..9728d08fd
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/description/support.png differ
diff --git a/odex25_project/project_scrum_agile/static/src/img/agile.png b/odex25_project/project_scrum_agile/static/src/img/agile.png
new file mode 100644
index 000000000..cd345bb9a
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/src/img/agile.png differ
diff --git a/odex25_project/project_scrum_agile/static/src/img/icon.png b/odex25_project/project_scrum_agile/static/src/img/icon.png
new file mode 100644
index 000000000..53dd30d96
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/src/img/icon.png differ
diff --git a/odex25_project/project_scrum_agile/static/src/img/icon1.png b/odex25_project/project_scrum_agile/static/src/img/icon1.png
new file mode 100644
index 000000000..9a37528ca
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/src/img/icon1.png differ
diff --git a/odex25_project/project_scrum_agile/static/src/img/release.png b/odex25_project/project_scrum_agile/static/src/img/release.png
new file mode 100644
index 000000000..427a738da
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/src/img/release.png differ
diff --git a/odex25_project/project_scrum_agile/static/src/img/tasks_icon.png b/odex25_project/project_scrum_agile/static/src/img/tasks_icon.png
new file mode 100644
index 000000000..5c5073b16
Binary files /dev/null and b/odex25_project/project_scrum_agile/static/src/img/tasks_icon.png differ
diff --git a/odex25_project/project_scrum_agile/views/account_analytic_line_view.xml b/odex25_project/project_scrum_agile/views/account_analytic_line_view.xml
new file mode 100644
index 000000000..1b50ccd48
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/account_analytic_line_view.xml
@@ -0,0 +1,141 @@
+<odoo>
+
+    <!-- ACCOUNT ANALYTIC LINE TREE VIEW -->
+    <record id="view_task_work_tree" model="ir.ui.view">
+        <field name="name">account.analytic.line.tree</field>
+        <field name="model">account.analytic.line</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Work Tasks" editable="top">
+                <field name="date"/>
+                <field name="name"/>
+                <field name="unit_amount"/>
+                <field name="company_id" groups="base.group_multi_company" optional="show"/>
+                <field name="project_id"/>
+                <field name="task_id"
+                       domain="[('project_id', '=', project_id)]"/>
+                <field name="account_id"/>
+                <field name="user_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- ACCOUNT ANALYTIC LINE SEARCH VIEW -->
+    <record id="view_project_task_work_search" model="ir.ui.view">
+        <field name="name">account.analytic.line.search</field>
+        <field name="model">account.analytic.line</field>
+        <field name="arch" type="xml">
+            <search string="Search Meeting Sprint">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="date"/>
+                <field name="unit_amount"/>
+                <field name="task_id"/>
+                <field name="project_id"/>
+                <group expand="0" string="Group by...">
+                    <filter string="User" name="user_id_g"
+                            context="{'group_by': 'user_id'}"
+                            icon="terp-personal"/>
+                    <filter string="Homework" name="task_id_g"
+                            context="{'group_by': 'task_id'}"
+                            icon="terp-stock_effects-object-colorize"/>
+                    <filter string="Project" name="project_id_g"
+                            context="{'group_by': 'project_id'}"
+                            icon="gtk-directory"/>
+                    <filter string="Date" name="fecha_id_g"
+                            context="{'group_by': 'date'}"
+                            icon="gtk-directory"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- ACCOUNT ANALYTIC LINE CALENDAR VIEW -->
+    <record model="ir.ui.view" id="view_analytic_sprint_calendar">
+        <field name="model">account.analytic.line</field>
+        <field name="name">account.analytic.line.calendar</field>
+        <field name="arch" type="xml">
+            <calendar string="Work done" mode="day" date_start="date"
+                      color="user_id" date_delay="unit_amount">
+                <field name="project_id"/>
+                <field name="user_id"/>
+                <field name="account_id"/>
+                <field name="name"/>
+            </calendar>
+        </field>
+    </record>
+
+    <!-- ACCOUNT ANALYTIC LINE GRAPH VIEW -->
+    <record id="view_project_task_graph_work" model="ir.ui.view">
+        <field name="name">account.analytic.lin.graph</field>
+        <field name="model">account.analytic.line</field>
+        <field name="arch" type="xml">
+            <graph string="Daily hours" type="bar">
+                <field name="user_id"/>
+                <field name="unit_amount" operator="+"/>
+            </graph>
+        </field>
+    </record>
+
+    <!-- ACCOUNT ANALYTIC LINE ACTION VIEW -->
+    <record model="ir.actions.act_window" id="action_project_work_lines">
+        <field name="name">Hours of Tasks</field>
+        <field name="res_model">account.analytic.line</field>
+        <field name="view_mode">tree,calendar,graph</field>
+        <field name="context">
+            {'search_default_project_id_g':1,'search_default_user_id_g':1}
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window.view" id="view_task_work_tree_tree">
+        <field name="view_mode">tree</field>
+        <field name="sequence">1</field>
+        <field name="view_id" ref="project_scrum_agile.view_task_work_tree"/>
+        <field name="act_window_id" ref="action_project_work_lines"/>
+    </record>
+
+    <!-- HOURS OF TASKS MENU -->
+    <menuitem id="menu_project_work_tasks" action="action_project_work_lines"
+              parent="project.menu_project_management" sequence="30"/>
+
+    <!--ALL TASK MENU -->
+    <menuitem id="menu_project_all_tasks" action="project.action_view_task"
+              name= "All Tasks"
+              parent="project.menu_project_management" sequence="20"
+              groups="base.group_no_one,project.group_project_user"
+    />
+
+    <!-- INHERIT ACCOUNT ANALYTIC LINE SEARCH VIEW -->
+    <record model="ir.ui.view" id="account_analytic_line_search_scrum">
+        <field name="name">account.analytic.line.search.scrum</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id"
+               ref="analytic.view_account_analytic_line_filter"/>
+        <field name="arch" type="xml">
+            <field name="account_id" position="after">
+                <filter string="Meetings Source" name="Meetings Source"
+                        domain="[('meeting_id', '!=', False)]"/>
+                <filter string="Source Tasks" name="Source Tasks"
+                        domain="[('task_id', '!=', False)]"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- INHERIT ACCOUNT ANALYTIC LINE FORM VIEW -->
+    <record model="ir.ui.view" id="account_analytic_line_form_scrum">
+        <field name="name">account.analytic.line.form.scrum</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id"
+               ref="analytic.view_account_analytic_line_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='amount']" position="after">
+                <group string="Generated">
+                    <field name="meeting_id"/>
+                    <field name="task_id"/>
+                    <field name="project_id" invisible="1"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/views/email_template.xml b/odex25_project/project_scrum_agile/views/email_template.xml
new file mode 100644
index 000000000..710f9d935
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/email_template.xml
@@ -0,0 +1,15 @@
+<odoo>
+
+    <record id="email_template_project_scrum" model="mail.template">
+        <field name="name">Scrum Meeting</field>
+        <field name="email_from"></field>
+        <field name="subject">${object.name or ''}</field>
+        <field name="email_to"></field>
+        <field name="model_id"
+               ref="project_scrum_agile.model_project_scrum_meeting"/>
+        <field name="auto_delete" eval="False"/>
+        <field name="body_html">
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/views/hr_employee_view.xml b/odex25_project/project_scrum_agile/views/hr_employee_view.xml
new file mode 100644
index 000000000..14cfabeb0
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/hr_employee_view.xml
@@ -0,0 +1,18 @@
+<odoo>
+
+    <!-- INHERITED VIEW OF HR EMPLOYEE -->
+    <record model="ir.ui.view" id="view_employee_form_inherit_scrum">
+        <field name="name">hr.employee.form.inherit</field>
+        <field name="model">hr.employee</field>
+        <field name="inherit_id"
+               ref="hr_timesheet.hr_employee_view_form_inherit_timesheet"/>
+        <field name="arch" type="xml">
+            <label for="timesheet_cost" position="before">
+                <field name="product_id" domain="[('type','=','service')]"/>
+                <field name="journal_id"/>
+                <field name="project_task_id"/>
+            </label>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/views/project_scrum_devteam_view.xml b/odex25_project/project_scrum_agile/views/project_scrum_devteam_view.xml
new file mode 100644
index 000000000..360ea2fe3
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/project_scrum_devteam_view.xml
@@ -0,0 +1,94 @@
+<odoo>
+
+    <!-- DEVELOPMENT TEAM TREE VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_team_tree">
+        <field name="model">project.scrum.devteam</field>
+        <field name="name">view.project.scrum.team.tree</field>
+        <field name="arch" type="xml">
+            <tree string="Scrum Development Teams">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="active"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- DEVELOPMENT TEAM FORM VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_team_form">
+        <field name="model">project.scrum.devteam</field>
+        <field name="name">view.project.scrum.team.form</field>
+        <field name="arch" type="xml">
+            <form string="Scrum Development Teams">
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button name="toggle_active" type="object"
+                                class="oe_stat_button" icon="fa-archive">
+                            <field name="active" widget="boolean_button"
+                                   options='{"terminology": "archive"}'/>
+                        </button>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="name" required="1"/>
+                        </group>
+                        <group>
+                            <field name="code"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Team" name="team">
+                        <field name="developer_ids" widget="many2many">
+                                <kanban quick_create="false" create="true" delete="true">
+                                    <field name="id"/>
+                                    <field name="name"/>
+                                    <field name="lang"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div class="oe_kanban_global_click" style="max-width: 200px">
+                                                <div class="o_kanban_record_top">
+                                                    <img t-att-src="kanban_image('res.users', 'image_1920', record.id.raw_value)" height="40" width="40" class="oe_avatar oe_kanban_avatar_smallbox mb0" alt="Avatar"/>
+                                                    <div class="o_kanban_record_headings ml8">
+                                                        <strong class="o_kanban_record_title"><field name="name"/></strong>
+                                                        <br/><strong class="o_kanban_record_title"><field name="lang"/></strong>
+                                                    </div>
+                                                    <a t-if="! read_only_mode" type="delete" class="text-danger">
+                                                        <i class="fa fa-times" title="Delete"></i>
+                                                    </a>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <!-- DEVELOPMENT TEAM ACTION VIEW -->
+    <record model="ir.actions.act_window" id="action_project_scrum_team">
+        <field name="name">Team</field>
+        <field name="res_model">project.scrum.devteam</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <!-- DEVELOPMENT TEAM MENU -->
+    <menuitem action="action_project_scrum_team"
+              id="menu_action_project_scrum_team"
+              name="Development Teams" parent="project.menu_project_config"
+              groups="base.group_no_one"/>
+
+    <!-- INHERITED VIEW OF RES_USERS_FORM -->
+    <record model="ir.ui.view" id="view_project_scrum_inherit_res_users_form">
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('oe_title')]/group" position="inside">
+                <field name="scrum_devteam_id"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/views/project_scrum_release_view.xml b/odex25_project/project_scrum_agile/views/project_scrum_release_view.xml
new file mode 100644
index 000000000..ca31ff791
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/project_scrum_release_view.xml
@@ -0,0 +1,156 @@
+<odoo>
+
+    <!-- RELEASE TREE VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_release_tree">
+        <field name="model">project.scrum.release</field>
+        <field name="name">view.project.scrum.release.tree</field>
+        <field name="arch" type="xml">
+            <tree string="Releases">
+                <field name="release_number"/>
+                <field name="name"/>
+                <field name="project_id"/>
+                <field name="sprint_ids"/>
+                <field name="date_start"/>
+                <field name="date_stop"/>
+                <field name="delivery_date_estimated"/>
+                <field name="delivery_date_effective"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- RELEASE FORM VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_release_form">
+        <field name="model">project.scrum.release</field>
+        <field name="name">view.project.scrum.release.form</field>
+        <field name="arch" type="xml">
+            <form string="Releases">
+                <sheet>
+                    <group>
+                        <div class="oe_title" colspan="4">
+                            <h1>
+                                <field name="release_number" readonly="1"/>
+                            </h1>
+                            <h1>
+                                <field name="name" colspan="4" nolabel="1"
+                                       required="1"/>
+                            </h1>
+                        </div>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="project_id" class="oe_inline"
+                                   required="1"/>
+                            <field name="date_start" class="oe_inline"/>
+                            <field name="date_stop" class="oe_inline"/>
+                        </group>
+                        <group>
+                            <field name="delivery_date_estimated"
+                                   class="oe_inline"/>
+                            <field name="delivery_date_effective"
+                                   class="oe_inline"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Goal">
+                                <field name="goal"/>
+                            </page>
+                            <page string="Sprints">
+                                <field name="sprint_ids"
+                                       context="{'default_project_id':project_id,'default_release_id':active_id}">
+                                    <tree string="Stories">
+                                        <field name="sprint_number"/>
+                                        <field name="name"/>
+                                        <field name="release_id"/>
+                                        <field name="project_id"/>
+                                        <field name="scrum_master_id"/>
+                                        <field name="product_owner_id"/>
+                                        <field name="date_start"/>
+                                        <field name="date_stop"/>
+                                        <field name="effective_velocity"/>
+                                        <field name="progress"
+                                               widget="progressbar"/>
+                                        <field name="state"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Backlog">
+                                <field name="backlog_ids">
+                                    <tree string="Backlogs">
+                                        <field name="backlog_number"/>
+                                        <field name="name"/>
+                                        <field name="role_job_id"/>
+                                        <field name="role_id"/>
+                                        <field name="user_id"/>
+                                        <field name="responsible_id"/>
+                                        <field name="sprint_id"/>
+                                        <field name="release_id"/>
+                                        <field name="project_id"/>
+                                        <field name="asked_date"/>
+                                        <field name="state" invisible="True"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Description">
+                                <field name="note"/>
+                            </page>
+                        </notebook>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"
+                           groups="base.group_user"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <!-- RELEASE SEARCH VIEW -->
+    <record id="view_release_filter" model="ir.ui.view">
+        <field name="name">project.scrum.release.search</field>
+        <field name="model">project.scrum.release</field>
+        <field name="arch" type="xml">
+            <search string="Search Release">
+                <field name="name" string="Name or description"
+                       filter_domain="['|','|','|',('name','ilike',self), ('note','ilike',self), ('goal','ilike',self),('release_number','ilike',self)]"/>
+                <field name="date_start" string="Start"/>
+                <field name="date_stop" string="End"/>
+                <field name="delivery_date_estimated" string="Final Estimate"/>
+                <field name="delivery_date_effective"
+                       string="Final Effective"/>
+                <field name="project_id" string="Project"/>
+                <group expand="0" string="Group by...">
+                    <filter string="Start" name="group_by_start" domain="[]"
+                            context="{'group_by':'date_start'}"/>
+                    <filter string="Final" name="group_by_end" domain="[]"
+                            context="{'group_by':'date_stop'}"/>
+                    <filter string="Final Estimate"
+                            name="group_by_end_estimated"
+                            domain="[]"
+                            context="{'group_by':'delivery_date_estimated'}"/>
+                    <filter string="Final Effective"
+                            name="group_by_end_effective"
+                            domain="[]"
+                            context="{'group_by':'delivery_date_effective'}"/>
+                    <separator/>
+                    <filter string="Project" name="Project" domain="[]"
+                            context="{'group_by':'project_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- RELEASE ACTION -->
+    <record model="ir.actions.act_window" id="action_project_scrum_release">
+        <field name="name">Release</field>
+        <field name="res_model">project.scrum.release</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <!-- RELEASE MENU -->
+    <menuitem action="action_project_scrum_release"
+              id="menu_action_project_scrum_release"
+              sequence="2"
+              parent="menu_scrum" name="Sprint Releases"
+    />
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/views/project_scrum_role_view.xml b/odex25_project/project_scrum_agile/views/project_scrum_role_view.xml
new file mode 100644
index 000000000..6eaf1c64f
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/project_scrum_role_view.xml
@@ -0,0 +1,54 @@
+<odoo>
+
+    <!-- ROLES TREE -->
+    <record model="ir.ui.view" id="view_scrum_role_tree">
+        <field name="name">view.scrum.role.tree</field>
+        <field name="model">project.scrum.role</field>
+        <field name="arch" type="xml">
+            <tree string="Roles">
+                <field name="project_id"/>
+                <field name="name"/>
+                <field name="code"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- ROLES FORM -->
+    <record model="ir.ui.view" id="view_scrum_role_form">
+        <field name="name">view.scrum.role.form</field>
+        <field name="model">project.scrum.role</field>
+        <field name="arch" type="xml">
+            <form string="Role">
+                <sheet>
+                    <group>
+                        <field name="name" required="1"/>
+                        <field name="code"/>
+                        <field name="project_id" required="1"/>
+                    </group>
+                    <notebook>
+                        <page string="Person">
+                            <group colspan="4">
+                                <field name="person_name"/>
+                                <field name="person_description"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <!-- ROLES ACTION -->
+    <record model="ir.actions.act_window" id="action_project_scrum_role">
+        <field name="name">Roles</field>
+        <field name="res_model">project.scrum.role</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <!-- ROLES MENU -->
+    <menuitem action="action_project_scrum_role"
+              id="menu_action_project_scrum_role"
+              name="Roles" parent="project.menu_project_config"
+              groups="base.group_no_one"/>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/views/project_scrum_sandbox_view.xml b/odex25_project/project_scrum_agile/views/project_scrum_sandbox_view.xml
new file mode 100644
index 000000000..8715e32a0
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/project_scrum_sandbox_view.xml
@@ -0,0 +1,89 @@
+<odoo>
+
+    <!-- SANDBOX TREE VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_sandbox_tree">
+        <field name="model">project.scrum.sandbox</field>
+        <field name="name">view.project.scrum.sandbox.tree</field>
+        <field name="arch" type="xml">
+            <tree string="Sandbox" editable="top">
+                <field name="role_id"/>
+                <field name="name"/>
+                <field name="for_then"/>
+                <field name="project_id"/>
+                <field name="developer_id"/>
+                <field name="create_date"/>
+                <field name="meeting_id"
+                       domain="[('project_id','=',project_id)]"/>
+                <button name="%(action_tranfer_to_backlog)d"
+                        type="action" icon="fa-paper-plane" title="send"
+                        groups="project_scrum_agile.group_scrum_owner"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- SANDBOX FORM VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_sandbox_form">
+        <field name="model">project.scrum.sandbox</field>
+        <field name="name">view.project.scrum.sandbox.form</field>
+        <field name="arch" type="xml">
+            <form string="Sandbox">
+                <group>
+                    <group>
+                        <field name="name"/>
+                        <field name="role_id"/>
+                        <field name="for_then"/>
+                    </group>
+                    <group>
+                        <field name="project_id"/>
+                        <field name="developer_id"/>
+                        <field name="create_date"/>
+                        <field name="meeting_id"
+                                domain="[('project_id', '=', project_id)]"/>
+                    </group>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <!-- SANDBOX SEARCH VIEW -->
+    <record id="view_project_scrum_sandbox_search" model="ir.ui.view">
+        <field name="name">project.scrum.sandbox.search</field>
+        <field name="model">project.scrum.sandbox</field>
+        <field name="arch" type="xml">
+            <search string="Search in sandbox">
+                <field name="developer_id"/>
+                <field name="role_id"/>
+                <field name="name" string="Wants or stops"
+                       filter_domain="['|',('name','ilike',self), ('for_then','ilike',self)]"/>
+                <field name="project_id"/>
+                <field name="create_date"/>
+                <field name="meeting_id"/>
+                <group expand="0" string="Group by...">
+                    <filter string="Author" name="Author"
+                            context="{'group_by': 'developer_id'}"/>
+                    <filter string="Who" name="Who" context="{'group_by': 'role_id'}"/>
+                    <filter string="Project" name="Project"
+                            context="{'group_by': 'project_id'}"/>
+                    <filter string="Creation date" name="Creation date"
+                            context="{'group_by': 'create_date'}"/>
+                    <filter string="Meeting" name="Meeting"
+                            context="{'group_by': 'meeting_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- SANDBOX ACTION VIEW -->
+    <record model="ir.actions.act_window" id="action_project_scrum_sandbox">
+        <field name="name">Sandbox</field>
+        <field name="res_model">project.scrum.sandbox</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <!-- SANDBOX MENU -->
+    <menuitem action="action_project_scrum_sandbox"
+              id="menu_action_project_scrum_sandbox"
+              parent="project_scrum_agile.menu_scrum" name="Sandbox"
+              sequence="8"/>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/views/project_scrum_view.xml b/odex25_project/project_scrum_agile/views/project_scrum_view.xml
new file mode 100644
index 000000000..00b891136
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/project_scrum_view.xml
@@ -0,0 +1,929 @@
+<odoo>
+
+    <menuitem id="menu_scrum" name="Scrum" parent="project.menu_main_pm"
+              sequence="3"/>
+
+    <!-- CALANDER EVENT FORM INHERIT -->
+    <record id="view_calendar_event_form_inherit" model="ir.ui.view">
+        <field name="name">calendar.event.form.inherit</field>
+        <field name="model">calendar.event</field>
+        <field name="inherit_id" ref="calendar.view_calendar_event_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//sheet" position="before">
+                <header>
+                    <button string="New" type="object" name="set_new"
+                            class="oe_highlight"
+                            attrs="{'invisible': [('status','not in',['canceled'])]}"/>
+                    <button string="Confirm" type="object" name="set_confirm"
+                            class="oe_highlight"
+                            attrs="{'invisible': [('status','not in',['new'])]}"/>
+                    <button string="Validate" type="object" name="set_validate"
+                            class="oe_highlight"
+                            attrs="{'invisible': [('status','not in',['confirm'])]}"/>
+                    <button string="Cancel" type="object" name="set_cancel"
+                            attrs="{'invisible': [('status','not in',['new','confirm','performed'])]}"/>
+                    <field name="status" widget="statusbar"
+                           statusbar_visible="new,confirm,performed,canceled"/>
+                </header>
+            </xpath>
+            <field name="location" position="after">
+                <field name="project_id"/>
+                <field name="scrum_meeting_id"
+                       attrs="{'invisible': [('scrum_meeting_id','=',False)]}"/>
+                <button string="Create Sprint Minutes" type="object"
+                        name="to_extend_sprint"
+                        attrs="{'invisible': [('scrum_meeting_id','!=',False)]}"/>
+            </field>
+            <field name="start_date" position="attributes">
+                <attribute name="attrs">
+                    {'required':[('allday','=',True)],'invisible':[('allday','=',False)]}
+                </attribute>
+            </field>
+            <field name="stop_date" position="attributes">
+                <attribute name="attrs">
+                    {'required':[('allday','=',True)],'invisible':[('allday','=',False)]}
+                </attribute>
+            </field>
+        </field>
+    </record>
+
+    <!-- PRODUCT BACKLOG KANBAN -->
+    <record model="ir.ui.view" id="view_project_scrum_product_backlog_kanban">
+        <field name="name">view.project.scrum.product.backlog.kanban</field>
+        <field name="model">project.scrum.product.backlog</field>
+        <field name="arch" type="xml">
+            <kanban default_group_by="stage_id"
+                    class="o_kanban_small_column o_kanban_project_task">
+                <field name="state"
+                       options='{"group_by_tooltip": {"requirements": "Description", "legend_priority": "Use of stars"}}'/>
+                <field name="color"/>
+                <field name="sequence"/>
+                <field name="name"/>
+                <field name="stage_id"/>
+                <field name="open"/>
+                <field name="role_job_id"/>
+                <field name="role_id"/>
+                <field name="expected_hours" sum="Estimated time" widget="timesheet_uom_no_toggle"/>
+                <field name="effective_hours" sum="Time Used" widget="timesheet_uom_no_toggle"/>
+                <field name="complexity" sum="Story Points"/>
+                <field name="value_to_user" sum="User Value"/>
+                <field name="user_id"/>
+                <field name="responsible_id"/>
+                <templates attrs="{'invisible':[('state', '=', 'done')]}">
+                    <t t-name="kanban-box">
+                        <t t-set="record.group_fancy" t-value="1"/>
+                        <div
+                                t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div class="o_dropdown_kanban dropdown"
+                                 groups="base.group_user">
+                                <a class="dropdown-toggle btn"
+                                   data-toggle="dropdown" href="#" role="button">
+                                    <span class="fa fa-bars fa-lg" title="bars"/>
+                                </a>
+                                <div class="dropdown-menu" role="menu"
+                                    aria-labelledby="dLabel">
+                                    <t t-if="widget.editable">
+                                        <li style="padding: 3px 15px 3px 20px;">
+                                            <a type="edit">Edit Backlog</a>
+                                        </li>
+                                    </t>
+                                    <t t-if="widget.deletable">
+                                        <li style="padding: 3px 15px 3px 20px;">
+                                            <a type="delete">Delete</a>
+                                        </li>
+                                    </t>
+                                    <li>
+                                        <ul class="oe_kanban_colorpicker"
+                                            data-field="color"/>
+                                    </li>
+                                </div>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div>
+                                    <b>
+                                        [
+                                        <field name="role_id"/>
+                                        ]
+                                    </b>
+                                    <field name="name"/>
+                                </div>
+                                <div>
+                                    <div t-attf-class="oe_kanban_global_click_edit oe_semantic_html_override">
+                                        <field name="for_then"/>
+                                    </div>
+                                    <div>
+                                        <b>Project:</b>
+                                        <font color="blue">
+                                            <field name="project_id"/>
+                                        </font>
+                                    </div>
+                                    <div>
+                                        <field name="categ_ids"/>
+                                    </div>
+                                    <div class="oe_clear"></div>
+                                </div>
+                                <div class="oe_kanban_bottom_right">
+                                    <img
+                                            t-att-src="kanban_image('res.users', 'image_small', record.responsible_id.raw_value)"
+                                            t-att-title="record.responsible_id.value"
+                                            width="24" height="24"
+                                            class="oe_kanban_avatar" alt='Image'/>
+                                </div>
+                                <div class="oe_kanban_footer_left">
+                                    <span title="Remaining hours">
+                                        <span class="fa fa-clock-o" title="Clock"/>
+                                        <t t-esc="Math.round(record.expected_hours.raw_value)"/>
+                                        <span class="fa fa-hourglass" title="Hourglass"/>
+                                        <t t-esc="Math.round(record.effective_hours.raw_value)"/>
+                                        <span class="fa fa-bolt" title="bolt"/>
+                                        <t t-esc="Math.round(record.complexity.raw_value)"/>
+                                        <span class="fa fa-trophy" title="trophy"/>
+                                        <t t-esc="Math.round(record.value_to_user.raw_value)"/>
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <!-- PRODUCT BACKLOG TREE -->
+    <record model="ir.ui.view" id="view_project_scrum_product_backlog_tree">
+        <field name="model">project.scrum.product.backlog</field>
+        <field name="name">view.project.scrum.product.backlog.tree</field>
+        <field name="arch" type="xml">
+            <tree string="Product Backlog">
+                <field name="backlog_number"/>
+                <field name="sequence" invisible="True"/>
+                <field name="name"/>
+                <field name="role_job_id"/>
+                <field name="role_id"/>
+                <field name="user_id"/>
+                <field name="responsible_id"/>
+                <field name="sprint_id"/>
+                <field name="release_id"/>
+                <field name="project_id"/>
+                <field name="asked_date"/>
+                <field name="state" invisible="True"/>
+                <field name="stage_id"/>
+                <field name="categ_ids" invisible="1"/>
+                <field name="expected_hours" sum="Estimated time" widget="timesheet_uom_no_toggle"/>
+                <field name="effective_hours" sum="Time Used" widget="timesheet_uom_no_toggle"/>
+                <field name="complexity" sum="Story Points"/>
+                <field name="value_to_user" sum="User Value"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- PRODUCT BACKLOG FORM -->
+    <record model="ir.ui.view" id="view_project_scrum_product_backlog_form">
+        <field name="model">project.scrum.product.backlog</field>
+        <field name="name">view.project.scrum.product.backlog.form</field>
+        <field name="arch" type="xml">
+            <form string="Product Backlog"
+                  class="o_form_project_tasks">
+                <header>
+                    <button type="object" string="Open" name="button_open"
+                            groups="project_scrum_agile.group_scrum_owner,project_scrum_agile.group_scrum_master"
+                            attrs="{'invisible': [('backlog_stage_state', 'not in', ['new', 'design', 'analysis', 'specification', 'development', 'testing'] )]}"
+                    />
+                    <button type="object" string="Cancel" name="button_cancel"
+                            groups="project_scrum_agile.group_scrum_owner,project_scrum_agile.group_scrum_master"
+                            attrs="{'invisible': [('backlog_stage_state', 'not in', ['in_progress', 'pending'] )]}"
+                    />
+                    <button type="object" string="End up" name="button_close"
+                            groups="project_scrum_agile.group_scrum_owner,project_scrum_agile.group_scrum_master"
+                            class="oe_highlight"
+                            attrs="{'invisible': [('backlog_stage_state', 'not in', ['in_progress', 'pending'] )]}"/>
+                    <button type="object" string="Reactivate"
+                            name="button_reactivate"
+                            groups="project_scrum_agile.group_scrum_owner,project_scrum_agile.group_scrum_master"
+                            attrs="{'invisible': [('backlog_stage_state', 'not in', ['cancelled', 'done'] )]}"/>
+                    <field name="state" invisible="1"/>
+                    <field name="stage_id" widget="statusbar"
+                           clickable="1"
+                           options="{'fold_field': 'fold'}"/>
+                </header>
+                <sheet>
+                    <group>
+                        <div class="oe_title" colspan="4">
+                            <h1>
+                                <field name="backlog_number" readonly="1"/>
+                            </h1>
+                            <h1>
+                                <field name="name" colspan="4" nolabel="1"
+                                       required="1"/>
+                            </h1>
+                        </div>
+                    </group>
+                    <label for="categ_ids" class="oe_edit_only"/>
+                    <field name="categ_ids" widget="many2many_tags"/>
+                    <group>
+                        <group>
+                            <field name="project_id"
+                                   domain="[('is_scrum', '=', True)]"
+                                   required="1"/>
+                            <field name="release_id"
+                                   domain="[('project_id', '=', project_id)]"/>
+                            <field name="sprint_id"
+                                   domain="[('release_id', '=', release_id)]"/>
+                            <field name="user_id"/>
+                            <field name="responsible_id"/>
+                            <field name="asked_date"/>
+                        </group>
+                        <group>
+                            <field name="backlog_stage_state" invisible="1"/>
+                            <field name="role_job_id"/>
+                            <field name="role_id"/>
+                            <field name="date_open"/>
+                            <field name="date_done"/>
+                        </group>
+                        <group colspan="2">
+                            <field name="description"/>
+                            <field name="for_then"/>
+                            <field name="acceptance_testing"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="General" col="4">
+                            <group col="4">
+                                <field name="complexity"
+                                       string="Story Points"/>
+                                <field name="expected_hours" widget="timesheet_uom_no_toggle"/>
+                                <field name="value_to_user"/>
+                                <field name="task_hours" widget="timesheet_uom_no_toggle"/>
+                                <field name="sequence"/>
+                                <field name="effective_hours" widget="timesheet_uom_no_toggle"/>
+                                <field name="progress" widget="progressbar"
+                                       class="oe_subtotal_footer_separator oe_inline"/>
+                            </group>
+                        </page>
+                        <page string="Tasks">
+                            <field colspan="4" name="tasks_id" nolabel="1"
+                                   widget="one2many_list"
+                                   context="{'default_project_id':project_id, 'default_product_backlog_id':active_id}">
+                                <tree string="Tasks">
+                                    <field name="sequence"/>
+                                    <field name="name"/>
+                                    <field name="user_id"/>
+                                    <field name="planned_hours" widget="timesheet_uom_no_toggle"/>
+                                    <field name="effective_hours" widget="timesheet_uom_no_toggle"/>
+                                    <field name="remaining_hours" widget="timesheet_uom_no_toggle"/>
+                                    <!-- <field name="total_hours"/> -->
+                                    <field name="date_deadline"/>
+                                    <field name="stage_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Note">
+                            <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"
+                           groups="base.group_user"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <!-- PRODUCT BACKLOG SEARCH -->
+    <record id="view_project_scrum_product_backlog_search" model="ir.ui.view">
+        <field name="name">project.scrum.product.backlog.search</field>
+        <field name="model">project.scrum.product.backlog</field>
+        <field name="arch" type="xml">
+            <search string="Search Stories">
+                <field name="name" string="Name or Number"
+                       filter_domain="['|','|',('name','ilike',self), ('for_then','ilike',self), ('backlog_number', 'ilike', self)]"/>
+                <field name="description"
+                       string="Description of Aceptance Testing"
+                       filter_domain="['|',('acceptance_testing', 'ilike', self), ('description', 'ilike', self)]"/>
+                <field name="user_id" string="Creator by user"
+                       domain="[('user_id','=',uid)]"/>
+                <field name="responsible_id" string="Responsible"
+                       filter_domain="[('responsible_id','ilike',self)]"/>
+                <field name="role_id" string="Listener"
+                       filter_domain="[('role_id','ilike',self)]"/>
+                <filter name="draft" string="Draft"
+                        domain="[('state','=','draft')]"/>
+                <filter name="open" string="Open"
+                        domain="[('state','=','open')]"/>
+                <filter name="pending" string="Pending"
+                        domain="[('state','=','pending')]"/>
+                <filter name="done" string="Finished"
+                        domain="[('state','=','done')]"/>
+                <filter name="cancel" string="Canceled"
+                        domain="[('state','=','cancel')]"/>
+                <separator/>
+                <field name="project_id" string="Project"/>
+                <field name="release_id" string="Release"/>
+                <field name="sprint_id" string="Sprint"/>
+                <separator/>
+                <filter domain="[('user_id','=',uid)]" name= "created_by_me" help="Created by me"
+                        icon="terp-personal"/>
+                <field name="categ_ids"/>
+                <group expand="0" string="Group by...">
+                    <filter string="State" name="group_by_state" domain="[]"
+                            context="{'group_by':'state'}"/>
+                    <filter string="Listener" name="group_by_role"
+                            domain="[]"
+                            context="{'group_by':'role_id'}"/>
+                    <filter string="Created by" name="group_by_user_id"
+                            domain="[]"
+                            context="{'group_by':'user_id'}"/>
+                    <filter string="Responsible" name="group_by_responsible_id"
+                            domain="[]"
+                            context="{'group_by':'responsible_id'}"/>
+                    <filter string="Project" domain="[]" name="group_by_project_id"
+                            context="{'group_by':'project_id'}"/>
+                    <filter string="Release" domain="[]" name="group_by_release_id"
+                            context="{'group_by':'release_id'}"/>
+                    <filter string="Sprint" domain="[]" name="group_by_sprint_id"
+                            context="{'group_by':'sprint_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- PRODUCT BACKLOG ACTION -->
+    <record model="ir.actions.act_window"
+            id="action_project_scrum_product_backlog">
+        <field name="name">Product Backlog</field>
+        <field name="res_model">project.scrum.product.backlog</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="context">{}</field>
+        <field name="search_view_id"
+               ref="view_project_scrum_product_backlog_search"/>
+    </record>
+
+    <!-- PRODUCT BACKLOG MENU -->
+    <menuitem action="action_project_scrum_product_backlog"
+              id="menu_action_project_scrum_product_backlog"
+              parent="project_scrum_agile.menu_scrum" name="Product Backlog"
+              sequence="4"/>
+
+    <!-- PROJECT SCRUM BURNDOWN LOG SEARCH -->
+    <record id="view_project_burndown_graph_search" model="ir.ui.view">
+        <field name="name">project.scrum.sprint.burndown.log.search</field>
+        <field name="model">project.scrum.sprint.burndown.log</field>
+        <field name="arch" type="xml">
+            <search string="Burndownchart">
+                <field name="sprint_id"/>
+                <field name="date"/>
+                <field name="remaining_hours"/>
+                <field name="remaining_points"/>
+                <field name="real_data"/>
+                <field name="date_day"/>
+                <group expand="0" string="Group by...">
+                    <filter string="Sprint" name="group_by_sprint_id"
+                            context="{'group_by': 'sprint_id'}"/>
+                    <filter string="Date" context="{'group_by': 'date'}" name="group_by_date"/>
+                    <filter string="Day" context="{'group_by': 'date_day'}" name="group_by_date_day"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- BURNDOWNCHART HOURS GRAPH -->
+    <record id="view_project_burndown_graph_hours" model="ir.ui.view">
+        <field name="name">project.scrum.sprint.burndown.log.graph</field>
+        <field name="model">project.scrum.sprint.burndown.log</field>
+        <field name="arch" type="xml">
+            <graph string="BurndownchartHours" stacked="True">
+                <field name="date_day" type="row"/>
+                <field name="remaining_hours" type="measure" operator="+"/>
+                <field name="remaining_points" type="measure" operator="+"/>
+            </graph>
+        </field>
+    </record>
+
+    <!-- ACTION BURNDOWNCHART HOURS LOG -->
+    <record model="ir.actions.act_window"
+            id="action_project_scrum_burndownchart_hours1">
+        <field name="name">Burndownchart Hours</field>
+        <field name="res_model">project.scrum.sprint.burndown.log</field>
+        <field name="view_mode">graph</field>
+        <field name="view_id" ref="view_project_burndown_graph_hours"/>
+        <field name="context"
+               eval="'{\'search_default_sprint_id\': [active_id]}'"/>
+    </record>
+
+    <!-- BURNDOWNCHART POINTS GRAPH -->
+    <record id="view_project_burndown_graph_points" model="ir.ui.view">
+        <field name="name">project.scrum.sprint.burndown.log.graph</field>
+        <field name="model">project.scrum.sprint.burndown.log</field>
+        <field name="arch" type="xml">
+            <graph string="BurndownchartPoints" type="bar">
+                <field name="date" type="row"/>
+                <field name="remaining_points" type="measure" operator="+"/>
+            </graph>
+        </field>
+    </record>
+
+    <!-- ACTION BURNDOWNCHART POINTS -->
+    <record model="ir.actions.act_window"
+            id="action_project_scrum_burndownchart_points1">
+        <field name="name">Burndownchart Points</field>
+        <field name="res_model">project.scrum.sprint.burndown.log</field>
+        <field name="view_mode">graph</field>
+        <field name="view_id" ref="view_project_burndown_graph_points"/>
+        <field name="context"
+               eval="'{\'search_default_sprint_id\': [active_id]}'"/>
+    </record>
+
+    <!-- MEETING CALENDAR -->
+    <record model="ir.ui.view" id="view_project_scrum_meeting_calendar">
+        <field name="name">view.project.scrum.meeting.calendar</field>
+        <field name="model">project.scrum.meeting</field>
+        <field name="arch" type="xml">
+            <calendar string="Scrum Meeting" date_start="start_date"
+                      color="user_id">
+                <field name="sprint_id"/>
+            </calendar>
+        </field>
+    </record>
+
+    <!-- MEETING SEARCH -->
+    <record id="view_project_scrum_search" model="ir.ui.view">
+        <field name="name">project.scrum.meeting.search</field>
+        <field name="model">project.scrum.meeting</field>
+        <field name="arch" type="xml">
+            <search string="Search Meeting Sprint">
+                <field name="name"/>
+                <field name="project_id"/>
+                <field name="sprint_id"/>
+                <field name="start_date"/>
+                <field name="status"/>
+                <filter string="New" domain="[('status','=','new')]" name="group_by_status_new"/>
+                <filter string="Confirm" domain="[('status','=','confirm')]" name="group_by_status_confirm"/>
+                <filter string="Canceled"
+                        domain="[('status','=','canceled')]" name="group_by_status_canceled"/>
+                <filter string="Performed"
+                        domain="[('status','=','performed')]" name="group_by_status_performed"/>
+                <group expand="0" string="Group by...">
+                    <filter string="Status" context="{'group_by': 'status'}" name="group_by_status"/>
+                    <filter string="Project"
+                            context="{'group_by': 'project_id'}" name="group_by_project_id"/>
+                    <filter string="Sprint"
+                            context="{'group_by': 'sprint_id'}" name="group_by_sprint_id"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- MEETING TREE -->
+    <record model="ir.ui.view" id="view_scrum_meeting_tree">
+        <field name="name">view.project.scrum.meeting.tree</field>
+        <field name="model">project.scrum.meeting</field>
+        <field name="arch" type="xml">
+            <tree string="Daily Meetings">
+                <field name="name"/>
+                <field name="start" string="Start Date"/>
+                <field name="project_id"/>
+                <field name="sprint_id"/>
+                <field name="user_id"/>
+                <field name="partner_ids"/>
+                <field name="status"/>
+<!--                <field name="state" invisible="True"/>-->
+            </tree>
+        </field>
+    </record>
+
+    <!-- MEETING FORM -->
+    <record model="ir.ui.view" id="view_project_scrum_meeting_form">
+        <field name="name">view.project.scrum.meeting.form</field>
+        <field name="model">project.scrum.meeting</field>
+        <field name="arch" type="xml">
+            <form string="Meeting Sprint">
+                <header>
+                   <!--  <button string='Button' type='object' name='set_button'/> -->
+                    <button string="New" type="object" name="set_new"
+                            attrs="{'invisible': [('status','not in',['canceled'])]}"/>
+                    <button string="Confirm" type="object" name="set_confirm"
+                            attrs="{'invisible': [('status','not in',['new'])]}"/>
+                    <button string="Validate" type="object" name="set_validate"
+                            attrs="{'invisible': [('status','not in',['confirm'])]}"/>
+                    <button string="Cancel" type="object" name="set_cancel"
+                            attrs="{'invisible': [('status','not in',['new','confirm','performed'])]}"/>
+
+                    <button string="Product Owner" type="object"
+                            name="send_email"
+                            context="{'type':'owner'}" icon="fa-paper-plane"/>
+                    <button string="Master" type="object" name="send_email"
+                            context="{'type':'master'}" icon="fa-paper-plane"/>
+                    <field name="status" widget="statusbar"
+                           statusbar_visible="new,confirm"
+                           statusbar_colors='{"confirmed":"blue","validated":"green","cancelled":"red","refused":"red"}'/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name"/>
+                        </div>
+                        <h1>
+                            <field name="name" required="1"/>
+                        </h1>
+                        <label for="partner_ids" class="oe_edit_only"/>
+                        <h2>
+                            <field name="partner_ids" widget="many2many_tags"
+                                   context="{'force_email':True}"/>
+                        </h2>
+                    </div>
+                    <notebook>
+                        <page string="Reunion Summary">
+                            <group>
+                                <field name="project_id" required="True"
+                                       domain="[('is_scrum', '=', True)]"/>
+                                <field name="sprint_id"
+                                       domain="['|',('state','in', ['open', 'pending']),('project_id','=',project_id)]"/>
+                            </group>
+                            <separator colspan="4"
+                                       string="What happened during the meeting?"/>
+                            <field colspan="4" name="what_we_did" nolabel="1"/>
+                            <separator colspan="4"
+                                       string="What was done since the last meeting?"/>
+                            <field colspan="4" name="question_yesterday"
+                                   nolabel="1"/>
+                            <separator colspan="4"
+                                       string="What is planned until the next meeting?"/>
+                            <field colspan="4" name="question_today"
+                                   nolabel="1"/>
+                            <separator colspan="4"
+                                       string="There is something that is blocking?"/>
+                            <field colspan="4" name="question_blocks"
+                                   nolabel="1"/>
+                            <separator colspan="4" string=""/>
+                        </page>
+                        <page string="Details Reunion">
+                            <group>
+                                <group>
+                                    <field name="allday" invisible="True"/>
+                                    <field name="duration" invisible="True"/>
+                                    <field name="start_date" string="Starts"
+                                           attrs="{'invisible': [('allday','=',False)],'required': [('allday','=',True)]}"/>
+                                    <field name="start" groups="base.group_no_one"
+                                           attrs="{'invisible': [('allday','=',True)]}"/>
+                                    <field name="stop_date" groups="base.group_no_one"
+                                           attrs="{'invisible': [('allday','=',False)],'required': [('allday','=',True)]}"/>
+                                    <field name="stop" groups="base.group_no_one"
+                                           attrs="{'invisible': [('allday','=',True)]}"/>
+                                    <field name="duration" widget="float_time"
+                                           class="oe_inline" attrs="{'invisible': [('allday','=',True)]}"/>
+                                    <field name="allday" class="oe_inline"/>
+                                </group>
+                                <group>
+                                    <field name="user_id"/>
+                                    <field name="categ_ids"
+                                           widget="many2many_tags"/>
+                                    <field name="location"/>
+                                </group>
+                            </group>
+                            <label for="description"/>
+                            <field name="description"/>
+                        </page>
+                        <page string="Sandbox">
+                            <field name="sandbox_ids"
+                                   context="{'default_project_id':project_id}">
+                                <tree string="Sandbox" editable="top">
+                                    <field name="role_id"/>
+                                    <field name="name"/>
+                                    <field name="for_then"/>
+                                    <field name="project_id" invisible="True"/>
+                                    <field name="developer_id"
+                                           invisible="True"/>
+                                    <field name="create_date"
+                                           invisible="True"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <!-- MEETING ACTION -->
+    <record model="ir.actions.act_window" id="action_meeting_form">
+        <field name="name">Sprint Meeting</field>
+        <field name="res_model">project.scrum.meeting</field>
+        <field name="view_mode">tree,form,calendar</field>
+    </record>
+
+    <!-- MEETING MENU -->
+    <menuitem sequence="30" action="action_meeting_form"
+              id="menu_action_meeting_form"
+              name="Scrum Meeting" parent="menu_scrum"/>
+
+    <!-- SPRINT SEARCH -->
+    <record id="view_sprint_filter" model="ir.ui.view">
+        <field name="name">project.scrum.sprint.search</field>
+        <field name="model">project.scrum.sprint</field>
+        <field name="arch" type="xml">
+            <search string="Search Release">
+                <field name="name" string="Name or Number or Goal"
+                       filter_domain="['|','|',('name','ilike',self), ('goal','ilike',self), ('sprint_number','ilike',self)]"/>
+                <field name="review" string="Descripcion"
+                       filter_domain="[('review','ilike',self)]"/>
+                <field name="date_start" string="Start"/>
+                <field name="date_stop" string="Final"/>
+                <field name="product_owner_id" string="Owner"/>
+                <field name="scrum_master_id" string="Scrum Master"/>
+                <field name="project_id" string="Project"/>
+                <field name="release_id" string="Release"/>
+                <group expand="0" string="Group by...">
+                    <filter string="Start" name="group_by_start" domain="[]"
+                            context="{'group_by':'date_start'}"/>
+                    <filter string="Final" name="group_by_end" domain="[]"
+                            context="{'group_by':'date_stop'}"/>
+                    <separator/>
+                    <filter string="Project" name="group_by_project"
+                            domain="[]"
+                            context="{'group_by':'project_id'}"/>
+                    <filter string="Release" name="group_by_release"
+                            domain="[]"
+                            context="{'group_by':'release_id'}"/>
+                    <filter string="Owner Project" name="group_by_release"
+                            domain="[]"
+                            context="{'group_by':'product_owner_id'}"/>
+                    <filter string="Scrum Master" name="group_by_release"
+                            domain="[]"
+                            context="{'group_by':'scrum_master_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <!-- SPRINT TREE VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_sprint_tree">
+        <field name="name">view.project.scrum.sprint.tree</field>
+        <field name="model">project.scrum.sprint</field>
+        <field name="arch" type="xml">
+            <tree string="Sprint">
+                <field name="sprint_number"/>
+                <field name="name"/>
+                <field name="release_id"/>
+                <field name="project_id"/>
+                <field name="scrum_master_id"/>
+                <field name="product_owner_id"/>
+                <field name="date_start"/>
+                <field name="date_stop"/>
+                <field name="effective_velocity"/>
+                <field name="progress" widget="progressbar"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- SPRINT FORM VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_sprint_form">
+        <field name="name">view.project.scrum.sprint.form</field>
+        <field name="model">project.scrum.sprint</field>
+        <field name="arch" type="xml">
+            <form string="Sprint">
+                <header>
+                    <button type="object" string="Open" name="button_open"
+                            states="draft,pending"/>
+                    <button type="object" string="Pending"
+                            name="button_pending"
+                            states="open"/>
+                    <button type="object" string="Set to Draft"
+                            name="button_draft" states="done,cancel"/>
+                    <button type="object" string="Cancel"
+                            name="button_cancel" states="open,pending"/>
+                    <button type="object" string="Close" name="button_close"
+                            states="open,pending"/>
+                    <button
+                            name="%(project_scrum_agile.action_project_scrum_burndownchart_hours1)d"
+                            string="Burndownchart Hours" type="action"
+                            icon="fa-clock-o"/>
+                    <button
+                            name="%(project_scrum_agile.action_project_scrum_burndownchart_points1)d"
+                            string="Burndownchart Points" type="action"
+                            icon="fa-line-chart"/>
+                    <field name="state" widget="statusbar"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button class="oe_stat_button"
+                                name="%(project_scrum_agile.action_meeting_form)d"
+                                type="action"
+                                context="{'search_default_sprint_id': id,'default_project_id':project_id,'default_sprint_id': id}"
+                                icon="fa-calendar">
+                            <field string="Meetings" name="meeting_count"
+                                   widget="statinfo"/>
+                        </button>
+                    </div>
+                    <h1>
+                        <field name="sprint_number"/>
+                    </h1>
+                    <group col="4" colspan="4">
+                        <field name="name" required="1"/>
+                        <field name="goal"/>
+                        <field name="date_start" required="1"/>
+                        <field name="date_stop" required="1"/>
+                        <field name="project_id"
+                               domain="[('is_scrum', '=', True)]"/>
+                        <field name="release_id"
+                               domain="[('project_id', '=', project_id)]"
+                               required="1"/>
+                        <field name="product_owner_id"/>
+                        <field name="scrum_master_id"/>
+                        <field name="progress" widget="progressbar"/>
+                        <field name="effective_hours" widget="timesheet_uom_no_toggle"/>
+                        <field name="expected_hours" widget="timesheet_uom_no_toggle"/>
+                    </group>
+                    <notebook>
+                        <page string="General">
+                            <group string="Velocity">
+                                <field name="effective_velocity"/>
+                            </group>
+                        </page>
+                        <page string="User stories">
+                            <field name="product_backlog_ids"
+                                   context="{'default_project_id':project_id, 'default_product_backlog_id':active_id,
+                                   'default_release_id':release_id,'default_sprint_id':active_id,}">
+                                <tree string="Stories">
+                                    <field name="sequence"/>
+                                    <field name="role_job_id"/>
+                                    <field name="role_id"/>
+                                    <field name="name"/>
+                                    <field name="responsible_id"/>
+                                    <field name="task_hours"
+                                           sum="Total Planned Hours Tasks" widget="timesheet_uom_no_toggle"/>
+                                    <field name="effective_hours"
+                                           sum="Total Hours Effective" widget="timesheet_uom_no_toggle"/>
+                                    <field name="complexity"
+                                           sum="Total Story Points"/>
+                                    <field name="value_to_user"
+                                           sum="Total User Value"/>
+                                    <field name="state" invisible="True"/>
+                                    <field name="stage_id"/>
+                                    <field name="progress"
+                                           widget="progressbar"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Sprint Review">
+                            <field name="review"/>
+                        </page>
+                        <page string="Retrospective">
+                            <group string="Start to do">
+                                <field name="retrospective_start_to_do"
+                                       nolabel="1"/>
+                            </group>
+                            <group string="Continue to do">
+                                <field name="retrospective_continue_to_do"
+                                       nolabel="1"/>
+                            </group>
+                            <group string="Stop to do">
+                                <field name="retrospective_stop_to_do"
+                                       nolabel="1"/>
+                            </group>
+                        </page>
+                        <page string="Burndownchart Info">
+                            <br/>
+                            <button type="object" string="Calculate"
+                                    name="update_burndownchart"
+                                    icon="fa-cogs"/>
+                            <br/>
+                            <br/>
+                            <field name="burndown_ids">
+                                <tree string="Burndownchart Info"
+                                      editable="bottom">
+                                    <field name="date"/>
+                                    <field name="remaining_hours"/>
+                                    <field name="remaining_points"/>
+                                    <field name="real_data"/>
+                                    <field name="date_day" readonly="1"
+                                           invisible="True"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"
+                           groups="base.group_user"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <!-- SPRINT CALENDAR VIEW -->
+    <record model="ir.ui.view" id="view_project_scrum_sprint_calendar">
+        <field name="name">project.scrum.sprint.calendar</field>
+        <field name="model">project.scrum.sprint</field>
+        <field name="arch" type="xml">
+            <calendar color="project_id" date_start="date_start"
+                      date_stop="date_stop" string="Event" quick_add="false">
+                <field name="name"/>
+                <field name="project_id"/>
+            </calendar>
+        </field>
+    </record>
+
+    <!-- SPRINT PIVOT VIEW -->
+    <record id="view_project_scrum_sprint_gantt" model="ir.ui.view">
+        <field name="name">project.scrum.sprint.gantt</field>
+        <field name="model">project.scrum.sprint</field>
+        <field eval="2" name="priority"/>
+        <field name="arch" type="xml">
+            <pivot string="Sprints">
+            </pivot>
+        </field>
+    </record>
+
+    <!-- SPRINT ACTION VIEW -->
+    <record model="ir.actions.act_window" id="action_project_scrum_sprint">
+        <field name="name">Sprint</field>
+        <field name="res_model">project.scrum.sprint</field>
+        <field name="view_mode">tree,form,calendar,pivot</field>
+    </record>
+
+    <!-- SPRINT MENU -->
+    <menuitem action="action_project_scrum_sprint"
+              id="menu_action_project_scrum_sprint"
+              parent="menu_scrum" name="Sprints"
+              sequence="1"
+    />
+
+
+    <!-- TASKS INHERIT FORM -->
+    <record id="view_scrum_task_form" model="ir.ui.view">
+        <field name="name">project.task.scrum.form</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_form2"/>
+        <field name="arch" type="xml">
+            <field name="partner_phone" position="after">
+                <field name="product_backlog_id"
+                       domain="[('project_id','=',project_id),]"/>
+                <field name="type" widget="radio"
+                       invisible="context.get('incidents')"/>
+                <field name="sprint_id" readonly="1"/>
+                <field name="release_id"/>
+            </field>
+            <notebook position="inside">
+                <page string="Incidents"
+                      attrs="{'invisible': [('type','=','issue')]}">
+                    <field name="incidents" nolabel="1"
+                           context="{'default_type': 'issue', 'incidents': True}">
+                        <tree string="Task">
+                            <field name="name"/>
+                            <field name="project_id"/>
+                            <field name="task_id"/>
+                            <field name="progress" widget="progressbar"/>
+                        </tree>
+                    </field>
+                </page>
+            </notebook>
+            <field name="user_id" position="after">
+                <field name="creator_id" string="Creator By"/>
+                <field name="email"/>
+                <field name="partner_ids" widget="many2many_tags"
+                       placeholder="Add contacts to notify..."/>
+            </field>
+            <field name="name" position="replace">
+                <div class="oe_title" colspan="4">
+                    <h1>
+                        <field name="task_number" readonly="1"
+                               string="Task Number"/>
+                    </h1>
+                    <h1>
+                        <field name="name" colspan="4" nolabel="1"/>
+                    </h1>
+                </div>
+            </field>
+        </field>
+    </record>
+
+    <!-- TASK INHERIT TREE -->
+    <record id="view_task_tree2_extended" model="ir.ui.view">
+        <field name="name">project.task.tree.extended</field>
+        <field name="model">project.task</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="project.view_task_tree2"/>
+        <field name="arch" type="xml">
+            <field name="name" position="before">
+                <field name="sequence" invisible="True"/>
+                <field name="task_number"/>
+                <field name="create_date" string="Creation"/>
+            </field>
+            <field name="name" position="after">
+                <field name="write_date" string="Modified"/>
+                <field name="date_deadline" string="Limit"/>
+                <field name="date_end" string="Finalized"/>
+                <field name="product_backlog_id" string="Request"/>
+                <field name="sprint_id" string="Sprint"/>
+                <field name="release_id" string="Release"/>
+                <field name="project_id" string="Project"/>
+                <field name="creator_id" string="Creator By"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/views/project_view.xml b/odex25_project/project_scrum_agile/views/project_view.xml
new file mode 100644
index 000000000..c3a0ebbfd
--- /dev/null
+++ b/odex25_project/project_scrum_agile/views/project_view.xml
@@ -0,0 +1,81 @@
+<odoo>
+
+    <!-- INHERITED VIEW OF PROJECT -->
+    <record model="ir.ui.view" id="view_project_project_form">
+        <field name="name">project.project.form</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <button name="action_view_all_rating" position="after">
+                <button class="oe_stat_button"
+                        name="%(project_scrum_agile.action_project_scrum_product_backlog)d"
+                        type="action"
+                        context="{'search_default_project_id': active_id}"
+                        icon="fa-files-o"
+                        attrs="{'invisible':[('is_scrum', '=', False)]}">
+                    <field string="Backlogs" name="backlog_count"
+                           widget="statinfo"/>
+                </button>
+                <button class="oe_stat_button"
+                        name="%(project_scrum_agile.action_project_scrum_sprint)d"
+                        type="action"
+                        context="{'search_default_project_id': active_id}"
+                        icon="../project_scrum_agile/static/src/img/agile.png"
+                        attrs="{'invisible':[('is_scrum', '=', False)]}">
+                    <field string="Sprints" name="sprint_count"
+                           widget="statinfo" style="margin-left:10px"/>
+                </button>
+                <button class="oe_stat_button"
+                        name="%(project_scrum_agile.action_project_scrum_release)d"
+                        type="action"
+                        context="{'search_default_project_id': active_id}"
+                        icon="../project_scrum_agile/static/src/img/release.png"
+                        attrs="{'invisible':[('is_scrum', '=', False)]}">
+                    <field string="Releases" name="release_count"
+                           widget="statinfo" style="margin-left:10px"/>
+                </button>
+
+            </button>
+            <xpath expr="/form/sheet/div[2]" position="after">
+                <field name="is_scrum" class="oe_inline"/>
+                <label for="is_scrum"/>
+            </xpath>
+            <field name="user_id" position="after">
+                <!-- close in odex25-projects -->
+                <!-- <field name="team_id"
+                       attrs="{'invisible':[('is_scrum', '=', False)]}"/> -->
+                <!-- <field name="user_id"
+                       attrs="{'invisible':[('is_scrum', '=', True)]}"/> -->
+                <field name="scrum_master_id"
+                       attrs="{'invisible':[('is_scrum', '=', False)]}"
+                        context="{'filter_scrum_master': True}"/>
+                <field name="product_owner_id"
+                       attrs="{'invisible':[('is_scrum', '=', False)]}"
+                        context="{'filter_product_owner': True}"/>
+            </field>
+            <xpath expr="/form/sheet/notebook/page[@name='settings']" position="after">
+                <page string="Goal"
+                      attrs="{'invisible':[('is_scrum', '=', False)]}">
+                    <separator string="Goal"/>
+                    <field name="goal"/>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- INHERITED VIEW OF PROJECT TASK TYPE-->
+    <record id="view_task_type_edit_inherit" model="ir.ui.view">
+        <field name="name">project.task.type.form.inherit</field>
+        <field name="model">project.task.type</field>
+        <field name="inherit_id" ref="project.task_type_edit"/>
+        <field name="arch" type="xml">
+            <field name="mail_template_id" position="after">
+                <field name="default_view"/>
+            </field>
+            <field name="mail_template_id" position="before">
+                <field name="state"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/wizards/__init__.py b/odex25_project/project_scrum_agile/wizards/__init__.py
new file mode 100644
index 000000000..5c1cb2077
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/__init__.py
@@ -0,0 +1,6 @@
+# See LICENSE file for full copyright and licensing details.
+
+from . import analytic_timesheet
+from . import project_scrum_backlog_create_task
+from . import project_scrum_email
+from . import user_story_sandbox_to_backlog
diff --git a/odex25_project/project_scrum_agile/wizards/analytic_timesheet.py b/odex25_project/project_scrum_agile/wizards/analytic_timesheet.py
new file mode 100644
index 000000000..73db409ff
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/analytic_timesheet.py
@@ -0,0 +1,28 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import api, models
+
+
+class AnalyticTimesheetInvoiceStartTime(models.TransientModel):
+    _name = 'hr.analytic.timesheet.start_time'
+    _description = 'HR analytic timesheet start time'
+
+    def button_get_start_time(self):
+        """ Set Meeting or Task or Sheet Date to Analytic Line
+        @param self: The object pointer
+        """
+        context = self._context or {}
+        sheet_ids = context.get('active_ids', [])
+        data_id = self.id or False
+        if not data_id or not sheet_ids:
+            return False
+        for sheet in self.env['account.analytic.line'].browse(sheet_ids):
+            date = False
+            if sheet.meeting_id:
+                date = sheet.meeting_id.start_date
+            elif sheet.task_id:
+                task_work_id = sheet.task_id[0]
+                date = task_work_id.date_assign
+            if date:
+                sheet.write({'date': date})
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/odex25_project/project_scrum_agile/wizards/analytic_timesheet_view.xml b/odex25_project/project_scrum_agile/wizards/analytic_timesheet_view.xml
new file mode 100644
index 000000000..34ce8c61d
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/analytic_timesheet_view.xml
@@ -0,0 +1,29 @@
+<odoo>
+
+    <!-- HR ANALYTIC TIMESHEET FORM VIEW -->
+    <record id="view_timesheet_start_time" model="ir.ui.view">
+        <field name="name">Start Date</field>
+        <field name="model">hr.analytic.timesheet.start_time</field>
+        <field name="arch" type="xml">
+            <form string="Start Date">
+                <footer>
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                    or
+                    <button name="button_get_start_time" string="To accept"
+                            type="object" default_focus="1"
+                            class="oe_highlight"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+    <record id="action_timesheet_start" model="ir.actions.act_window">
+        <field name="name">Start Date</field>
+        <field name="res_model">hr.analytic.timesheet.start_time</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_timesheet_start_time"/>
+        <field name="target">new</field>
+        <field name="binding_model_id" ref="model_account_analytic_line"/>
+    </record>
+
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/wizards/project_scrum_backlog_create_task.py b/odex25_project/project_scrum_agile/wizards/project_scrum_backlog_create_task.py
new file mode 100644
index 000000000..9bcf036df
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/project_scrum_backlog_create_task.py
@@ -0,0 +1,56 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class BacklogCreateTask(models.TransientModel):
+    _name = 'project.scrum.backlog.create.task'
+    _description = 'Create Tasks from Product Backlogs'
+
+    user_id = fields.Many2one(
+        'res.users',
+        'Assign To',
+        help="Responsible user who can work on task"
+    )
+
+    def do_create(self):
+        """ Create Tasks from Product Backlogs
+        @param self: The object pointer
+        """
+        context = self._context or {}
+        task = self.env['project.task']
+        backlog_id = self.env['project.scrum.product.backlog']
+        document_obj = self.env['ir.attachment']
+        ids_task = []
+        backlogs = backlog_id.browse(context['active_ids'])
+        search_view_ref = self.env.ref('project.view_task_search_form', False)
+        for backlog in backlogs:
+            task_id = task.create({
+                'product_backlog_id': backlog.id,
+                'name': backlog.name,
+                'description': backlog.description,
+                'project_id': backlog.project_id.id,
+                'user_id': self.user_id and self.user_id.id or False,
+                'planned_hours': backlog.expected_hours,
+                'remaining_hours': backlog.expected_hours,
+                'sequence': backlog.sequence,
+            })
+            document_ids = document_obj.search(
+                [('res_id', '=', backlog.id),
+                 ('res_model', '=', backlog_id._name)])
+            for document_id in document_ids:
+                document_id.copy(default={'res_id': task_id.id,
+                                          'res_model': task._name})
+            ids_task.append(task_id.id)
+        return {
+            'domain': "[('product_backlog_id','in',[" + ','.join(
+                map(str, context['active_ids'])) + "])]",
+            'name': 'Tasks',
+            'res_id': ids_task,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'project.task',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': search_view_ref and search_view_ref.id
+        }
diff --git a/odex25_project/project_scrum_agile/wizards/project_scrum_backlog_create_task_view.xml b/odex25_project/project_scrum_agile/wizards/project_scrum_backlog_create_task_view.xml
new file mode 100644
index 000000000..312f4e0c5
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/project_scrum_backlog_create_task_view.xml
@@ -0,0 +1,47 @@
+<odoo>
+
+    <!-- BACKLOG CREATE TASK FORM VIEW -->
+    <record id="view_scrum_backlog_to_task" model="ir.ui.view">
+        <field name="name">project.scrum.backlog.create.task.form</field>
+        <field name="model">project.scrum.backlog.create.task</field>
+        <field name="arch" type="xml">
+            <form string="Convert to Task">
+                <separator string="Convert to Task" colspan="4"/>
+                <group>
+                    <group>
+                        <field name="user_id"/>
+                    </group>
+                </group>
+                <separator colspan="4"/>
+                <footer>
+                    <button name="do_create" string="_Convert" type="object"
+                            default_focus="1" class="oe_highlight"/>
+                    or
+                    <button string="cancel" class="oe_link" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <!-- BACKLOG CREATE ACTION VIEW -->
+    <record id="action_convert_to_task" model="ir.actions.act_window">
+        <field name="name">Convert into Tasks</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.scrum.backlog.create.task</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_scrum_backlog_to_task"/>
+        <field name="target">new</field>
+    </record>
+    <record id="action_scrum_backlog_values" model="ir.actions.act_window">
+        <field name="name">Convert Into Tasks</field>
+        <field name="res_model">project.scrum.backlog.create.task</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_scrum_backlog_to_task"/>
+        <field name="target">new</field>
+        <field name="binding_model_id" ref="model_project_scrum_product_backlog"/>
+        <field name="groups_id" eval="[(4, ref('group_scrum_owner')),(4, ref('group_scrum_master'))]"/>
+
+    </record>
+
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/wizards/project_scrum_email.py b/odex25_project/project_scrum_agile/wizards/project_scrum_email.py
new file mode 100644
index 000000000..38d38d4a5
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/project_scrum_email.py
@@ -0,0 +1,105 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo import tools
+from odoo.tools.misc import format_date
+
+
+class ProjectScrumEmail(models.TransientModel):
+    _name = 'project.scrum.email'
+    _description = 'Project Scrum Email'
+
+    @api.model
+    def default_get(self, fields):
+        """
+        This function gets default values
+        @param self: The object pointer
+        """
+        context = self._context or {}
+        meeting_pool = self.env['project.scrum.meeting']
+        record_ids = context.get('active_ids', []) or []
+        res = super(ProjectScrumEmail, self).default_get(fields)
+        for meeting in meeting_pool.browse(record_ids):
+            sprint = meeting.sprint_id
+            if 'scrum_master_email' in fields:
+                res.update({'scrum_master_email': sprint.scrum_master_id and
+                            sprint.scrum_master_id.partner_id.email or False})
+            if 'product_owner_email' in fields:
+                res.update({'product_owner_email': sprint.product_owner_id and
+                            sprint.product_owner_id.partner_id.email or False})
+            if 'subject' in fields:
+                meeting_date = meeting.start_date
+                meeting_date = format_date(self.env, meeting_date, self.env.user.lang)
+                subject = _("Scrum Meeting : %s") % meeting_date
+                res.update({'subject': subject})
+            if 'message' in fields:
+                message = _(
+                    "Hello  , \nI am sending you Scrum Meeting :"
+                    "%s for the Sprint  '%s' of Project '%s' ") \
+                          % (meeting_date, sprint.name,
+                             sprint.project_id and sprint.project_id.name or
+                             '')
+                res.update({'message': message})
+        return res
+
+    scrum_master_email = fields.Char(
+        'Scrum Master Email',
+        size=64,
+        help="Email Id of Scrum Master"
+    )
+    product_owner_email = fields.Char(
+        'Product Owner Email',
+        size=64,
+        help="Email Id of Product Owner"
+    )
+    subject = fields.Char('Subject', size=64)
+    message = fields.Text('Message')
+
+    def button_send_scrum_email(self):
+        uid = self.env.user.id
+        context = self._context or {}
+        resp = []
+        active_id = context.get('active_id', False)
+        scrum_meeting_pool = self.env['project.scrum.meeting']
+        user_pool = self.env['res.users']
+        meeting = scrum_meeting_pool.browse(active_id)
+        vals = {}
+        data_id = self.ids and self.ids[0] or False
+        if not data_id or not active_id:
+            return False
+        data = self.browse(data_id)
+        email_from = tools.config.get('email_from', False)
+        user = user_pool.browse(uid)
+        mail_temp = self.env.ref(
+            'project_scrum_agile.email_template_project_scrum',
+            raise_if_not_found=True)
+        if mail_temp:
+            user_email = email_from or user.partner_id.email
+            body = """
+                    <div>
+                    <p>%s</p>
+                    <p>Tasks since yesterday : %s</p>
+                    <p>Task for Today : %s</p>
+                    <p>Blocking points encountered : %s</p>
+                    <p>Thank you, %s</p>
+                    <p>%s</p>
+                    </div>""" \
+                   % (data.message, meeting.question_yesterday or '',
+                      meeting.question_today or '',
+                      meeting.question_blocks or '',
+                      user.name, user.signature
+                      )
+            vals['subject'] = data.subject
+            vals['email_from'] = user_email
+            if mail_temp:
+                vals['body_html'] = body
+            if data.scrum_master_email == data.product_owner_email:
+                data.product_owner_email = False
+            if data.scrum_master_email:
+                resp.append(data.scrum_master_email)
+            if data.product_owner_email:
+                resp.append(data.product_owner_email)
+            vals['email_to'] = ','.join(x for x in resp)
+            mail_temp.write(vals)
+            mail_temp.send_mail(meeting.id, force_send=True)
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/odex25_project/project_scrum_agile/wizards/project_scrum_email_view.xml b/odex25_project/project_scrum_agile/wizards/project_scrum_email_view.xml
new file mode 100644
index 000000000..471965202
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/project_scrum_email_view.xml
@@ -0,0 +1,44 @@
+<odoo>
+
+    <!-- PROJECT SCRUM EMAIL FORM VIEW-->
+    <record id="view_project_scrum_email" model="ir.ui.view">
+        <field name="name">Scrum Meeting Email</field>
+        <field name="model">project.scrum.email</field>
+        <field name="arch" type="xml">
+            <form string="Scrum Meeting">
+                <separator colspan="4"
+                           string="Send Email for Scrum Meeting Details"/>
+                <field name="scrum_master_email" width="64"
+                       placeholder="Email Id of Scrum Master" required="1"/>
+                <field name="product_owner_email" width="64"
+                       placeholder="Email Id of Product Owner" required="1"/>
+                <field name="subject" colspan="4"/>
+                <separator string="Message" colspan="4"/>
+                <field name="message" nolabel="1" colspan="4"/>
+
+                <separator string="" colspan="4"/>
+                <group colspan="2" col="2">
+                </group>
+                <footer>
+                    <button string="_Cancel" class="oe_link" special="cancel"
+                            icon="fa-times"/>
+                    or
+                    <button name="button_send_scrum_email" string="_Send"
+                            type="object"
+                            default_focus="1" icon="fa-paper-plane"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_email" model="ir.actions.act_window">
+        <field name="name">Scrum Meeting Email</field>
+        <field name="res_model">project.scrum.email</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_project_scrum_email"/>
+        <field name="target">new</field>
+        <field name="binding_model_id" ref="model_project_scrum_meeting"/>
+        <field name="binding_view_types">form</field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_scrum_agile/wizards/user_story_sandbox_to_backlog.py b/odex25_project/project_scrum_agile/wizards/user_story_sandbox_to_backlog.py
new file mode 100644
index 000000000..29a081291
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/user_story_sandbox_to_backlog.py
@@ -0,0 +1,53 @@
+# See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class SandboxTransferToBacklog(models.TransientModel):
+    _name = 'project.scrum.sandbox.to.backlog'
+    _description = 'Transfer user story from sandbox to Product Backlogs'
+
+    role_id = fields.Many2one('project.scrum.role', "As")
+    name = fields.Char('I want', size=128)
+    for_then = fields.Char('For', size=128)
+    project_id = fields.Many2one(
+        'project.project',
+        "Project",
+        domain=[('is_scrum', '=', True)]
+    )
+    developer_id = fields.Many2one('res.users', 'Developer')
+    release_id = fields.Many2one('project.scrum.release', "Release")
+
+    @api.model
+    def default_get(self, fields):
+        res = super(SandboxTransferToBacklog, self).default_get(fields)
+        sandboxes = self.env['project.scrum.sandbox'].browse(
+            self._context['active_id'])
+        res.update({
+            'project_id': sandboxes.project_id.id
+        })
+        return res
+
+    def do_transfer(self):
+        """ Transfer user story from sandbox to Product Backlogs
+        @param self: The object pointer
+        """
+        context = self._context or {}
+        backlog_obj = self.env['project.scrum.product.backlog']
+        sandboxes = self.env['project.scrum.sandbox'].browse(
+            context['active_ids'])
+        for sandbox in sandboxes:
+            vals = {
+                'role_id': sandbox.role_id.id,
+                'name': sandbox.name,
+                'for_then': sandbox.for_then,
+                'project_id': sandbox.project_id.id,
+                'release_id': self.release_id and self.release_id.id or False,
+                'description': sandbox.name,
+            }
+            context = dict(context)
+            context['default_project_id'] = sandbox.project_id.id
+            backlog_id = backlog_obj.with_context(context).create(vals)
+            if backlog_id:
+                sandbox.unlink()
+        return True
diff --git a/odex25_project/project_scrum_agile/wizards/user_story_sandbox_to_backlog_view.xml b/odex25_project/project_scrum_agile/wizards/user_story_sandbox_to_backlog_view.xml
new file mode 100644
index 000000000..6c6a721b5
--- /dev/null
+++ b/odex25_project/project_scrum_agile/wizards/user_story_sandbox_to_backlog_view.xml
@@ -0,0 +1,32 @@
+<odoo>
+    <!-- PROJECT SCRUM SANDBOX TO BACKLOG FORM VIEW -->
+    <record id="view_scrum_sandbox_to_backlog" model="ir.ui.view">
+        <field name="name">project.scrum.sandbox.to.backlog.form</field>
+        <field name="model">project.scrum.sandbox.to.backlog</field>
+        <field name="arch" type="xml">
+            <form string="Transfer to backlog">
+                <group>
+                    <field name="project_id" invisible="1"/>
+                    <field name="release_id" required='1' style="width:50%;" domain="[('project_id','=',project_id)]"/>
+                </group>
+                <footer>
+                    <button name="do_transfer" string="_Transfer" type="object"
+                            default_focus="1" class="oe_highlight"/>
+                    or
+                    <button string="cancel" class="oe_link" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <!-- PROJECT SCRUM SANDBOX TO BACKLOG ACTION VIEW -->
+    <record id="action_tranfer_to_backlog" model="ir.actions.act_window">
+        <field name="name">Transfer to Backlog</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.scrum.sandbox.to.backlog</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_scrum_sandbox_to_backlog"/>
+        <field name="target">new</field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_time_plan/__init__.py b/odex25_project/project_time_plan/__init__.py
new file mode 100644
index 000000000..2673fe188
--- /dev/null
+++ b/odex25_project/project_time_plan/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models, wizard
diff --git a/odex25_project/project_time_plan/__manifest__.py b/odex25_project/project_time_plan/__manifest__.py
new file mode 100644
index 000000000..e10fe0f84
--- /dev/null
+++ b/odex25_project/project_time_plan/__manifest__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Project Time Plan",
+    'summary': """Project Time Plan""",
+    'author': "My Company",
+    'description': """
+        Dividing the Hours or Days of the project phases into the weeks or months of the phase
+    """,
+    'category': 'Odex25-Project/Odex25-Project',
+    'version': '0.1',
+    'depends': ['project_base','web_widget_x2many_2d_matrix'],
+
+    'data': [
+        'security/ir.model.access.csv',
+        'views/project_time_plan_view.xml',
+        'views/res_config_setting.xml',
+        'views/project_phase_views.xml',
+        'views/time_plan_detail.xml',
+        'wizard/week_generation_wizard_views.xml',
+        'wizard/edit_project_phase_view.xml',
+    ],
+}
diff --git a/odex25_project/project_time_plan/models/__init__.py b/odex25_project/project_time_plan/models/__init__.py
new file mode 100644
index 000000000..bba307257
--- /dev/null
+++ b/odex25_project/project_time_plan/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import res_company, res_config_setting,project_phase,project_time_plan
\ No newline at end of file
diff --git a/odex25_project/project_time_plan/models/project_phase.py b/odex25_project/project_time_plan/models/project_phase.py
new file mode 100644
index 000000000..e4d14b956
--- /dev/null
+++ b/odex25_project/project_time_plan/models/project_phase.py
@@ -0,0 +1,90 @@
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+
+
+class ProjectProject(models.Model):
+    _inherit = 'project.project'
+    plan_by_departments = fields.Boolean(string="Plan By Departments", related='company_id.plan_by_departments',readonly=True)
+    plan_by = fields.Selection(string='Plan By',related='company_id.plan_by', readonly=False)
+    time_plan_ids = fields.One2many('project.time.plan', 'project_id', string="Project Time Plans")
+
+
+
+
+
+
+
+class ProjectPhase(models.Model):
+    _inherit = 'project.phase'
+
+    department_ids = fields.Many2many('hr.department', string="Departments")
+    plan_by_departments = fields.Boolean(string="Plan By Departments", related='company_id.plan_by_departments')
+    plan_by = fields.Selection(string='Plan By', related='project_id.plan_by', readonly=True)
+    time_plan_ids = fields.One2many('project.time.plan', 'phase_id', string="Time plans")
+    estimated_hours = fields.Float(compute="_compute_estimated_hours", store=True)
+    plan_by_hour = fields.Float()
+    plan_by_day = fields.Float()
+    phase_id = fields.Many2one('project.phase', string='Project Phase', domain="[('project_id','=',project_id)]")
+
+
+    @api.depends('plan_by', 'plan_by_hour','plan_by_day')
+    def _compute_estimated_hours(self):
+        for rec in self:
+           if rec.plan_by == 'man_hours':
+               rec.estimated_hours = rec.plan_by_hour
+           else:
+                if rec.project_id.resource_calendar_id:
+                    rec.estimated_hours = rec.plan_by_day * rec.project_id.resource_calendar_id.hours_per_day
+                else:
+                    rec.estimated_hours = rec.plan_by_day * 8
+
+    def create_plans(self):
+        self._create_time_plan()
+        self.time_plan_ids._onchange_phase_id()
+        self.time_plan_ids.get_line_ids()
+        plan_total = sum(self.time_plan_ids.mapped('time_plan'))
+        if plan_total > self.estimated_hours:
+            raise ValidationError(_('Time Plans Hours for stage %s Exceed Stage Estimated Hours.') % (self.name))
+
+    def action_confirm(self):
+        res = super(ProjectPhase, self).action_confirm()
+        for rec in self:
+            if not rec.start_date or not rec.end_date:
+                raise ValidationError(_('Make sure that stage dates is set.'))
+            rec.create_plans()
+        return self.write({'state': 'open'})
+
+    def action_get_phase(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.time.plan",
+            "name": "%s (%s Hours)"%(self.display_name,self.estimated_hours),
+            'view_mode': 'tree',
+            "view_id": self.env.ref('project_time_plan.project_time_plan_tree_project').id,
+            "context": {"create": False},
+            "target": 'new',
+            "domain": [('project_id', '=', self.project_id.id),('phase_id', '=', self.id)]
+        }
+        return action_window
+
+
+    def _create_time_plan(self):
+        for rec in self:
+            if rec.plan_by_departments:
+                values = []
+                exist_dept = rec.time_plan_ids.mapped('department_id').ids
+                for dept in rec.department_ids:
+                    if dept.id not in exist_dept:
+                        values.append({
+                            'project_id': rec.project_id.id,
+                            'department_id': dept.id,
+                            'phase_id': rec.id,
+                        })
+                self.env['project.time.plan'].create(values)
+            else:
+                values = [{
+                    'project_id': rec.project_id.id,
+                    'phase_id': rec.id,
+                }]
+                self.env['project.time.plan'].create(values)
diff --git a/odex25_project/project_time_plan/models/project_time_plan.py b/odex25_project/project_time_plan/models/project_time_plan.py
new file mode 100644
index 000000000..a978edbec
--- /dev/null
+++ b/odex25_project/project_time_plan/models/project_time_plan.py
@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class TimePlanDetails(models.Model):
+    _name = "time.plan.details"
+    _description = "Time Plan Details"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    name = fields.Char("Code")
+    date_from = fields.Date(string="From")
+    date_to = fields.Date(string="To")
+
+
+class ProjectTimePlan(models.Model):
+    _name = "project.time.plan"
+    _description = "Time Plan"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    department_id = fields.Many2one('hr.department', string="Department", tracking=True)
+    project_id = fields.Many2one('project.project', string='Project', ondelete="restrict", tracking=True)
+    project_status = fields.Selection([
+        ('open', 'Open'),
+        ('pending', 'Closed Pending Payment'),
+        ('hold', 'Hold'),
+        ('close', 'Closed')], string='Status', related="project_id.status")
+    company_id = fields.Many2one('res.company', related="project_id.company_id", string='Company')
+    plan_by_departments = fields.Boolean(string="Plan By Departments", related='company_id.plan_by_departments',readonly=False)
+    project_user_id = fields.Many2one("res.users", related="project_id.user_id", string="Project Manager", store=True)
+    phase_id = fields.Many2one('project.phase', ondelete="restrict", string='Project Stage', tracking=True)
+    start_date = fields.Date(string="From", related='phase_id.start_date')
+    end_date = fields.Date(string="To", related='phase_id.end_date')
+    origin_plan = fields.Float(string="Stage Total Hours", related="phase_id.estimated_hours")
+    time_plan = fields.Float(string="Dept Allocated Hrs")
+    remaining_hours = fields.Float()
+    consumed_hours = fields.Float()
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('confirm', 'Confirmed'),
+        ('close', 'Closed')], string='Status',
+        copy=False, default='draft', required=True, tracking=True)
+    time_plan_ids = fields.Many2many('time.plan.details', string="Time Plan")
+    line_ids = fields.One2many('project.time.plan.line', 'plan_id')
+
+    def action_view_time_plan(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.time.plan.line",
+            "name": "Time Plan",
+            'view_type': 'tree',
+            'view_mode': 'pivot,tree',
+            "context": {"create": False},
+            "domain": [('plan_id', '=', self.id)]
+        }
+        return action_window
+
+    @api.constrains('phase_id', 'time_plan')
+    def _check_hours(self):
+        for rec in self:
+            if rec.plan_by_departments:
+                time_plan = sum(rec.phase_id.time_plan_ids.mapped('time_plan'))
+            else:
+                time_plan = sum(rec.phase_id.time_plan_ids.mapped('origin_plan'))
+            if time_plan > rec.phase_id.estimated_hours and not rec._context.get('edit', False):
+                raise ValidationError(_('Sum of Time Plans Hours must not exceed stage Allocated Hours.'))
+
+    @api.constrains('time_plan', 'line_ids', 'line_ids.time_plan')
+    def _check_weeks_time(self):
+        line_time_plan = sum(self.line_ids.mapped('time_plan'))
+        for rec in self:
+            if rec.plan_by_departments:
+                if line_time_plan > rec.time_plan:
+                    raise ValidationError(_('Sum of time plan Details must not exceed %s.' % rec.time_plan))
+            else:
+                if line_time_plan > rec.origin_plan:
+                    raise ValidationError(_('Sum of time plan Details must not exceed %s.' % rec.origin_plan))
+
+    def name_get(self):
+        result = []
+        for rec in self:
+            name = rec.department_id.name or '' + '-' + rec.project_id.name or ''
+            result.append((rec.id, name))
+        return result
+
+    @api.onchange('phase_id')
+    def _onchange_phase_id(self):
+        plan_details = []
+        if self.phase_id:
+            plan_details = self._get_time_plan_details(self.phase_id.start_date, self.phase_id.end_date)
+        self.time_plan_ids = [(6, 0, plan_details)]
+
+    def unlink(self):
+        for rec in self:
+            if rec.state not in ['draft']:
+                raise UserError(_('You cannot delete a confirmed Time plan.'))
+            rec.line_ids.unlink()
+        super(ProjectTimePlan, self).unlink()
+
+    def _get_time_plan_details(self, start_date, end_date):
+        WEEK_OBJ = self.env['time.plan.details']
+        self.env.cr.execute("""
+                        SELECT id
+                        FROM time_plan_details
+                        WHERE (date_from between %s AND %s) OR (date_to between %s AND %s)""",
+                            (fields.Date.to_string(start_date), fields.Date.to_string(end_date),
+                             fields.Date.to_string(start_date), fields.Date.to_string(end_date)))
+        plan_details = list(w[0] for w in self.env.cr.fetchall())
+        if not plan_details and not self.line_ids:
+            raise ValidationError(_("Kindly check time plan details configration with your admin"))
+        return plan_details
+
+    def get_line_ids(self):
+        PlanLine = self.env["project.time.plan.line"]
+        for plan in self:
+            vals_list = []
+            for time_plan in plan.time_plan_ids:
+                vals_list.append({'plan_id': plan.id, 'project_id': plan.project_id.id, 'time_plan_id': time_plan.id,
+                                  'department_id': plan.department_id.id})
+            plan.line_ids = [(6, 0, PlanLine.create(vals_list).ids)]
+
+    def action_draft(self):
+        self.write({'state': 'draft'})
+
+    def action_confirm(self):
+        self.write({'state': 'confirm'})
+
+    def action_close(self):
+        self.write({'state': 'close'})
+
+
+class ProjectTimePlanLine(models.Model):
+    _name = "project.time.plan.line"
+    _description = "Time Plan Details"
+
+    plan_id = fields.Many2one('project.time.plan', ondelete="cascade")
+    company_id = fields.Many2one('res.company', related="project_id.company_id", string='Company')
+    phase_id = fields.Many2one('project.phase', related='plan_id.phase_id', store=True)
+    time_plan_id = fields.Many2one('time.plan.details', string="Time Plan")
+    time_plan_date_from = fields.Date(related="time_plan_id.date_from", store=True)
+    time_plan_date_to = fields.Date(related="time_plan_id.date_to", store=True)
+    project_id = fields.Many2one('project.project', string="Project", store=True)
+    department_id = fields.Many2one("hr.department", related='plan_id.department_id', string="Department", store=True)
+    time_plan = fields.Float(string="Hours", default=0.0)
+    hr_plan = fields.Float(string="HR Plan", compute="_compute_hr_plan", store=True)
+    plan_by_departments = fields.Boolean(related='plan_id.plan_by_departments')
+
+
+    @api.depends('time_plan')
+    def _compute_hr_plan(self):
+        for rec in self:
+            if rec.time_plan:
+                rec.hr_plan = rec.time_plan / 45
+            else:
+                rec.hr_plan = 0.0
+
diff --git a/odex25_project/project_time_plan/models/res_company.py b/odex25_project/project_time_plan/models/res_company.py
new file mode 100644
index 000000000..2c8a35265
--- /dev/null
+++ b/odex25_project/project_time_plan/models/res_company.py
@@ -0,0 +1,11 @@
+from odoo import models, fields, _
+
+
+class ResCompany(models.Model):
+    _inherit = 'res.company'
+
+    plan_by = fields.Selection([('man_hours', 'Man hours'), ('man_days', 'Man Days'), ], string='Plan By')
+    detailed_plan_unit = fields.Selection([('week', 'Weeks'), ('month', 'Months'), ], default='week',
+                                          string='Detailed Plan Unit')
+    plan_by_departments = fields.Boolean(string="Plan By Departments")
+
diff --git a/odex25_project/project_time_plan/models/res_config_setting.py b/odex25_project/project_time_plan/models/res_config_setting.py
new file mode 100644
index 000000000..dd6aaaa01
--- /dev/null
+++ b/odex25_project/project_time_plan/models/res_config_setting.py
@@ -0,0 +1,18 @@
+from odoo import models, fields, _, api
+from odoo.exceptions import ValidationError
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    plan_by = fields.Selection(string='Plan By', related='company_id.plan_by', readonly=False)
+    detailed_plan_unit = fields.Selection(string="Detailed Plan Unit", related='company_id.detailed_plan_unit',
+                                          readonly=False)
+    plan_by_departments = fields.Boolean(string="Plan By Departments", related='company_id.plan_by_departments',
+                                         readonly=False)
+
+    @api.constrains('detailed_plan_unit')
+    def detailed_plan_unit_constrain(self):
+        plan_unit = self.env['time.plan.details'].search([])
+        if plan_unit:
+            raise ValidationError(_("sorry the Detailed Plan Unit can not be changed after set"))
diff --git a/odex25_project/project_time_plan/security/ir.model.access.csv b/odex25_project/project_time_plan/security/ir.model.access.csv
new file mode 100644
index 000000000..c1edd5807
--- /dev/null
+++ b/odex25_project/project_time_plan/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_time_plan,project.time.plan,model_project_time_plan,project.group_project_user,1,1,1,1
+access_project_time_plan_line,project.time.plan.line,model_project_time_plan_line,project.group_project_user,1,1,1,1
+access_week_generation_wizard,week_generation_wizard,model_week_generation_wizard,project.group_project_user,1,1,1,1
+access_time_plan_details,time_plan_details,model_time_plan_details,project.group_project_user,1,1,1,1
\ No newline at end of file
diff --git a/odex25_project/project_time_plan/views/project_phase_views.xml b/odex25_project/project_time_plan/views/project_phase_views.xml
new file mode 100644
index 000000000..9cb756aac
--- /dev/null
+++ b/odex25_project/project_time_plan/views/project_phase_views.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="project_phase_form_view_inherit" model="ir.ui.view">
+        <field name="name">project.phase.form.inherit</field>
+        <field name="model">project.phase</field>
+        <field name="inherit_id" ref="project_base.project_phase_form_view"/>
+        <field name="arch" type="xml">
+            <field name="start_date" position="after">
+                <field name="plan_by_departments" invisible="1"/>
+                <field name="department_ids" readonly="1" widget="many2many_tags"
+                       attrs="{'invisible': [('plan_by_departments', '=', False)]}"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="view_edit_project_form_inherit" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project_base.view_edit_project_inherit_form"/>
+        <field name="arch" type="xml">
+            <field name="is_down_payment" position="after">
+                <field name="plan_by_departments" invisible="1"/>
+            </field>
+            <xpath expr="//field[@name='company_id']" position="after">
+                <field name="plan_by" attrs="{'readonly':[('state','not in',['draft'])],'required':True}" />
+            </xpath>
+            <xpath expr="//field[@name='project_phase_ids']/tree/field[@name='estimated_hours']" position="after">
+                <field name="department_ids" attrs="{'column_invisible': [('parent.plan_by_departments', '=', False)],'readonly':[('state','not in',['draft'])],'required':[('parent.plan_by_departments', '!=', False)]}" widget="many2many_tags"/>
+                <button name="action_get_phase" type="object" string="Details" icon="fa-list"/>
+            </xpath>
+            <xpath expr="//field[@name='project_phase_ids']/tree/field[@name='estimated_hours']" position="replace">
+                <field name="plan_by_hour" string="Allocated By Hour" attrs="{'column_invisible': [('parent.plan_by', '=', 'man_days')]}"/>
+                <field name="plan_by_day" string="Allocated By Day" attrs="{'column_invisible': [('parent.plan_by', '=', 'man_hours')]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/odex25_project/project_time_plan/views/project_time_plan_view.xml b/odex25_project/project_time_plan/views/project_time_plan_view.xml
new file mode 100644
index 000000000..7d75aedfb
--- /dev/null
+++ b/odex25_project/project_time_plan/views/project_time_plan_view.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Project Phase -->
+    <record id="project_time_plan_form_view" model="ir.ui.view">
+        <field name="name">project.time.plan.form</field>
+        <field name="model">project.time.plan</field>
+        <field name="arch" type="xml">
+            <form string="Project Time Plan" create="1" edit="1">
+                <header>
+                    <button name="action_confirm" string="Confirm" type="object"
+                            attrs="{'invisible':[('state','not in',['draft'])]}" class="oe_highlight"/>
+                    <button name="action_draft" string="Set to Draft" type="object"
+                            attrs="{'invisible':[('state','not in',['confirm'])]}"/>
+                    <button name="action_draft" string="Open" type="object"
+                            attrs="{'invisible':[('state','not in',['close'])]}"/>
+
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button class="oe_stat_button" type="object"
+                                name="action_view_time_plan" string="Time Plan" icon="fa-bar-chart">
+                        </button>
+                    </div>
+                    <group>
+                        <group>
+                            <!-- <field name="name" required="1"/> -->
+                            <field name="project_id" required="1" attrs="{'readonly':True}"/>
+                        </group>
+                        <group>
+                            <field name="plan_by_departments" invisible="1"/>
+                            <field name="department_id" readonly="1"
+                                   attrs="{'invisible': [('plan_by_departments', '=', False)]}"/>
+                            <field name="phase_id" required="1" attrs="{'readonly':True}"/>
+                            <field name="start_date"/>
+                            <field name="end_date"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="origin_plan" required="1" widget="float_time" style="width:25%;"/>
+                            <field name="time_plan" required="1" readonly="1"
+                                   attrs="{'invisible': [('plan_by_departments', '=', False)]}" widget="float_time"
+                                   style="width:25%;"/>
+                        </group>
+                    </group>
+                    <group>
+                        <field name="time_plan_ids" widget="many2many_tags" invisible="1" force_save="1"/>
+                        <field name="project_status" invisible="1"/>
+                    </group>
+                    <notebook>
+                    <page string="Summary">
+                        <div class="alert alert-danger" role="alert" style="margin-bottom:0px;"
+                             attrs="{'invisible':[('project_status', 'in', ('open'))]}">
+                            <p>Project must be in Open Status in order to enter Time Plan</p>
+                        </div>
+                        <group name="plan" class="hr_timesheet_sheet_summary">
+                            <field
+                                    name="line_ids"
+                                    nolabel="1"
+                                    widget="x2many_2d_matrix"
+                                    field_x_axis="time_plan_id"
+                                    field_y_axis="department_id"
+                                    field_value="time_plan"
+                                    attrs="{'readonly':['|',('state','not in',['draft']),('project_status','not in',['open'])]}">
+                                <tree limit="1000000">
+                                    <field name="time_plan" widget="float_time"  attrs="{'invisible': [('plan_by_departments', '=', False)]}"/>
+                                    <field name="plan_id"/>
+                                    <field name="time_plan_id"/>
+                                    <field name="project_id"/>
+                                    <field name="plan_by_departments" invisible="1"/>
+                                    <field name="department_id" attrs="{'invisible': [('plan_by_departments', '=', False)]}"/>
+                                    <!--                                        <field name="timesheet_lines" />-->
+                                    <!-- <field name="total_consumed_hours"/> -->
+                                </tree>
+                            </field>
+                        </group>
+                    </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" groups="base.group_user"/>
+                    <field name="activity_ids"/>
+                    <field name="message_ids"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_time_plan_tree" model="ir.ui.view">
+        <field name="name">project.time.plan.tree</field>
+        <field name="model">project.time.plan</field>
+        <field name="arch" type="xml">
+            <tree string="Project Phase" create="0" edit="1" expand="1">
+                <field name="project_id" optional="show"/>
+                 <field name="plan_by_departments" invisible="1"/>
+                <field name="department_id" optional="show"  attrs="{'invisible': [('plan_by_departments', '=', False)]}"/>
+                <field name="phase_id" optional="show"/>
+                <field name="start_date"/>
+                <field name="end_date"/>
+                <field name="origin_plan" widget="float_time"/>
+                <field name="time_plan" widget="float_time"/>
+                <field name="state" widget="badge" decoration-info="state in ['draft']"
+                       decoration-success="state in ['close','confirm']"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="project_time_plan_tree_project" model="ir.ui.view">
+        <field name="name">project.time.plan.tree</field>
+        <field name="model">project.time.plan</field>
+        <field name="priority">2000</field>
+        <field name="arch" type="xml">
+            <tree string="Time Plan" create="1" editable="top">
+                <!-- <field name="name" readonly="1"/> -->
+                <!-- <field name="project_id" readonly="1"/> -->
+                <field name="phase_id" readonly="1"/>
+                <field name="department_id" readonly="1"/>
+                <field name="time_plan" widget="float_time" sum="time_plan"/>
+                <!-- <button name="action_confirm" string="Confirm" type="object"  icon="fa-check" attrs="{'invisible':[('state','not in',['draft'])]}"/>
+                <button name="action_draft" type="object" icon="fa-refresh" attrs="{'invisible':[('state','not in',['confirm'])]}"/>
+                <field name="state" widget="badge" decoration-info="state in ['draft','confirm']" decoration-success="state == 'close'"/> -->
+            </tree>
+        </field>
+    </record>
+
+     <record id="view_time_plan_search" model="ir.ui.view">
+        <field name="name">project.time.plan.search</field>
+        <field name="model">project.time.plan</field>
+        <field name="arch" type="xml">
+            <search string="Time Plan">
+                <!-- <field name="name" filter_domain="['|', ('name','ilike',self), ('stage_id','=like',str(self)+'%')]" string="Name"/> -->
+                <field string="Project" name="project_id"/>
+                <field string="Department" name="department_id"/>
+                <separator/>
+                <filter string="Open" name="open" domain="[('state', 'in', ['draft','confirm'])]"/>
+                <filter string="Closed" name="close" domain="[('state', '=', 'close')]"/>
+                <separator/>
+                <group expand="0" string="Group By">
+                    <filter string="Project" name="project" domain="" context="{'group_by':'project_id'}"/>
+                    <filter string="Department" name="department" domain="" context="{'group_by':'department_id'}"/>
+                    <filter string="Status" name="status" domain="" context="{'group_by':'state'}"/>
+                    <filter string="Stages" name="stage" domain="" context="{'group_by':'phase_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+
+    <record id="open_project_time_plan_tree" model="ir.actions.act_window">
+        <field name="name">All Project Time Plan</field>
+        <field name="res_model">project.time.plan</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="project_time_plan_tree_project"/>
+        <field name="context">{'search_default_project': 1}</field>
+    </record>
+
+
+    <record id="open_project_time_plan_form" model="ir.actions.act_window">
+        <field name="name">Project Time Plan</field>
+        <field name="res_model">project.time.plan</field>
+        <field name="view_mode">tree,form,kanban</field>
+        <field name="view_id" ref="project_time_plan_tree"/>
+        <field name="context">{'search_default_project': 1}</field>
+    </record>
+
+
+    <menuitem action="open_project_time_plan_form" id="menu_project_time_plan_root" name="Time Plan"
+              parent="project.menu_main_pm" sequence="4"/>
+
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_time_plan/views/res_config_setting.xml b/odex25_project/project_time_plan/views/res_config_setting.xml
new file mode 100644
index 000000000..71be4faca
--- /dev/null
+++ b/odex25_project/project_time_plan/views/res_config_setting.xml
@@ -0,0 +1,55 @@
+<odoo>
+    <record id="view_config_settings_form_inherit" model="ir.ui.view">
+        <field name="name">view.config.settings.inherit.form</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="project_base.view_config_settings_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='project_invoice']" position="after">
+                <div class="col-12 col-lg-6 o_setting_box" id="plan_by">
+                    <div class="o_setting_left_pane"/>
+                    <div class="o_setting_right_pane">
+                        <span class="o_form_label">Plan By</span>
+                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."
+                              aria-label="Values set here are company-specific." groups="base.group_multi_company"
+                              role="img"/>
+                        <div class="text-muted">
+                            Project Plan By
+                        </div>
+                        <div class="content-group">
+                            <field name="plan_by" class="o_light_label mt16" widget="radio"/>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-12 col-lg-6 o_setting_box" id="detailed_plan_unit">
+                    <div class="o_setting_left_pane"/>
+                    <div class="o_setting_right_pane">
+                        <span class="o_form_label">Detailed Plan Unit</span>
+                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."
+                              aria-label="Values set here are company-specific." groups="base.group_multi_company"
+                              role="img"/>
+                        <div class="text-muted">
+                            Detailed Plan Unit
+                        </div>
+                        <div class="content-group">
+                            <field name="detailed_plan_unit" class="o_light_label mt16" widget="radio"/>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-12 col-lg-6 o_setting_box" id="plan_by_departments">
+                    <div class="o_setting_left_pane">
+                        <field name="plan_by_departments"/>
+                    </div>
+                    <div class="o_setting_right_pane" name="plan_by_departments">
+                        <label for="plan_by_departments"/>
+                        <div class="text-muted">
+                            Plan By Departments
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_time_plan/views/time_plan_detail.xml b/odex25_project/project_time_plan/views/time_plan_detail.xml
new file mode 100644
index 000000000..06a20a919
--- /dev/null
+++ b/odex25_project/project_time_plan/views/time_plan_detail.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Week Form -->
+    <record id="time_plan_details_form_view" model="ir.ui.view">
+        <field name="name">time.plan.details.form</field>
+        <field name="model">time.plan.details</field>
+        <field name="arch" type="xml">
+            <form string="Week">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name" required="1"/>
+                        </group>
+                        <group>
+                            <field name="date_from" required="0"/>
+                            <field name="date_to" required="0"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="time_plan_details_tree_view" model="ir.ui.view">
+        <field name="name">time.plan.details.tree</field>
+        <field name="model">time.plan.details</field>
+        <field name="arch" type="xml">
+            <tree string="Week">
+                <field name="name"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="open_time_plan_details_action" model="ir.actions.act_window">
+        <field name="name">Time Plan Details</field>
+        <field name="res_model">time.plan.details</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="time_plan_details_tree_view"/>
+    </record>
+
+    <menuitem action="open_time_plan_details_action" id="menu_time_plan_details"  parent="project.menu_project_config" groups="base.group_no_one" sequence="7"/>
+
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/project_time_plan/wizard/__init__.py b/odex25_project/project_time_plan/wizard/__init__.py
new file mode 100644
index 000000000..497083f71
--- /dev/null
+++ b/odex25_project/project_time_plan/wizard/__init__.py
@@ -0,0 +1,2 @@
+from . import week_generation_wizard
+from . import edit_project_phase
diff --git a/odex25_project/project_time_plan/wizard/edit_project_phase.py b/odex25_project/project_time_plan/wizard/edit_project_phase.py
new file mode 100644
index 000000000..75d6d336d
--- /dev/null
+++ b/odex25_project/project_time_plan/wizard/edit_project_phase.py
@@ -0,0 +1,25 @@
+from odoo import fields, models,api,_
+
+
+class EditProjectPhase(models.TransientModel):
+
+    _inherit = "edit.project.phase"
+
+    estimated_days = fields.Float("Additional Estimated Days")
+    plan_by = fields.Selection(string='Plan By',related='phase_id.plan_by', readonly=False)
+
+    def edit_phase(self):
+        self.ensure_one()
+        to_write = {}
+        act_close = {"type": "ir.actions.act_window_close"}
+        active_id = self._context.get("active_id")
+        phase = self.env['project.phase'].browse(active_id)
+        if phase.plan_by == 'man_hours':
+            plan_by_hour = phase.estimated_hours + self.estimated_hours
+            to_write.update({'plan_by_hour':plan_by_hour})
+        elif phase.plan_by == 'man_days':
+            plan_by_day = phase.plan_by_day + self.estimated_days
+            to_write.update({'plan_by_day':plan_by_day})
+        to_write.update({'start_date':self.start_date,'end_date':self.end_date})
+        phase.write(to_write)
+        return act_close
diff --git a/odex25_project/project_time_plan/wizard/edit_project_phase_view.xml b/odex25_project/project_time_plan/wizard/edit_project_phase_view.xml
new file mode 100644
index 000000000..a59b7a40c
--- /dev/null
+++ b/odex25_project/project_time_plan/wizard/edit_project_phase_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_edit_project_phase_wizard" model="ir.ui.view">
+        <field name="name">Edit Project Phase</field>
+        <field name="model">edit.project.phase</field>
+        <field name="inherit_id" ref="project_base.view_edit_project_phase_wizard"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='estimated_hours']" position="replace">
+                <field name="plan_by" invisible="1"/>
+                 <field name="estimated_hours" string="Allocated By Hour" attrs="{'invisible': [('plan_by', '=', 'man_days')]}"/>
+                 <field name="estimated_days" string="Allocated By Day" attrs="{'invisible': [('plan_by', '=', 'man_hours')]}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/project_time_plan/wizard/week_generation_wizard.py b/odex25_project/project_time_plan/wizard/week_generation_wizard.py
new file mode 100644
index 000000000..e9b11bc2d
--- /dev/null
+++ b/odex25_project/project_time_plan/wizard/week_generation_wizard.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models,_
+from datetime import date,datetime, time, timedelta
+from dateutil.relativedelta import relativedelta
+import pendulum
+
+
+
+class WeekGenerationWizard(models.TransientModel):
+    _name = 'week.generation.wizard'
+    _description = 'Week Generation Wizard'
+
+    def get_years(self):
+        res = []
+        year = datetime.today() + relativedelta(years=3)
+        year = year.year
+        YEARS = [year - i for i in range(8)]
+        for y in YEARS:
+            res.append((str(y),str(y)))
+        return res
+
+    year = fields.Selection(selection=lambda self: self.get_years(),string="Years")
+    company_id = fields.Many2one('res.company', string="Company", default=lambda self: self.env.user.company_id)
+    # detailed_plan_unit = fields.Selection(string="Detailed Plan Unit",related='company_id.detailed_plan_unit',readonly=False)
+
+    def get_month_info(self,year):
+        month_info = {}
+        for i in range(1, 13):
+            start_date = datetime(year, i , 1)
+            if i  == 12:
+                end_date = datetime(year + 1, 1, 1) - timedelta(days=1)
+            else:
+                end_date = datetime(year, i  + 1, 1) - timedelta(days=1)
+
+            month_code = f"{year}-{i :02d}"
+
+            month_info = {
+                'date_from': start_date.strftime("%Y-%m-%d"),
+                'date_to': end_date.strftime("%Y-%m-%d"),
+                'name': month_code
+            }
+            self.env['time.plan.details'].create(month_info)
+        return month_info
+
+
+    def get_week_name(self,start_date):
+        """ Generates a week name
+        """
+        res = {}
+        year_week = start_date.strftime('%Y-%U')
+        res['name'] = year_week
+        pendulum.week_starts_at(pendulum.SUNDAY)
+        pendulum.week_ends_at(pendulum.SATURDAY)
+        pendulum_date = pendulum.datetime(start_date.year, start_date.month, start_date.day)
+        start = pendulum_date.start_of('week')
+        end = pendulum_date.end_of('week')
+        res['date_from'] =  start
+        res['date_to'] = end
+        return res
+
+
+    def generate_week(self):
+        values = []
+        start_date = datetime.now().date().replace(year=int(self.year),month=1, day=1)
+        end_date = datetime.now().date().replace(year=int(self.year),month=12, day=31)
+        weeks_in_start_year = int(date(start_date.year, 12, 28).strftime("%U"))
+        start_week = start_date.strftime("%U")
+        end_week = end_date.strftime("%U")
+        if start_week ==  end_week:
+            start_date = start_date + relativedelta(days=7)
+            start_week = start_date.strftime("%U")
+        for week in range(0, (int(end_week) - int(start_week)) + 1):
+            res = self.get_week_name(start_date + relativedelta(days=7 * week))
+            values.append(res)
+        self.env['time.plan.details'].create(values)
+        return True
+
+    def get_data(self):
+        if self.company_id.detailed_plan_unit == 'week':
+            self.generate_week()
+        else:
+            self.get_month_info(int(self.year))
diff --git a/odex25_project/project_time_plan/wizard/week_generation_wizard_views.xml b/odex25_project/project_time_plan/wizard/week_generation_wizard_views.xml
new file mode 100644
index 000000000..91b194cb5
--- /dev/null
+++ b/odex25_project/project_time_plan/wizard/week_generation_wizard_views.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="week_generation_wizard_form" model="ir.ui.view">
+            <field name="name">Generation Year Week</field>
+            <field name="model">week.generation.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Generation Year Week">
+                    <group>
+                        <group>
+                            <field name="year" required="1"/>
+                        </group>
+                    </group>
+                    <group>
+                        <span>Select Year to generate Time Plan Details(weeks or months) on it base on your system configuration,And make sure you don't enter any record in this year.</span>
+                    </group>
+                    <footer>
+                        <button string="Generate" type="object" name="generate_week" class="btn btn-primary" />
+                        <button string="Cancel" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="week_generation_wizard_action" model="ir.actions.act_window">
+            <field name="name">Generation Time Plan Details</field>
+            <field name="res_model">week.generation.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="view_id" ref="week_generation_wizard_form"/>
+        </record>
+
+        <menuitem action="week_generation_wizard_action" id="menu_week_generation_wizard" name="Generation Time Plan Details" parent="project.menu_project_config" groups="base.group_no_one" sequence="200"/>
+
+
+    </data>
+</odoo>
diff --git a/odex25_project/project_variation_order/__init__.py b/odex25_project/project_variation_order/__init__.py
new file mode 100644
index 000000000..601ffa6a9
--- /dev/null
+++ b/odex25_project/project_variation_order/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models
+
diff --git a/odex25_project/project_variation_order/__manifest__.py b/odex25_project/project_variation_order/__manifest__.py
new file mode 100644
index 000000000..2d8e555e2
--- /dev/null
+++ b/odex25_project/project_variation_order/__manifest__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Project Variation Order",
+    'summary': """Project Variation Order""",
+    'description': """
+        Add Variation Order in Your Project
+        1- add invoices request related to VO
+        2- adjust project phases dates based on VO
+    """,
+    'category': 'Odex25-Project/Odex25-Project',
+    'version': '1.0',
+    'depends': ['project_base'],
+    'data': [
+        'data/project_data.xml',
+        'data/mail_data.xml',
+        'security/project_security.xml',
+        'security/ir.model.access.csv',
+        'views/project_variation_order_view.xml',
+    ],
+}
diff --git a/odex25_project/project_variation_order/data/mail_data.xml b/odex25_project/project_variation_order/data/mail_data.xml
new file mode 100644
index 000000000..8c1b39ffc
--- /dev/null
+++ b/odex25_project/project_variation_order/data/mail_data.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="0">
+
+        <record id="mail_template_vo_confirm" model="mail.template">
+            <field name="name">Variation Order: Confirmation Email</field>
+            <field name="model_id" ref="project_variation_order.model_project_variation_order"/>
+            <field name="subject">${object.company_id.name} (${object.code or 'n/a' } ${object.name or 'n/a' })</field>
+            <field name="email_from">${(object.project_id.user_id.email_formatted or user.email_formatted) | safe}</field>
+            <field name="partner_to">${object.project_id.partner_id.id}</field>
+            <field name="body_html" type="html">
+<div style="margin: 0px; padding: 0px;">
+    <p style="margin: 0px; padding: 0px; font-size: 12px;">
+        Hello,
+        <br/><br/>
+        Your order <strong>${object.name}</strong> amounting in <strong>${format_amount(object.budget_amount, object.currency_id)}</strong>
+       <br/>
+            Thank you for your trust!
+        <br/><br/>
+        Do not hesitate to contact us if you have any questions.
+        <br/><br/>
+    </p>
+</div>
+    </field>
+            <!-- <field name="report_template" ref="action_report_saleorder"/>
+            <field name="report_name">${(object.name or '').replace('/','_')}</field> -->
+            <field name="lang">${object.project_id.partner_id.lang}</field>
+            <field name="auto_delete" eval="True"/>
+        </record>
+    </data>
+</odoo>
diff --git a/odex25_project/project_variation_order/data/project_data.xml b/odex25_project/project_variation_order/data/project_data.xml
new file mode 100644
index 000000000..774648d55
--- /dev/null
+++ b/odex25_project/project_variation_order/data/project_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="sequence_vo" model="ir.sequence">
+            <field name="name">Project CR sequence</field>
+            <field name="code">project.variation.order</field>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+            <field name="prefix">PCR/</field>
+            <field name="padding">5</field>
+            <field eval="False" name="company_id"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/odex25_project/project_variation_order/i18n/ar_001.po b/odex25_project/project_variation_order/i18n/ar_001.po
new file mode 100644
index 000000000..f302c9d76
--- /dev/null
+++ b/odex25_project/project_variation_order/i18n/ar_001.po
@@ -0,0 +1,562 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project_variation_order
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-13 07:47+0000\n"
+"PO-Revision-Date: 2024-06-13 07:47+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_variation_order
+#: model:mail.template,subject:project_variation_order.mail_template_vo_confirm
+msgid ""
+"${object.company_id.name} (${object.code or 'n/a' } ${object.name or 'n/a' "
+"})"
+msgstr ""
+
+#. module: project_variation_order
+#: model:mail.template,body_html:project_variation_order.mail_template_vo_confirm
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"    <p style=\"margin: 0px; padding: 0px; font-size: 12px;\">\n"
+"        Hello,\n"
+"        <br/><br/>\n"
+"        Your order <strong>${object.name}</strong> amounting in <strong>${format_amount(object.budget_amount, object.currency_id)}</strong>\n"
+"       <br/>\n"
+"            Thank you for your trust!\n"
+"        <br/><br/>\n"
+"        Do not hesitate to contact us if you have any questions.\n"
+"        <br/><br/>\n"
+"    </p>\n"
+"</div>\n"
+"    "
+msgstr ""
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid ""
+"<i class=\"fa fa-long-arrow-right mx-2 oe_edit_only\" aria-label=\"Arrow icon\" title=\"Arrow\" attrs=\"{'invisible': [('time','=',False)]}\"/>\n"
+"\t\t\t\t\t\t\t\t        <i class=\"fa fa-long-arrow-right mx-2 oe_read_only\" aria-label=\"Arrow icon\" title=\"Arrow\" attrs=\"{'invisible': [('time','=',False)]}\"/>"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Amount"
+msgstr ""
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Approve"
+msgstr "موافقة"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__project_scope
+msgid "Change Description"
+msgstr "وصف التغيير"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Change Domains"
+msgstr "مجالات التغيير"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__description
+msgid "Change Justifications"
+msgstr "مبررات التغيير"
+
+#. module: project_variation_order
+#: model:ir.model,name:project_variation_order.model_project_variation_order
+msgid "Change Request"
+msgstr "طلب التغيير"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_project__variation_count
+#: model:ir.model.fields,field_description:project_variation_order.field_project_project__variation_order_ids
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_edit_project_inherit_form
+msgid "Change Requests"
+msgstr "طلبات التغيير"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__company_id
+msgid "Company"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__total_invoiced_amount
+msgid "Currnt Project Budget"
+msgstr "ميزانية المشروع الحالية"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Description"
+msgstr "الوصف"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields.selection,name:project_variation_order.selection__project_variation_order__state__done
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Done"
+msgstr "تم"
+
+#. module: project_variation_order
+#: model:ir.model.fields.selection,name:project_variation_order.selection__project_variation_order__state__draft
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__date
+msgid "End Date"
+msgstr "تاريخ الانتهاء"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Enter Change Description"
+msgstr "ذكر نبذة عن وصف التغيير"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Enter Change Justifications"
+msgstr "ذكر نبذة عن مبررات التغيير"
+
+#. module: project_variation_order
+#: model:ir.model.fields.selection,name:project_variation_order.selection__project_variation_order__state__fin_approve
+msgid "Financial Manager Approval"
+msgstr "موافقة المدير المالي"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_variation_order_search
+msgid "Group By"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__id
+msgid "ID"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__message_needaction
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__message_unread
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__message_has_error
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__project_invoice_ids
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Invoice"
+msgstr "الدفعات"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__mark_vo_as_sent
+msgid "Mark as Sent"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__name
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_variation_order_search
+msgid "Name"
+msgstr "الرقم"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__new_date
+msgid "New End Date"
+msgstr "تاريخ نهاية المشروع المقترحة"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__budget_amount
+msgid "New Project Budget"
+msgstr "اجمالي الميزانية المقترحة"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__new_project_manager
+msgid "New Project Manager"
+msgstr "مدير المشروع الجديد"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: project_variation_order
+#: code:addons/project_variation_order/models/project_variation_order.py:0
+#, python-format
+msgid "Only the project owner can approve the Change Request."
+msgstr "يمكن لمالك المشروع فقط الموافقة على طلب التغيير."
+
+#. module: project_variation_order
+#: model:ir.model.fields.selection,name:project_variation_order.selection__project_variation_order__state__owner_approve
+msgid "Owner Approval"
+msgstr "موافقة مالك المشروع"
+
+#. module: project_variation_order
+#: model:ir.model.fields.selection,name:project_variation_order.selection__project_variation_order__state__confirm
+msgid "PM Approval"
+msgstr "موافقة مدير المشروع"
+
+#. module: project_variation_order
+#: model:ir.model.fields.selection,name:project_variation_order.selection__project_variation_order__state__approve
+msgid "PMO Approval"
+msgstr "موافقة مدير المشاريع"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__total_invoiced_payment
+msgid "Paid Amount"
+msgstr "المبلغ المدفوع"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Period"
+msgstr "الفترة"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Previous Change Request"
+msgstr "طلبات التغيير السابقة"
+
+#. module: project_variation_order
+#: model:ir.model,name:project_variation_order.model_project_project
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__project_id
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_variation_order_search
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__budget
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_variation_order_search
+msgid "Project Budget"
+msgstr "ميزانية المشروع"
+
+#. module: project_variation_order
+#: model:ir.actions.act_window,name:project_variation_order.open_project_vo_form
+#: model:ir.ui.menu,name:project_variation_order.menu_project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_tree
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_variation_order_search
+msgid "Project Change Request"
+msgstr "طلب التغيير "
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__manager
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__project_manager
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_variation_order_search
+msgid "Project Manager"
+msgstr "مدير المشروع"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__project_owner
+msgid "Project Owner"
+msgstr "مالك المشروع"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__project_phase_ids
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Project Phases"
+msgstr "مراحل المشروع"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__time
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_variation_order_search
+msgid "Project Schedule"
+msgstr "الجدول الزمني للمشروع"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__scope
+msgid "Project Scope"
+msgstr "نطاق المشروع"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__reason
+msgid "Reason/Justification"
+msgstr ""
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Refuse"
+msgstr "رفض"
+
+#. module: project_variation_order
+#: model:ir.model.fields.selection,name:project_variation_order.selection__project_variation_order__state__refuse
+msgid "Refused"
+msgstr "مرفوض"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Request"
+msgstr "طلب"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__request_date
+msgid "Request Date"
+msgstr "تاريخ الطلب"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__residual_amount
+msgid "Residual Amount"
+msgstr "المبلغ المتبقي"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.actions.server,name:project_variation_order.vo_send_email_action
+msgid "Send E-mail"
+msgstr "إرسال بريد إلكتروني"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Send by Email"
+msgstr "إرسال بريد إلكتروني"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Sent"
+msgstr "تم الارسال"
+
+#. module: project_variation_order
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Set to Draft"
+msgstr "إرجاع لمسودة"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__start
+msgid "Start Date"
+msgstr "تاريخ  البداية"
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__state
+#: model_terms:ir.ui.view,arch_db:project_variation_order.view_variation_order_search
+msgid "Status"
+msgstr "الحالة"
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__project_task_ids
+#: model_terms:ir.ui.view,arch_db:project_variation_order.project_variation_order_form_view
+msgid "Tasks"
+msgstr "المهام"
+
+#. module: project_variation_order
+#: code:addons/project_variation_order/models/project_variation_order.py:0
+#, python-format
+msgid ""
+"There is no sequence configured for VO in this company please contact your "
+"administrator to configure one."
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields.selection,name:project_variation_order.selection__project_variation_order__state__implement
+msgid "To implement"
+msgstr "للتنفيذ"
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,field_description:project_variation_order.field_project_variation_order__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: project_variation_order
+#: model:ir.model.fields,help:project_variation_order.field_project_variation_order__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: project_variation_order
+#: code:addons/project_variation_order/models/project_variation_order.py:0
+#, python-format
+msgid "You cannot delete a confirmed VO."
+msgstr "لا يمكنك حذف طلب تغيير مؤكد"
diff --git a/odex25_project/project_variation_order/models/__init__.py b/odex25_project/project_variation_order/models/__init__.py
new file mode 100644
index 000000000..1be57bfe1
--- /dev/null
+++ b/odex25_project/project_variation_order/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import project_variation_order
\ No newline at end of file
diff --git a/odex25_project/project_variation_order/models/project_variation_order.py b/odex25_project/project_variation_order/models/project_variation_order.py
new file mode 100644
index 000000000..4debe2502
--- /dev/null
+++ b/odex25_project/project_variation_order/models/project_variation_order.py
@@ -0,0 +1,262 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class ProjectVariationOrder(models.Model):
+    _name = "project.variation.order"
+    _description = "Change Request"
+    _order = 'name desc, id desc'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    name = fields.Char("Name", default="/", tracking=True)
+    request_date = fields.Date(
+        string='Request Date',
+        required=True,
+        index=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+        copy=False,
+        default=fields.Date.context_today)
+    description = fields.Text("Change Justifications", required=True)
+    project_id = fields.Many2one(
+        'project.project', string='Project', copy=False, tracking=True)
+    currency_id = fields.Many2one(
+        'res.currency', related="project_id.currency_id")
+    company_id = fields.Many2one('res.company', string='Company', copy=False, tracking=True,
+                                 default=lambda self: self.env.company)
+    project_manager = fields.Many2one(
+        'res.users', string='Project Manager', readonly=True, copy=False)
+    project_owner = fields.Many2one(
+        'res.users', string='Project Owner', copy=False)
+    manager = fields.Boolean('Project Manager', tracking=True)
+    new_project_manager = fields.Many2one(
+        'res.users', string='New Project Manager', tracking=True)
+    state = fields.Selection([
+        ('draft', 'Draft'),
+        ('confirm', 'PM Approval'),
+        ('approve', 'PMO Approval'),
+        ('fin_approve', 'Financial Manager Approval'),
+        ('owner_approve', 'Owner Approval'),
+        ('implement', 'To implement'),
+        ('done', 'Done'),
+        ('refuse', 'Refused')], string='Status',
+        copy=False, default='draft', required=True, tracking=True)
+    # Time
+    time = fields.Boolean('Project Schedule', tracking=True, readonly=True, states={
+                          'draft': [('readonly', False)]})
+    start = fields.Date(string='Start Date', readonly=False, copy=False)
+    date = fields.Date(string='End Date', readonly=False, copy=False)
+    new_date = fields.Date(string='New End Date', tracking=True)
+    project_phase_ids = fields.Many2many(
+        'project.phase', string="Project Phases", copy=False)
+    project_task_ids = fields.Many2many(
+        'project.task', string="Tasks", copy=False)
+    # Budget
+    budget = fields.Boolean('Project Budget', tracking=True, readonly=True, states={
+                            'draft': [('readonly', False)]})
+    total_invoiced_amount = fields.Float(
+        'Currnt Project Budget', readonly=True)
+    total_invoiced_payment = fields.Float(
+        'Paid Amount', readonly=True, copy=False)
+    residual_amount = fields.Float(
+        'Residual Amount', readonly=True, copy=False)
+    budget_amount = fields.Float(
+        'New Project Budget', tracking=True, copy=False)
+    # invoice_ids = fields.One2many('project.invoice', 'variation_order_id', "Invoice", copy=False)
+    project_invoice_ids = fields.Many2many(
+        'project.invoice', string="Invoice", copy=False)
+    # scope
+    scope = fields.Boolean('Project Scope', tracking=True, readonly=True, states={
+                           'draft': [('readonly', False)]})
+    project_scope = fields.Text(
+        "Change Description", copy=False, tracking=True)
+    mark_vo_as_sent = fields.Boolean("Mark as Sent")
+
+    @api.onchange('project_id')
+    def onchange_project_id(self):
+        for rec in self:
+            rec.project_phase_ids = False
+            rec.project_invoice_ids = False
+            rec.project_manager = False
+            rec.start = False
+            rec.date = False
+            rec.total_invoiced_amount = 0.0
+            rec.total_invoiced_payment = 0.0
+            rec.residual_amount = 0.0
+            if rec.project_id:
+                rec.start = rec.project_id.date_start
+                rec.date = rec.project_id.date
+            if rec.project_id and rec.project_id.project_phase_ids:
+                rec.project_phase_ids = rec.project_id.project_phase_ids.ids
+            if rec.project_id and rec.project_id.user_id:
+                rec.project_manager = rec.project_id.user_id.id
+
+            if rec.project_id and rec.project_id.invoice_ids:
+                rec.total_invoiced_amount = rec.project_id.total_invoiced_amount
+                rec.total_invoiced_payment = rec.project_id.total_invoiced_payment
+                rec.residual_amount = rec.project_id.residual_amount
+                rec.project_invoice_ids = rec.project_id.invoice_ids.ids
+
+    def action_view_previous(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.variation.order",
+            "name": "Previous Change Request",
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            "context": {"create": False},
+            "domain": [('project_id', '=', self.project_id.id)]
+        }
+        return action_window
+
+    @api.model
+    def _get_next_vo_code(self):
+        next_sequence = " "
+        sequence = self.env['ir.sequence'].search(
+            [('code', '=', 'project.variation.order')])
+        if sequence:
+            next_sequence = sequence.get_next_char(sequence.number_next_actual)
+        else:
+            raise ValidationError(
+                _("There is no sequence configured for VO in this company please contact your administrator to configure one."))
+        return next_sequence
+
+    @api.model
+    def create(self, vals):
+        vals['name'] = self.env['ir.sequence'].next_by_code(
+            'project.variation.order') or '/'
+        res = super().create(vals)
+        return res
+
+    def unlink(self):
+        for rec in self:
+            if rec.state not in ['draft']:
+                raise UserError(_('You cannot delete a confirmed VO.'))
+        super(ProjectVariationOrder, self).unlink()
+
+    def action_draft(self):
+        for rec in self:
+            if rec.state == 'implement' and rec.manager:
+                rec.project_id.write({'user_id': rec.project_manager.id})
+            if rec.state == 'implement' and rec.time:
+                rec.project_id.write({'date': rec.date})
+
+        self.write({'state': 'draft'})
+
+    def action_confirm(self):
+        self.write({'state': 'confirm'})
+
+    def action_approve(self):
+        self.write({'state': 'approve'})
+
+    def action_approve_pom(self):
+        for rec in self:
+            if rec.budget:
+                rec.write({'state': 'fin_approve'})
+            else:
+                rec.write({'state': 'owner_approve'})
+
+    def action_approve_fin(self):
+        self.write({'state': 'owner_approve'})
+
+    def action_implement(self):
+        for rec in self:
+            if rec.project_owner.id != self.env.uid:
+                raise UserError(
+                    _('Only the project owner can approve the Change Request.'))
+            if rec.manager:
+                rec.project_id.write({'user_id': rec.new_project_manager.id})
+            if rec.time:
+                rec.project_id.write({'date': rec.new_date})
+        self.write({'state': 'implement'})
+
+    def action_done(self):
+        self.write({'state': 'done'})
+
+    def action_refuse(self):
+        self.write({'state': 'refuse'})
+
+    def _find_mail_template(self):
+        self.ensure_one()
+        template_id = False
+        template_id = self.env['ir.model.data'].xmlid_to_res_id(
+            'project_variation_order.mail_template_vo_confirm', raise_if_not_found=False)
+        return template_id
+
+    def action_vo_send(self):
+        ''' Opens a wizard to compose an email, with relevant mail template loaded by default '''
+        self.ensure_one()
+        template_id = self._find_mail_template()
+        lang = self.env.context.get('lang')
+        template = self.env['mail.template'].browse(template_id)
+        if template.lang:
+            lang = template._render_lang(self.ids)[self.id]
+        ctx = {
+            'default_model': 'project.variation.order',
+            'default_res_id': self.ids[0],
+            'default_use_template': bool(template_id),
+            'default_template_id': template_id,
+            'default_composition_mode': 'comment',
+            'mark_vo_as_sent': True,
+            'proforma': self.env.context.get('proforma', False),
+            'force_email': True,
+            'model_description': self.with_context(lang=lang),
+        }
+        return {
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(False, 'form')],
+            'view_id': False,
+            'target': 'new',
+            'context': ctx,
+        }
+
+    @api.returns('mail.message', lambda value: value.id)
+    def message_post(self, **kwargs):
+        if self.env.context.get('mark_vo_as_sent'):
+            self.with_context(tracking_disable=True).write(
+                {'mark_vo_as_sent': True})
+        return super(ProjectVariationOrder, self.with_context(mail_post_autofollow=True)).message_post(**kwargs)
+
+
+class Project(models.Model):
+    _inherit = "project.project"
+
+    variation_order_ids = fields.One2many(
+        'project.variation.order', 'project_id', string='Change Requests')
+    variation_count = fields.Integer(
+        compute="get_variation", string='Change Requests')
+
+    def get_variation(self):
+        for rec in self:
+            rec.variation_count = len(rec.variation_order_ids)
+
+    def get_attached_domain(self):
+        return ['|','|','|','|',
+            '&',('res_model', '=', 'project.project'),
+            ('res_id', 'in', self.ids),
+            '&',('res_model', '=', 'project.task'),
+            ('res_id', 'in', self.task_ids.ids),
+            '&',('res_model', '=', 'project.invoice'),
+            ('res_id', 'in', self.invoice_ids.ids),
+            '&',('res_model', '=', 'project.phase'),
+            ('res_id', 'in', self.project_phase_ids.ids),
+            '&',('res_model', '=', 'project.variation.order'),
+            ('res_id', 'in', self.variation_order_ids.ids)
+        ]
+
+    def action_view_variation(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "project.variation.order",
+            "name": "Change Requests",
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            "context": {"create": False},
+            "domain": [('project_id', '=', self.id)]
+        }
+        return action_window
diff --git a/odex25_project/project_variation_order/security/ir.model.access.csv b/odex25_project/project_variation_order/security/ir.model.access.csv
new file mode 100644
index 000000000..46be91432
--- /dev/null
+++ b/odex25_project/project_variation_order/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_variation_order,project.variation.order,model_project_variation_order,project.group_project_user,1,1,1,1
diff --git a/odex25_project/project_variation_order/security/project_security.xml b/odex25_project/project_variation_order/security/project_security.xml
new file mode 100644
index 000000000..68cc70e79
--- /dev/null
+++ b/odex25_project/project_variation_order/security/project_security.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <!--VO rules -->
+        <record id="vo_project_multi_company_rule" model="ir.rule">
+            <field name="name">VO Project Multi Company rule</field>
+            <field name="model_id" ref="model_project_variation_order"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id', '=',False),('company_id', 'in', company_ids)]</field>
+        </record>
+
+        <record id="project_manager_vo_rule" model="ir.rule">
+            <field name="name">project Manager Rule</field>
+            <field name="model_id" ref="model_project_variation_order"/>
+            <field name="domain_force">['|',('project_id.parent_id.user_id','child_of',[user.id]),('project_manager', '=', user.id)]</field>
+            <field name="groups" eval="[(4, ref('project.group_project_manager'))]"/>
+        </record>
+
+        <record id="department_manager_vo_rule" model="ir.rule">
+            <field name="name">Department Manager VO Rule</field>
+            <field name="model_id" ref="model_project_variation_order"/>
+            <field name="domain_force">[(1, '=', 1)]
+            </field>
+            <field name="groups" eval="[(4, ref('project_base.group_project_department_manager'))]"/>
+        </record>
+
+        <record id="project_vo_super_user" model="ir.rule">
+            <field name="name">project vo super user</field>
+            <field name="model_id" ref="model_project_variation_order"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4, ref('base.group_erp_manager')),(4,ref('account.group_account_manager'))]"/>
+        </record>   
+
+    </data>
+</odoo>
diff --git a/odex25_project/project_variation_order/views/project_variation_order_view.xml b/odex25_project/project_variation_order/views/project_variation_order_view.xml
new file mode 100644
index 000000000..d6e822f67
--- /dev/null
+++ b/odex25_project/project_variation_order/views/project_variation_order_view.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="project_variation_order_form_view" model="ir.ui.view">
+        <field name="name">project.variation.order.form</field>
+        <field name="model">project.variation.order</field>
+        <field name="arch" type="xml">
+            <form string="Project Change Request" create="1" edit="1">
+                <header>
+                    <button name="action_confirm" string="Request" type="object"
+                            attrs="{'invisible':[('state','not in',['draft'])]}" class="oe_highlight"/>
+                            
+                    <button name="action_approve" string="Approve" type="object"
+                            attrs="{'invisible':[('state','not in',['confirm'])]}" class="oe_highlight"
+                            groups="project.group_project_manager"/>
+                    <button name="action_refuse" string="Refuse" type="object"
+                            attrs="{'invisible':[('state','not in',['confirm'])]}" class="oe_highlight"
+                            groups="project.group_project_manager"/>
+                            
+                    <button name="action_approve_pom" string="Approve" type="object"
+                            attrs="{'invisible':[('state','not in',['approve'])]}" class="oe_highlight"
+                            groups="project_base.group_project_department_manager"/>
+                    <button name="action_refuse" string="Refuse" type="object"
+                            attrs="{'invisible':[('state','not in',['approve'])]}" class="oe_highlight"
+                            groups="project_base.group_project_department_manager"/>
+                            
+                   <button name="action_approve_fin" string="Approve" type="object"
+                            attrs="{'invisible':[('state','not in',['fin_approve'])]}" class="oe_highlight"
+                            groups="account.group_account_manager"/>
+                    <button name="action_refuse" string="Refuse" type="object"
+                            attrs="{'invisible':[('state','not in',['fin_approve'])]}" class="oe_highlight"
+                            groups="account.group_account_manager"/>
+                            
+                    <button name="action_implement" string="Approve" type="object"
+                            attrs="{'invisible':[('state','not in',['owner_approve'])]}" class="oe_highlight"
+                            groups="project.group_project_user"/>
+                    <button name="action_refuse" string="Refuse" type="object"
+                            attrs="{'invisible':[('state','not in',['owner_approve'])]}" class="oe_highlight"
+                            groups="project.group_project_user"/>
+                            
+                    <button name="action_done" string="Done" type="object"
+                            attrs="{'invisible':[('state','not in',['implement'])]}" class="oe_highlight"
+                            groups="project.group_project_manager"/>
+                            
+                    <button name="action_vo_send" string="Send by Email" type="object" attrs="{'invisible':['|',('state','not in',['confirm']),('mark_vo_as_sent','=',True)]}"/>
+                    <button name="action_draft" string="Set to Draft" type="object"
+                            attrs="{'invisible':[('state','not in',['confirm','implement','refuse'])]}"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,approve,owner_approve,implement,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button class="oe_stat_button" type="object"
+                                name="action_view_previous" string="Previous Change Request" icon="fa-list-ol">
+                        </button>
+                    </div>
+                    <widget name="web_ribbon" title="Sent" bg_color="bg-info"
+                        attrs="{'invisible': [('mark_vo_as_sent', '!=', True)]}"/>
+                    <div class="oe_title">
+                        <h1 class="mt0" attrs="{'invisible':[('name', '=', '/')]}">
+                            <field name="name" attrs="{'readonly':True}"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="id" invisible="1"/>
+                            <field name="mark_vo_as_sent" invisible="1"/>
+                            <field name="project_id" required="1" attrs="{'readonly':[('state','not in',['draft'])]}" domain="[('status', '=', 'open')]"/>
+                            <field name="project_manager" force_save="1"/>
+                            <field name="project_owner" attrs="{'readonly':[('state','in',['done'])]}" />
+                        </group>
+                        <group>
+                            <field name="request_date" required="1" attrs="{'readonly':[('state','not in',['draft'])]}"/>
+                            <field name="company_id" attrs="{'readonly':True}" groups="base.group_multi_company"/>
+                        </group>
+                    </group>
+                    <group>
+                    	<field name="description" attrs="{'readonly':[('state','not in',['draft'])]}"
+                                       placeholder="Enter Change Justifications"/>
+                    </group>
+                    <notebook>
+                        <page string="Change Domains">
+                               <group >
+                                
+		                        <group >
+		                            <field name="time" />
+		                            
+		                            <label for="start" string="Period" attrs="{'invisible': [('time','=',False)]}"/>
+						            <div name="dates" class="o_row">
+								        <field name="start" attrs="{'invisible':[('time','=',False)],'required':[('time','=',True)],'readonly':[('state','not in',['draft'])]}" force_save="1"/>
+								        <i class="fa fa-long-arrow-right mx-2 oe_edit_only" aria-label="Arrow icon" title="Arrow" attrs="{'invisible': [('time','=',False)]}"/>
+								        <i class="fa fa-long-arrow-right mx-2 oe_read_only" aria-label="Arrow icon" title="Arrow" attrs="{'invisible': [('time','=',False)]}"/>
+								         <field name="date" attrs="{'invisible':[('time','=',False)],'required':[('time','=',True)],'readonly':[('state','not in',['draft'])]}" force_save="1"/>
+		                              </div> 
+		                            <field name="new_date" attrs="{'invisible':[('time','=',False)],'required':[('time','=',True)],'readonly':[('state','not in',['draft'])]}" force_save="1"/>
+		                        </group>
+		                        <group >
+		                            <field name="budget" />
+		                            <field name="total_invoiced_amount" attrs="{'invisible':[('budget','=',False)],'required':[('budget','=',True)]}" force_save="1"/>
+		                            <field name="total_invoiced_payment" attrs="{'invisible':[('budget','=',False)]}" force_save="1"/>
+		                            <field name="residual_amount" attrs="{'invisible':[('budget','=',False)]}" force_save="1"/>
+		                            <field name="budget_amount" 
+		                                   attrs="{'invisible':[('budget','=',False)],'required':[('budget','=',True)],'readonly':[('state','not in',['draft','confirm','approve'])]}" />
+		                        </group>
+		                        <group >
+		                            <field name="scope" />
+		                        </group>
+		                        <group >
+		                            <field name="manager" />
+		                            <field name="new_project_manager" 
+		                                   attrs="{'invisible':[('manager','=',False)],'required':[('manager','=',True)],'readonly':[('state','not in',['draft','confirm','approve'])]}"/>
+		                        </group>
+		                        </group>
+		                        <group>
+                                	<field name="project_scope" 
+                                	       attrs="{'invisible':[('scope','=',False)],'required':[('scope','=',True)],'readonly':[('state','not in',['draft','confirm','approve'])]}"
+                                        placeholder="Enter Change Description" />
+                                </group>
+                        </page>
+                        <page string="Project Phases" attrs="{'invisible':['|',('state','not in',['implement','done']),('time','=',False)]}">
+                            <field name="project_phase_ids" nolabel="1"
+                               attrs="{'readonly':True}" force_save="1" context="{'default_project_id': project_id}" domain="[('project_id', '=', project_id)]">
+                            <tree>
+                                
+                                <field name="phase_id"/>
+                                <field name="start_date"/>
+                                <field name="end_date"/>
+                                <field name="weight" />
+			                    <field name="progress" widget="progressbar"/>
+			                    <field name="state"/>
+                                <button name="%(project_base.action_edit_project_phase)d" type="action"
+                                        icon="fa-refresh"
+                                        attrs="{'invisible':['|',('state','not in',['open','draft']),('parent.state','not in',['implement'])]}" context="{'edit':True,'open_from':'vo','vo_id':parent.id}"/>
+                            </tree>
+                        </field>
+                        </page>
+                        <page string="Tasks" attrs="{'invisible':['|',('state','not in',['implement','done']),('scope','=',False)]}">
+                            <field name="project_task_ids" nolabel="1"
+                                 context="{'default_project_id': project_id}"  domain="[('project_id', '=', project_id)]">
+                            
+                        </field>
+                        </page>
+                        <page name="invoice" string="Invoice" attrs="{'invisible':['|',('state','not in',['implement','done']),('budget','=',False)]}">
+                            <field name="project_invoice_ids" nolabel="1" context="{'default_project_id': project_id, 'default_invoice_type': 'variation_order', 'default_note': description}"  domain="[('project_id', '=', project_id)]">
+				              <tree decoration-info="invoice_type=='variation_order'">
+                            <field name="name" string="Description"/>
+                            <field name="phase_id"/>
+                            <field name="plan_date" required="1"/>
+                            <field name="project_id" invisible="1"/>
+                            <field name="invoice_type" invisible="1"/>
+                            <field name="amount" sum="Amount"/>
+                            <field name="actual_date"/>
+                            <field name="plan_payment_date"/>
+                            <field name="actual_payment_date"/>
+                            <field name="to_invoice" invisible="1"/>
+                            <field name="state"/>
+                        </tree>  
+                    </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" groups="base.group_user"/>
+                    <field name="activity_ids"/>
+                    <field name="message_ids"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="project_variation_order_tree" model="ir.ui.view">
+        <field name="name">project.variation.order.tree</field>
+        <field name="model">project.variation.order</field>
+        <field name="arch" type="xml">
+            <tree string="Project Change Request"  sample="1">
+                <field name="name" bold="1"/>
+                <field name="request_date"/>
+                <field name="project_id" />
+                <field name="project_manager"/>
+                <field name="activity_ids" widget="list_activity" />
+                <field name="time" />
+                <field name="budget" />
+                <field name="scope"  />
+                <field name="manager" />
+                <field name="state" widget="badge" decoration-info="state in ['draft','confirm']"
+                       decoration-success="state == 'done'"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_variation_order_search" model="ir.ui.view">
+        <field name="name">project.variation.order.search</field>
+        <field name="model">project.variation.order</field>
+        <field name="arch" type="xml">
+            <search string="Project Change Request">
+                <field name="name" string="Name"/>
+                <field string="Project" name="project_id"/>
+                <separator/>
+                <filter string="Project Schedule" name="time" domain="[('time', '=', True)]"/>
+                <filter string="Project Budget" name="budget" domain="[('budget', '=', True)]"/>
+                <filter string="Project Budget" name="scope" domain="[('scope', '=', True)]"/>
+                <filter string="Project Manager" name="manager" domain="[('manager', '=', True)]"/>
+                <separator/>
+                <group expand="0" string="Group By">
+                    <filter string="Project" name="project" domain="" context="{'group_by':'project_id'}"/>
+                    <filter string="Status" name="status" domain="" context="{'group_by':'state'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+
+    <record id="open_project_vo_form" model="ir.actions.act_window">
+        <field name="name">Project Change Request</field>
+        <field name="res_model">project.variation.order</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="project_variation_order_tree"/>
+        <field name="context">{}</field>
+    </record>
+
+
+    <menuitem action="open_project_vo_form" id="menu_project_variation_order" groups="project.group_project_manager,project_base.group_project_department_manager" name="Project Change Request"
+              parent="project.menu_main_pm" sequence="8"/>
+
+    <!-- Send-email Action -->
+    <record id="vo_send_email_action" model="ir.actions.server">
+        <field name="name">Send E-mail</field>
+        <field name="model_id" ref="project_variation_order.model_project_variation_order"/>
+        <field name="binding_model_id" ref="project_variation_order.model_project_variation_order"/>
+        <field name="binding_view_types">form</field>
+        <field name="state">code</field>
+        <field name="code">action = records.action_vo_send()</field>
+    </record>
+    <record id="view_edit_project_inherit_form" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+               <div class="oe_button_box" position="inside">
+                        <button class="oe_stat_button" type="object" name="action_view_variation"  icon="fa-list-ol">
+                            <field string="Change Requests" name="variation_count" widget="statinfo"/>
+                        </button>
+
+                    </div>
+       </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/purchase_project/__init__.py b/odex25_project/purchase_project/__init__.py
new file mode 100644
index 000000000..dc5e6b693
--- /dev/null
+++ b/odex25_project/purchase_project/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/odex25_project/purchase_project/__manifest__.py b/odex25_project/purchase_project/__manifest__.py
new file mode 100644
index 000000000..f4936f441
--- /dev/null
+++ b/odex25_project/purchase_project/__manifest__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name': "Purchase - Project",
+    'summary': "Task Generation from Purchase Orders",
+    'description': """
+Allows to create task from your Purchase order
+=============================================
+This module allows to generate a project/task from Purchase orders.
+""",
+    'category': 'Hidden',
+    'depends': ['purchase', 'project'],
+    'data': [
+        'security/ir.model.access.csv',
+        # 'security/sale_project_security.xml',
+        'views/product_views.xml',
+        'views/project_task_views.xml',
+        'views/purchase_order_views.xml',
+    ],
+    'auto_install': True,
+    'license': 'LGPL-3',
+}
diff --git a/odex25_project/purchase_project/i18n/ar_001.po b/odex25_project/purchase_project/i18n/ar_001.po
new file mode 100644
index 000000000..8e8a68225
--- /dev/null
+++ b/odex25_project/purchase_project/i18n/ar_001.po
@@ -0,0 +1,320 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* purchase_project
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-05-22 13:26+0000\n"
+"PO-Revision-Date: 2024-05-22 13:26+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_project
+#: model_terms:ir.ui.view,arch_db:purchase_project.view_order_form_inherit_purchase_project
+msgid "Create Project"
+msgstr "إنشاء  مشروع"
+
+#. module: purchase_project
+#: model:ir.model.fields.selection,name:purchase_project.selection__product_template__purchase_service_tracking__project_only
+msgid "Create a new project but no task"
+msgstr "إنشاء مشروع جديد لكن بدون مهمة"
+
+#. module: purchase_project
+#: model:ir.model.fields.selection,name:purchase_project.selection__product_template__purchase_service_tracking__task_global_project
+msgid "Create a task in an existing project"
+msgstr "إنشاء مهمة في مشروع موجود"
+
+#. module: purchase_project
+#: model:ir.model.fields.selection,name:purchase_project.selection__product_template__purchase_service_tracking__task_in_project
+msgid "Create a task in purchase order's project"
+msgstr "إنشاء مهمة في مشروع أمر الشراء"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order__visible_project
+msgid "Display project"
+msgstr "عرض المشروع"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order__visible_project_btn
+msgid "Display project BTN"
+msgstr ""
+
+#. module: purchase_project
+#: model:ir.model.fields.selection,name:purchase_project.selection__product_template__purchase_service_tracking__no
+msgid "Don't create task"
+msgstr "لا تنشئ مهمة"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order_line__project_id
+msgid "Generated Project"
+msgstr "المشروع المنشأ"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order_line__task_id
+msgid "Generated Task"
+msgstr "المهمة المنشأة"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order_line__is_service
+msgid "Is a Service"
+msgstr "خدمة"
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/purchase_order.py:0
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_project_task__invoice_count
+msgid "Number of invoices"
+msgstr "عدد الفواتير "
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_product_product__purchase_service_tracking
+#: model:ir.model.fields,help:purchase_project.field_product_template__purchase_service_tracking
+msgid ""
+"On purchase order confirmation, this product can generate a project and/or task.         From those, you can track the service you are selling.\n"
+"         'In purchase order's project': Will use the purchase order's configured project if defined or fallback to         creating a new project based on the selected template."
+msgstr ""
+
+#. module: purchase_project
+#: model:ir.model,name:purchase_project.model_product_product
+msgid "Product"
+msgstr "المنتج"
+
+#. module: purchase_project
+#: model:ir.model,name:purchase_project.model_product_template
+msgid "Product Template"
+msgstr "قالب المنتج"
+
+#. module: purchase_project
+#: model:ir.model,name:purchase_project.model_project_project
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order__project_id
+#: model_terms:ir.ui.view,arch_db:purchase_project.view_order_form_inherit_purchase_project
+msgid "Project"
+msgstr "المشروع"
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_purchase_order_line__project_id
+msgid "Project generated by the purchases order item"
+msgstr "المشروع تم إنشاؤه بواسطة أمر الشراء"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_project_task__project_purchase_order_id
+msgid "Project's purchase order"
+msgstr "أمر شراء المشروع"
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/purchase_order.py:0
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order__project_ids
+#, python-format
+msgid "Projects"
+msgstr "المشاريع"
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_purchase_order__project_ids
+msgid "Projects used in this purchases order."
+msgstr "المشاريع المستخدمة في أمر الشراء هذا."
+
+#. module: purchase_project
+#: model:ir.model,name:purchase_project.model_purchase_order
+#: model:ir.model.fields,field_description:purchase_project.field_project_project__purchase_order_id
+#: model:ir.model.fields,field_description:purchase_project.field_project_task__purchase_order_id
+#: model_terms:ir.ui.view,arch_db:purchase_project.project_task_view_search
+#: model_terms:ir.ui.view,arch_db:purchase_project.view_edit_project_inherit_form
+#: model_terms:ir.ui.view,arch_db:purchase_project.view_sale_project_inherit_form
+msgid "Purchase Order"
+msgstr "أمر شراء"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_project_project__purchase_line_id
+#: model:ir.model.fields,field_description:purchase_project.field_project_task__purchase_line_id
+#: model_terms:ir.ui.view,arch_db:purchase_project.view_sale_project_inherit_form
+msgid "Purchase Order Item"
+msgstr "بند أمر الشراء"
+
+#. module: purchase_project
+#: model:ir.model,name:purchase_project.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "بند أمر الشراء"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_product_product__purchase_project_id
+#: model:ir.model.fields,field_description:purchase_project.field_product_template__purchase_project_id
+#: model_terms:ir.ui.view,arch_db:purchase_project.product_template_form_view_invoice_policy_inherit_sale_project
+msgid "Purchase Project"
+msgstr "المشروع"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_product_product__purchase_project_template_id
+#: model:ir.model.fields,field_description:purchase_project.field_product_template__purchase_project_template_id
+msgid "Purchase Project Template"
+msgstr "قالب المشروع"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_product_product__purchase_service_tracking
+#: model:ir.model.fields,field_description:purchase_project.field_product_template__purchase_service_tracking
+msgid "Purchase Service Tracking"
+msgstr "تتبع الخدمة"
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_project_project__purchase_line_id
+#: model:ir.model.fields,help:purchase_project.field_project_task__purchase_line_id
+msgid ""
+"Purchase order item to which the project is linked. Link the timesheet entry"
+" to the Purchase order item defined on the project. Only applies on tasks "
+"without purchase order item defined, and if the employee is not in the "
+"'Employee/Purchase Order Item Mapping' of the project."
+msgstr ""
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_project_project__purchase_order_id
+#: model:ir.model.fields,help:purchase_project.field_project_task__project_purchase_order_id
+msgid "Purchase order to which the project is linked."
+msgstr "أمر الشراء الذي يرتبط به المشروع."
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_project_task__purchase_order_id
+msgid "Purchase order to which the task is linked."
+msgstr "أمر الشراء الذي ترتبط به المهمة."
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_product_product__purchase_project_id
+#: model:ir.model.fields,help:purchase_project.field_product_template__purchase_project_id
+msgid ""
+"Select a billable project on which tasks can be created. This setting must "
+"be set for each company."
+msgstr ""
+"حدد مشروعًا قابلاً للفوترة والذي يمكن إنشاء المهام عليه. يجب أن يكون هذا "
+"الإعداد يتم تعيينها لكل شركة."
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_product_product__purchase_project_template_id
+#: model:ir.model.fields,help:purchase_project.field_product_template__purchase_project_template_id
+msgid ""
+"Select a billable project to be the skeleton of the new created project when"
+" selling the current product. Its stages and tasks will be duplicated."
+msgstr ""
+"حدد مشروعًا قابلاً للفوترة ليكون القالب للمشروع الجديد الذي تم إنشاؤه "
+"عندماشراء المنتج الحالي. ستتكرر مراحله ومهامه."
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_purchase_order__project_id
+msgid "Select a project for tasks related to this purchase order."
+msgstr "حدد مشروعًا للمهام المتعلقة بأمر الشراء هذا."
+
+#. module: purchase_project
+#: model:ir.model,name:purchase_project.model_project_task
+msgid "Task"
+msgstr "مهمة"
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/purchase_order.py:0
+#, python-format
+msgid ""
+"Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
+msgstr ""
+"تم إنشاء المهمة (%s): <a href=# data-oe-model=project.task data-oe-"
+"id=%d>%s</a>"
+
+#. module: purchase_project
+#: model:ir.model,name:purchase_project.model_project_task_recurrence
+msgid "Task Recurrence"
+msgstr "تكرار المهمة "
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_purchase_order_line__task_id
+msgid "Task generated by the purchases order item"
+msgstr "المهمة التي تم إنشاؤها بواسطة عنصر أمر الشراء"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order__tasks_count
+#: model_terms:ir.ui.view,arch_db:purchase_project.view_order_form_inherit_purchase_project
+msgid "Tasks"
+msgstr "المهام"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_purchase_order__tasks_ids
+msgid "Tasks associated to this purchase"
+msgstr "المهام المرتبطة بهذا الشراء"
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/product.py:0
+#, python-format
+msgid ""
+"The product %s should not have a global project since it will generate a "
+"project."
+msgstr "لا ينبغي أن يكون للمنتج %s مشروع عام لأنه سيقوم بإنشاء مشروع."
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/product.py:0
+#, python-format
+msgid ""
+"The product %s should not have a project nor a project template since it "
+"will not generate project."
+msgstr "يجب ألا يحتوي المنتج %s على مشروع أو قالب مشروع لأنه لن تولد المشروع."
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/product.py:0
+#, python-format
+msgid ""
+"The product %s should not have a project template since it will generate a "
+"task in a global project."
+msgstr ""
+"يجب ألا يحتوي المنتج %s على قالب مشروع لأنه سيقوم بإنشاء مهمة في مشروع عام."
+
+#. module: purchase_project
+#: model:ir.model.constraint,message:purchase_project.constraint_project_project_purchase_order_required_if_purchase_line
+msgid ""
+"The project should be linked to a purchase order to select a purchase order "
+"item."
+msgstr "يجب ربط المشروع بأمر شراء لتحديد صنف أمر شراء."
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/purchase_order.py:0
+#, python-format
+msgid ""
+"This task has been created from: <a href=# data-oe-model=purchase.order "
+"data-oe-id=%d>%s</a> (%s)"
+msgstr ""
+"تم إنشاء هذه المهمة من: <a href=# data-oe-model=purchase.order data-oe-"
+"id=%d>%s</a> (%s)"
+
+#. module: purchase_project
+#: model:ir.model.fields,field_description:purchase_project.field_project_task__task_to_invoice
+msgid "To invoice"
+msgstr "للفوترة"
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/project.py:0
+#, python-format
+msgid ""
+"You cannot link the order item %(order_id)s - %(product_id)s to this task "
+"because it is a re-invoiced expense."
+msgstr ""
+"لا يمكنك ربط عنصر الطلب %(order_id)s - %(product_id)s بهذه المهمةلأنها عبارة"
+" عن نفقات تمت إعادة إصدار فواتيرها."
+
+#. module: purchase_project
+#: code:addons/purchase_project/models/project.py:0
+#, python-format
+msgid ""
+"You have to unlink the task from the purchase order item in order to delete "
+"it."
+msgstr "يجب عليك إلغاء ربط المهمة ببند أمر الشراء حتى تتمكن من الحذف"
+
+#. module: purchase_project
+#: model:ir.model.fields,help:purchase_project.field_purchase_order_line__is_service
+msgid ""
+"purchase Order item should generate a task and/or a project, depending on "
+"the product settings."
+msgstr ""
+"يجب أن يؤدي بند أمر الشراء إلى إنشاء مهمة و/أو مشروع، اعتمادًا علىإعدادات "
+"المنتج."
\ No newline at end of file
diff --git a/odex25_project/purchase_project/models/__init__.py b/odex25_project/purchase_project/models/__init__.py
new file mode 100644
index 000000000..8141dd066
--- /dev/null
+++ b/odex25_project/purchase_project/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from . import product
+from . import project
+from . import purchase_order
diff --git a/odex25_project/purchase_project/models/product.py b/odex25_project/purchase_project/models/product.py
new file mode 100644
index 000000000..7700d2867
--- /dev/null
+++ b/odex25_project/purchase_project/models/product.py
@@ -0,0 +1,66 @@
+# -*- 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 ValidationError
+
+
+class ProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    purchase_service_tracking = fields.Selection([
+        ('no', 'Don\'t create task'),
+        ('task_global_project', 'Create a task in an existing project'),
+        ('task_in_project', 'Create a task in purchase order\'s project'),
+        ('project_only', 'Create a new project but no task')],
+        string="Purchase Service Tracking", default="no",
+        help="On purchase order confirmation, this product can generate a project and/or task. \
+        From those, you can track the service you are selling.\n \
+        'In purchase order\'s project': Will use the purchase order\'s configured project if defined or fallback to \
+        creating a new project based on the selected template.")
+    purchase_project_id = fields.Many2one(
+        'project.project', 'Purchase Project', company_dependent=True,
+        domain="[('company_id', '=', current_company_id)]",
+        help='Select a billable project on which tasks can be created. This setting must be set for each company.')
+    purchase_project_template_id = fields.Many2one(
+        'project.project', 'Purchase Project Template', company_dependent=True, copy=True,
+        domain="[('company_id', '=', current_company_id)]",
+        help='Select a billable project to be the skeleton of the new created project when selling the current product. Its stages and tasks will be duplicated.')
+
+    @api.constrains('purchase_project_id', 'purchase_project_template_id')
+    def _check_project_and_template(self):
+        """ NOTE 'purchase_service_tracking' should be in decorator parameters but since ORM check constraints twice (one after setting
+            stored fields, one after setting non stored field), the error is raised when company-dependent fields are not set.
+            So, this constraints does cover all cases and inconsistent can still be recorded until the ORM change its behavior.
+        """
+        for product in self:
+            if product.purchase_service_tracking == 'no' and (product.purchase_project_id or product.purchase_project_template_id):
+                raise ValidationError(_('The product %s should not have a project nor a project template since it will not generate project.') % (product.name,))
+            elif product.purchase_service_tracking == 'task_global_project' and product.purchase_project_template_id:
+                raise ValidationError(_('The product %s should not have a project template since it will generate a task in a global project.') % (product.name,))
+            elif product.purchase_service_tracking in ['task_in_project', 'project_only'] and product.purchase_project_id:
+                raise ValidationError(_('The product %s should not have a global project since it will generate a project.') % (product.name,))
+
+    @api.onchange('purchase_service_tracking')
+    def _onchange_purchase_service_tracking(self):
+        if self.purchase_service_tracking == 'no':
+            self.purchase_project_id = False
+            self.purchase_project_template_id = False
+        elif self.purchase_service_tracking == 'task_global_project':
+            self.purchase_project_template_id = False
+        elif self.purchase_service_tracking in ['task_in_project', 'project_only']:
+            self.purchase_project_id = False
+
+
+class ProductProduct(models.Model):
+    _inherit = 'product.product'
+
+    @api.onchange('purchase_service_tracking')
+    def _onchange_purchase_service_tracking(self):
+        if self.purchase_service_tracking == 'no':
+            self.purchase_project_id = False
+            self.purchase_project_template_id = False
+        elif self.purchase_service_tracking == 'task_global_project':
+            self.purchase_project_template_id = False
+        elif self.purchase_service_tracking in ['task_in_project', 'project_only']:
+            self.purchase_project_id = False
diff --git a/odex25_project/purchase_project/models/project.py b/odex25_project/purchase_project/models/project.py
new file mode 100644
index 000000000..6ede45fa4
--- /dev/null
+++ b/odex25_project/purchase_project/models/project.py
@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from ast import literal_eval
+
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class Project(models.Model):
+    _inherit = 'project.project'
+
+    purchase_line_id = fields.Many2one(
+        'purchase.order.line', 'Purchase Order Item', copy=False,
+        domain="[('is_service', '=', True), ('is_expense', '=', False), ('order_id', '=', purchase_order_id), ('state', 'in', ['purchase', 'done']), '|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        help="Purchase order item to which the project is linked. Link the timesheet entry to the Purchase order item defined on the project. "
+        "Only applies on tasks without purchase order item defined, and if the employee is not in the 'Employee/Purchase Order Item Mapping' of the project.")
+    purchase_order_id = fields.Many2one('purchase.order', 'Purchase Order',
+        domain="[('order_line.product_id.type', '=', 'service'), ('partner_id', '=', partner_id), ('state', 'in', ['purchase', 'done'])]",
+        copy=False, help="Purchase order to which the project is linked.")
+
+    _sql_constraints = [
+        ('purchase_order_required_if_purchase_line', "CHECK((purchase_line_id IS NOT NULL AND purchase_order_id IS NOT NULL) OR (purchase_line_id IS NULL))", 'The project should be linked to a purchase order to select a purchase order item.'),
+    ]
+
+    @api.model
+    def _map_tasks_default_valeus(self, task, project):
+        defaults = super()._map_tasks_default_valeus(task, project)
+        defaults['purchase_line_id'] = False
+        return defaults
+
+    def action_view_po(self):
+        self.ensure_one()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "purchase.order",
+            "name": "Purchase Order",
+            "views": [[False, "form"]],
+            "context": {"create": False, "show_purchase": True},
+            "res_id": self.purchase_order_id.id
+        }
+        return action_window
+
+
+class ProjectTask(models.Model):
+    _inherit = "project.task"
+
+    purchase_order_id = fields.Many2one('purchase.order', 'Purchase Order', help="Purchase order to which the task is linked.")
+    purchase_line_id = fields.Many2one(
+        'purchase.order.line', 'Purchase Order Item', 
+        domain="[('company_id', '=', company_id), ('is_service', '=', True), ('partner_id', 'child_of', commercial_partner_id), ('state', 'in', ['purchase', 'done']), ('order_id', '=?', project_purchase_order_id)]",
+        compute='_compute_purchase_line', store=True, readonly=False, copy=False,
+        help="Purchase order item to which the project is linked. Link the timesheet entry to the Purchase order item defined on the project. "
+        "Only applies on tasks without purchase order item defined, and if the employee is not in the 'Employee/Purchase Order Item Mapping' of the project.")
+    project_purchase_order_id = fields.Many2one('purchase.order', string="Project's purchase order", related='project_id.purchase_order_id')
+    invoice_count = fields.Integer("Number of invoices", related='purchase_order_id.invoice_count')
+    task_to_invoice = fields.Boolean("To invoice", compute='_compute_task_to_invoice', search='_search_task_to_invoice')
+
+    @api.depends('project_id.purchase_line_id.partner_id')
+    def _compute_partner_id(self):
+        for task in self:
+            if not task.partner_id:
+                task.partner_id = task.project_id.purchase_line_id.partner_id
+        super()._compute_partner_id()
+
+    @api.depends('commercial_partner_id', 'purchase_line_id.partner_id.commercial_partner_id', 'parent_id.purchase_line_id', 'project_id.purchase_line_id')
+    def _compute_purchase_line(self):
+        for task in self:
+            print("*****************************")
+            if not task.purchase_line_id:
+                task.purchase_line_id = task.parent_id.purchase_line_id or task.project_id.purchase_line_id
+            # check purchase_line_id and customer are coherent
+            if task.purchase_line_id.partner_id.commercial_partner_id != task.partner_id.commercial_partner_id:
+                task.purchase_line_id = False
+
+    @api.constrains('purchase_line_id')
+    def _check_purchase_line_type(self):
+        for task in self.sudo():
+            if task.purchase_line_id:
+                if not task.purchase_line_id.is_service :
+                    raise ValidationError(_(
+                        'You cannot link the order item %(order_id)s - %(product_id)s to this task because it is a re-invoiced expense.',
+                        order_id=task.purchase_line_id.order_id.name,
+                        product_id=task.purchase_line_id.product_id.display_name,
+                    ))
+
+    def unlink(self):
+        if any(task.purchase_line_id for task in self):
+            raise ValidationError(_('You have to unlink the task from the purchase order item in order to delete it.'))
+        return super().unlink()
+
+    # ---------------------------------------------------
+    # Actions
+    # ---------------------------------------------------
+
+    def _get_action_view_po_ids(self):
+        return self.purchase_order_id.ids
+
+    def action_view_po(self):
+        self.ensure_one()
+        po_ids = self._get_action_view_po_ids()
+        action_window = {
+            "type": "ir.actions.act_window",
+            "res_model": "purchase.order",
+            "name": "Purchase Order",
+            "views": [[False, "tree"], [False, "form"]],
+            "context": {"create": False, "show_purchase": True},
+            "domain": [["id", "in", po_ids]],
+        }
+        if len(po_ids) == 1:
+            action_window["views"] = [[False, "form"]]
+            action_window["res_id"] = po_ids[0]
+
+        return action_window
+
+    def rating_get_partner_id(self):
+        partner = self.partner_id or self.purchase_line_id.order_id.partner_id
+        if partner:
+            return partner
+        return super().rating_get_partner_id()
+
+    @api.depends('purchase_order_id.invoice_status', 'purchase_order_id.order_line')
+    def _compute_task_to_invoice(self):
+        for task in self:
+            if task.purchase_order_id:
+                task.task_to_invoice = bool(task.purchase_order_id.invoice_status not in ('no', 'invoiced'))
+            else:
+                task.task_to_invoice = False
+
+    @api.model
+    def _search_task_to_invoice(self, operator, value):
+        query = """
+            SELECT po.id
+            FROM purchase_order po
+            WHERE po.invoice_status != 'invoiced'
+                AND po.invoice_status != 'no'
+        """
+        operator_new = 'inselect'
+        if(bool(operator == '=') ^ bool(value)):
+            operator_new = 'not inselect'
+        return [('purchase_order_id', operator_new, (query, ()))]
+
+    def action_create_invoice(self):
+        # ensure the PO exists before invoicing, then confirm it
+        po_to_confirm = self.filtered(
+            lambda task: task.purchase_order_id and task.purchase_order_id.state in ['draft', 'sent']
+        ).mapped('purchase_order_id')
+        po_to_confirm.action_confirm()
+
+        # redirect create invoice wizard (of the Purchase Order)
+        action = self.env["ir.actions.actions"]._for_xml_id("purchase.action_view_purchase_advance_payment_inv")
+        context = literal_eval(action.get('context', "{}"))
+        context.update({
+            'active_id': self.purchase_order_id.id if len(self) == 1 else False,
+            'active_ids': self.mapped('purchase_order_id').ids,
+            'default_company_id': self.company_id.id,
+        })
+        action['context'] = context
+        return action
+
+class ProjectTaskRecurrence(models.Model):
+    _inherit = 'project.task.recurrence'
+
+    def _new_task_values(self, task):
+        values = super(ProjectTaskRecurrence, self)._new_task_values(task)
+        task = self.sudo().task_ids[0]
+        values['purchase_line_id'] = self._get_purchase_line_id(task)
+        return values
+
+    def _get_purchase_line_id(self, task):
+        return task.purchase_line_id.id
diff --git a/odex25_project/purchase_project/models/purchase_order.py b/odex25_project/purchase_project/models/purchase_order.py
new file mode 100644
index 000000000..f9d623930
--- /dev/null
+++ b/odex25_project/purchase_project/models/purchase_order.py
@@ -0,0 +1,360 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.tools.safe_eval import safe_eval
+from odoo.tools.sql import column_exists, create_column
+
+
+class PurchaseOrder(models.Model):
+    _inherit = 'purchase.order'
+
+    tasks_ids = fields.Many2many('project.task', compute='_compute_tasks_ids', string='Tasks associated to this purchase')
+    tasks_count = fields.Integer(string='Tasks', compute='_compute_tasks_ids', groups="project.group_project_user")
+
+    visible_project = fields.Boolean('Display project', compute='_compute_visible_project', readonly=True)
+    visible_project_btn = fields.Boolean('Display project BTN', compute='_compute_visible_project_btn', readonly=True)
+    project_id = fields.Many2one(
+        'project.project', 'Project', readonly=True,
+        states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
+        help='Select a project for tasks related to this purchase order.')
+    project_ids = fields.Many2many('project.project', compute="_compute_project_ids", string='Projects', copy=False, help="Projects used in this purchases order.")
+
+    @api.depends('order_line.product_id.purchase_project_id')
+    def _compute_tasks_ids(self):
+        for order in self:
+            order.tasks_ids = self.env['project.task'].search([('purchase_line_id', 'in', order.order_line.ids), ('purchase_order_id', '=', order.id)])
+            order.tasks_count = len(order.tasks_ids)
+
+    @api.depends('order_line.product_id.purchase_service_tracking')
+    def _compute_visible_project(self):
+        for order in self:
+            order.visible_project = any(
+                purchase_service_tracking == 'task_in_project' for purchase_service_tracking in order.order_line.mapped('product_id.purchase_service_tracking')
+            )
+    @api.depends('order_line.product_id.purchase_service_tracking')
+    def _compute_visible_project_btn(self):
+        for order in self:
+            order.visible_project_btn = any(
+                purchase_service_tracking in ['task_in_project','task_global_project','project_only'] for purchase_service_tracking in order.order_line.mapped('product_id.purchase_service_tracking')
+            )
+            # if visible_project_btn and not order.tasks_ids and not order.project_ids:
+            #     order.visible_project_btn = visible_project_btn
+            # else :
+            #     order.visible_project_btn = False
+    @api.depends('order_line.product_id', 'order_line.project_id')
+    def _compute_project_ids(self):
+        for order in self:
+            projects = order.order_line.mapped('product_id.purchase_project_id')
+            projects |= order.order_line.mapped('project_id')
+            projects |= order.project_id
+            order.project_ids = projects
+
+    @api.onchange('project_id')
+    def _onchange_project_id(self):
+        """ Set the PO analytic account to the selected project's analytic account """
+        if self.project_id.analytic_account_id:
+            self.account_analytic_id = self.project_id.analytic_account_id
+
+    def button_create_project_tasks(self):
+        """ On PO confirmation, some lines should generate a task or a project. """
+        if len(self.company_id) == 1:
+            # All orders are in the same company
+            self.order_line.sudo().with_company(self.company_id)._timesheet_service_generation()
+        else:
+            # Orders from different companies are confirmed together
+            for order in self:
+                order.order_line.sudo().with_company(order.company_id)._timesheet_service_generation()
+
+    def action_view_task(self):
+        self.ensure_one()
+        list_view_id = self.env.ref('project.view_task_tree2').id
+        form_view_id = self.env.ref('project.view_task_form2').id
+        action = {'type': 'ir.actions.act_window_close'}
+        task_projects = self.tasks_ids.mapped('project_id')
+        if len(task_projects) == 1 and len(self.tasks_ids) > 1:
+            action = self.with_context(active_id=task_projects.id).env['ir.actions.actions']._for_xml_id('project.act_project_project_2_project_task_all')
+            action['domain'] = [('id', 'in', self.tasks_ids.ids)]
+            if action.get('context'):
+                eval_context = self.env['ir.actions.actions']._get_eval_context()
+                eval_context.update({'active_id': task_projects.id})
+                action_context = safe_eval(action['context'], eval_context)
+                action_context.update(eval_context)
+                action['context'] = action_context
+        else:
+            action = self.env["ir.actions.actions"]._for_xml_id("project.action_view_task")
+            action['context'] = {}
+            if len(self.tasks_ids) > 1:
+                action['views'] = [[False, 'kanban'], [list_view_id, 'tree'], [form_view_id, 'form'], [False, 'graph'], [False, 'calendar'], [False, 'pivot']]
+            elif len(self.tasks_ids) == 1:
+                action['views'] = [(form_view_id, 'form')]
+                action['res_id'] = self.tasks_ids.id
+
+        action.setdefault('context', {})
+        action['context'].update({'search_default_purchase_order_id': self.id})
+        return action
+
+    def action_view_project_ids(self):
+        self.ensure_one()
+        view_form_id = self.env.ref('project.edit_project').id
+        view_kanban_id = self.env.ref('project.view_project_kanban').id
+        action = {
+            'type': 'ir.actions.act_window',
+            'domain': [('id', 'in', self.project_ids.ids)],
+            'views': [(view_kanban_id, 'kanban'), (view_form_id, 'form')],
+            'view_mode': 'kanban,form',
+            'name': _('Projects'),
+            'res_model': 'project.project',
+        }
+        return action
+
+    def write(self, values):
+        if 'state' in values and values['state'] == 'cancel':
+            self.project_id.sudo().purchase_line_id = False
+        return super(PurchaseOrder, self).write(values)
+
+
+
+class PurchaseOrderLine(models.Model):
+    _inherit = "purchase.order.line"
+
+    project_id = fields.Many2one(
+        'project.project', 'Generated Project',
+        index=True, copy=False, help="Project generated by the purchases order item")
+    task_id = fields.Many2one(
+        'project.task', 'Generated Task',
+        index=True, copy=False, help="Task generated by the purchases order item")
+    is_service = fields.Boolean("Is a Service", compute='_compute_is_service', store=True, compute_sudo=True, help="purchase Order item should generate a task and/or a project, depending on the product settings.")
+
+    @api.depends('product_id.type')
+    def _compute_is_service(self):
+        for line in self:
+            line.is_service = line.product_id.type == 'service'
+    
+    def _auto_init(self):
+        """
+        Create column to stop ORM from computing it himself (too slow)
+        """
+        if not column_exists(self.env.cr, 'purchase_order_line', 'is_service'):
+            create_column(self.env.cr, 'purchase_order_line', 'is_service', 'bool')
+            self.env.cr.execute("""
+                UPDATE purchase_order_line line
+                SET is_service = (pt.type = 'service')
+                FROM product_product pp
+                LEFT JOIN product_template pt ON pt.id = pp.product_tmpl_id
+                WHERE pp.id = line.product_id
+            """)
+        return super()._auto_init()
+    
+    @api.model_create_multi
+    def create(self, vals_list):
+        lines = super().create(vals_list)
+        # Do not generate task/project when expense PO line, but allow
+        # generate task with hours=0.
+        for line in lines:
+            if line.state == 'purchase':
+                line.sudo()._timesheet_service_generation()
+                # if the PO line created a task, post a message on the order
+                if line.task_id:
+                    msg_body = _("Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>") % (line.product_id.name, line.task_id.id, line.task_id.name)
+                    line.order_id.message_post(body=msg_body)
+        return lines
+    
+    def write(self, values):
+        result = super().write(values)
+        # changing the ordered quantity should change the planned hours on the
+        # task, whatever the PO state. It will be blocked by the super in case
+        # of a locked purchase order.
+        if 'product_uom_qty' in values and not self.env.context.get('no_update_planned_hours', False):
+            for line in self:
+                if line.task_id and line.product_id.type == 'service':
+                    planned_hours = line._convert_qty_company_hours(line.task_id.company_id)
+                    line.task_id.write({'planned_hours': planned_hours})
+        return result
+    
+    def _convert_qty_company_hours(self, dest_company):
+        return self.product_uom_qty
+    
+    def _prepare_analytic_account_data(self, prefix=None):
+        """
+        Prepare method for analytic account data
+
+        :param prefix: The prefix of the to-be-created analytic account name
+        :type prefix: string
+        :return: dictionary of value for new analytic account creation
+        """
+        name = self.name
+        if prefix:
+            name = prefix + ": ["+ self.order_id.name +"]"+ self.name
+        return {
+            'name': name,
+            'code': self.order_id.partner_ref,
+            'company_id': self.company_id.id,
+            'partner_id': self.partner_id.id
+        }   
+
+    def _create_analytic_account(self, prefix=None):
+        for order in self:
+            analytic = self.env['account.analytic.account'].create(order._prepare_analytic_account_data(prefix))
+            order.account_analytic_id = analytic
+
+    def _timesheet_create_project_prepare_values(self):
+        """Generate project values"""
+        account = self.account_analytic_id
+        if not account:
+            self._create_analytic_account(prefix=self.product_id.default_code or None)
+            account = self.account_analytic_id
+
+        # create the project or duplicate one
+        return {
+            'name': '%s - %s' % (self.order_id.partner_ref, self.name) if self.order_id.partner_ref else self.name,
+            'analytic_account_id': account.id,
+            'partner_id': self.order_id.partner_id.id,
+            'purchase_line_id': self.id,
+            'purchase_order_id': self.order_id.id,
+            'active': True,
+            'company_id': self.company_id.id,
+            'contract_value_untaxed':self.price_subtotal,
+            'tax_amount':self.price_tax,
+            'contract_value':self.price_total,
+            'type':'expense',
+        }
+
+    def _timesheet_create_project(self):
+        """ Generate project for the given po line, and link it.
+            :param project: record of project.project in which the task should be created
+            :return task: record of the created task
+        """
+        self.ensure_one()
+        values = self._timesheet_create_project_prepare_values()
+        if self.product_id.purchase_project_template_id:
+            values['name'] = "%s - %s" % (values['name'], self.product_id.purchase_project_template_id.name)
+            project = self.product_id.purchase_project_template_id.copy(values)
+            project.tasks.write({
+                'purchase_line_id': self.id,
+                'partner_id': self.order_id.partner_id.id,
+                'email_from': self.order_id.partner_id.email,
+            })
+            # duplicating a project doesn't set the PO on sub-tasks
+            project.tasks.filtered(lambda task: task.parent_id != False).write({
+                'purchase_line_id': self.id,
+                'purchase_order_id': self.order_id,
+            })
+        else:
+            project = self.env['project.project'].create(values)
+
+        # Avoid new tasks to go to 'Undefined Stage'
+        if not project.type_ids:
+            project.type_ids = self.env['project.task.type'].create({'name': _('New')})
+
+        # link project as generated by current po line
+        self.write({'project_id': project.id})
+        return project
+
+    def _timesheet_create_task_prepare_values(self, project):
+        self.ensure_one()
+        planned_hours = self._convert_qty_company_hours(self.company_id)
+        purchase_line_name_parts = self.name.split('\n')
+        title = purchase_line_name_parts[0] or self.product_id.name
+        description = '<br/>'.join(purchase_line_name_parts[1:])
+        return {
+            'name': title if project.purchase_line_id else '%s: %s' % (self.order_id.name or '', title),
+            'planned_hours': planned_hours,
+            'partner_id': self.order_id.partner_id.id,
+            'email_from': self.order_id.partner_id.email,
+            'description': description,
+            'project_id': project.id,
+            'purchase_line_id': self.id,
+            'purchase_order_id': self.order_id.id,
+            'company_id': project.company_id.id,
+            'user_id': False,  # force non assigned task, as created as sudo()
+        }
+        
+    def _timesheet_create_task(self, project):
+        """ Generate task for the given po line, and link it.
+            :param project: record of project.project in which the task should be created
+            :return task: record of the created task
+        """
+        values = self._timesheet_create_task_prepare_values(project)
+        task = self.env['project.task'].sudo().create(values)
+        self.write({'task_id': task.id})
+        # post message on task
+        task_msg = _("This task has been created from: <a href=# data-oe-model=purchase.order data-oe-id=%d>%s</a> (%s)") % (self.order_id.id, self.order_id.name, self.product_id.name)
+        task.message_post(body=task_msg)
+        return task
+        
+    def _timesheet_service_generation(self):
+        
+        po_line_task_global_project = self.filtered(lambda pol: pol.product_id.purchase_service_tracking == 'task_global_project')
+        po_line_new_project = self.filtered(lambda pol: pol.product_id.purchase_service_tracking in ['project_only', 'task_in_project'])
+
+        # search po lines from PO of current po lines having their project generated, in order to check if the current one can
+        # create its own project, or reuse the one of its order.
+        map_po_project = {}
+        if po_line_new_project:
+            order_ids = self.mapped('order_id').ids
+            po_lines_with_project = self.search([('order_id', 'in', order_ids), ('project_id', '!=', False), ('product_id.purchase_service_tracking', 'in', ['project_only', 'task_in_project']), ('product_id.purchase_project_template_id', '=', False)])
+            map_po_project = {pol.order_id.id: pol.project_id for pol in po_lines_with_project}
+            po_lines_with_project_templates = self.search([('order_id', 'in', order_ids), ('project_id', '!=', False), ('product_id.purchase_service_tracking', 'in', ['project_only', 'task_in_project']), ('product_id.purchase_project_template_id', '!=', False)])
+            map_po_project_templates = {(pol.order_id.id, pol.product_id.purchase_project_template_id.id): pol.project_id for pol in po_lines_with_project_templates}
+
+        # search the global project of current PO lines, in which create their task
+        map_pol_project = {}
+        if po_line_task_global_project:
+            map_pol_project = {pol.id: pol.product_id.with_company(pol.company_id).purchase_project_id for pol in po_line_task_global_project}
+
+        def _can_create_project(pol):
+            if not pol.project_id:
+                if pol.product_id.purchase_project_template_id:
+                    return (pol.order_id.id, pol.product_id.purchase_project_template_id.id) not in map_po_project_templates
+                elif pol.order_id.id not in map_po_project:
+                    return True
+            return False
+
+        def _determine_project(po_line):
+            """Determine the project for this purchase order line.
+            Rules are different based on the purchase_service_tracking:
+
+            - 'project_only': the project_id can only come from the purchase order line itself
+            - 'task_in_project': the project_id comes from the purchase order line only if no project_id was configured
+              on the parent purchase order"""
+
+            if po_line.product_id.purchase_service_tracking == 'project_only':
+                return po_line.project_id
+            elif po_line.product_id.purchase_service_tracking == 'task_in_project':
+                return po_line.order_id.project_id or po_line.project_id
+
+            return False
+        # import pdb
+        # pdb.set_trace()
+        # task_global_project: create task in global project
+        for po_line in po_line_task_global_project:
+            if not po_line.task_id:
+                if map_pol_project.get(po_line.id):
+                    po_line._timesheet_create_task(project=map_pol_project[po_line.id])
+
+        # project_only, task_in_project: create a new project, based or not on a template (1 per PO). May be create a task too.
+        # if 'task_in_project' and project_id configured on PO, use that one instead
+        for po_line in po_line_new_project:
+            project = _determine_project(po_line)
+            if not project and _can_create_project(po_line):
+                project = po_line._timesheet_create_project()
+                if po_line.product_id.purchase_project_template_id:
+                    map_po_project_templates[(po_line.order_id.id, po_line.product_id.purchase_project_template_id.id)] = project
+                else:
+                    map_po_project[po_line.order_id.id] = project
+            elif not project:
+                # Attach subsequent PO lines to the created project
+                po_line.project_id = (
+                    map_po_project_templates.get((po_line.order_id.id, po_line.product_id.purchase_project_template_id.id))
+                    or map_po_project.get(po_line.order_id.id)
+                )
+            if po_line.product_id.purchase_service_tracking == 'task_in_project':
+                if not project:
+                    if po_line.product_id.purchase_project_template_id:
+                        project = map_po_project_templates[(po_line.order_id.id, po_line.product_id.purchase_project_template_id.id)]
+                    else:
+                        project = map_po_project[po_line.order_id.id]
+                if not po_line.task_id:
+                    po_line._timesheet_create_task(project=project)
+
diff --git a/odex25_project/purchase_project/security/ir.model.access.csv b/odex25_project/purchase_project/security/ir.model.access.csv
new file mode 100644
index 000000000..24309b053
--- /dev/null
+++ b/odex25_project/purchase_project/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_purchase_order_line_project_manager,purchase.order.line.project.manager,purchase.model_purchase_order_line,project.group_project_manager,1,0,0,0
+access_purchase_order_project_manager,purchase.order.project.manager,purchase.model_purchase_order,project.group_project_manager,1,0,0,0
diff --git a/odex25_project/purchase_project/security/sale_project_security.xml b/odex25_project/purchase_project/security/sale_project_security.xml
new file mode 100644
index 000000000..29ac7dab3
--- /dev/null
+++ b/odex25_project/purchase_project/security/sale_project_security.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo noupdate="1">
+
+    <record id="sale_order_line_rule_project_manager" model="ir.rule">
+        <field name="name">Project Manager Sales Orders Line</field>
+        <field name="model_id" ref="sale.model_sale_order_line"/>
+        <field name="domain_force">['&amp;', '&amp;', ('state', 'in', ['sale', 'done']), ('is_service', '=', True), '|', ('project_id','!=', False), ('task_id','!=', False)]</field>
+        <field name="groups" eval="[(4, ref('project.group_project_manager'))]"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+        <field name="perm_read" eval="1"/>
+    </record>
+
+</odoo>
diff --git a/odex25_project/purchase_project/tests/__init__.py b/odex25_project/purchase_project/tests/__init__.py
new file mode 100644
index 000000000..a7f2b14d4
--- /dev/null
+++ b/odex25_project/purchase_project/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_child_tasks
+from . import test_sale_project
diff --git a/odex25_project/purchase_project/tests/test_child_tasks.py b/odex25_project/purchase_project/tests/test_child_tasks.py
new file mode 100644
index 000000000..776a2d77c
--- /dev/null
+++ b/odex25_project/purchase_project/tests/test_child_tasks.py
@@ -0,0 +1,216 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details
+
+from odoo.tests.common import SavepointCase, new_test_user
+
+
+class TestNestedTaskUpdate(SavepointCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.partner = cls.env['res.partner'].create({'name': "Mur en béton"})
+        sale_order = cls.env['sale.order'].with_context(tracking_disable=True).create({
+            'partner_id': cls.partner.id,
+            'partner_invoice_id': cls.partner.id,
+            'partner_shipping_id': cls.partner.id,
+        })
+        product = cls.env['product.product'].create({
+            'name': "Prepaid Consulting",
+            'type': 'service',
+        })
+        cls.order_line = cls.env['sale.order.line'].create({
+            'name': "Order line",
+            'product_id': product.id,
+            'order_id': sale_order.id,
+        })
+        cls.user = new_test_user(cls.env, login='mla')
+
+    #----------------------------------
+    #
+    # When creating tasks that have a parent_id, they pick some values from  their parent
+    #
+    #----------------------------------
+
+    def test_creating_subtask_user_id_on_parent_dont_go_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'user_id': self.user.id})
+        child = self.env['project.task'].create({'name': 'child', 'parent_id': parent.id, 'user_id': False})
+        self.assertFalse(child.user_id)
+
+    def test_creating_subtask_partner_id_on_parent_goes_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.user.partner_id.id})
+        child = self.env['project.task'].create({'name': 'child', 'parent_id': parent.id})
+        self.assertEqual(child.partner_id, self.user.partner_id)
+
+    def test_creating_subtask_email_from_on_parent_goes_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'email_from': 'a@c.be'})
+        child = self.env['project.task'].create({'name': 'child', 'parent_id': parent.id})
+        self.assertEqual(child.email_from, 'a@c.be')
+
+    def test_creating_subtask_sale_line_id_on_parent_goes_on_child_if_same_partner_in_values(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id, 'sale_line_id': self.order_line.id})
+        child = self.env['project.task'].create({'name': 'child', 'partner_id': self.partner.id, 'parent_id': parent.id})
+        self.assertEqual(child.sale_line_id, parent.sale_line_id)
+        parent.write({'sale_line_id': False})
+        self.assertEqual(child.sale_line_id, self.order_line)
+
+    def test_creating_subtask_sale_line_id_on_parent_goes_on_child_with_partner_if_not_in_values(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id, 'sale_line_id': self.order_line.id})
+        child = self.env['project.task'].create({'name': 'child', 'parent_id': parent.id})
+        self.assertEqual(child.partner_id, parent.partner_id)
+        self.assertEqual(child.sale_line_id, parent.sale_line_id)
+
+    def test_creating_subtask_sale_line_id_on_parent_dont_go_on_child_if_other_partner(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id, 'sale_line_id': self.order_line.id})
+        child = self.env['project.task'].create({'name': 'child', 'partner_id': self.user.partner_id.id, 'parent_id': parent.id})
+        self.assertFalse(child.sale_line_id)
+        self.assertNotEqual(child.partner_id, parent.partner_id)
+
+    def test_creating_subtask_sale_line_id_on_parent_go_on_child_if_same_commercial_partner(self):
+        commercial_partner = self.env['res.partner'].create({'name': "Jémémy"})
+        self.partner.parent_id = commercial_partner
+        self.user.partner_id.parent_id = commercial_partner
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id, 'sale_line_id': self.order_line.id})
+        child = self.env['project.task'].create({'name': 'child', 'partner_id': self.user.partner_id.id, 'parent_id': parent.id})
+        self.assertEqual(child.sale_line_id, self.order_line, "Sale order line on parent should be transfered to child")
+        self.assertNotEqual(child.partner_id, parent.partner_id)
+
+    #----------------------------------------
+    #
+    #   When writing on a parent task, some values adapt on their children
+    #
+    #----------------------------------------
+
+    def test_write_user_id_on_parent_dont_write_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'user_id': False})
+        child = self.env['project.task'].create({'name': 'child', 'user_id': False, 'parent_id': parent.id})
+        self.assertFalse(child.user_id)
+        parent.write({'user_id': self.user.id})
+        self.assertFalse(child.user_id)
+        parent.write({'user_id': False})
+        self.assertFalse(child.user_id)
+
+    def test_write_partner_id_on_parent_write_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': False})
+        child = self.env['project.task'].create({'name': 'child', 'partner_id': False, 'parent_id': parent.id})
+        self.assertFalse(child.partner_id)
+        parent.write({'partner_id': self.user.partner_id.id})
+        self.assertEqual(child.partner_id, parent.partner_id)
+        parent.write({'partner_id': False})
+        self.assertEqual(child.partner_id, self.user.partner_id)
+
+    def test_write_email_from_on_parent_write_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent'})
+        child = self.env['project.task'].create({'name': 'child', 'parent_id': parent.id})
+        self.assertFalse(child.email_from)
+        parent.write({'email_from': 'a@c.be'})
+        self.assertEqual(child.email_from, parent.email_from)
+        parent.write({'email_from': ''})
+        self.assertEqual(child.email_from, 'a@c.be')
+
+    def test_write_sale_line_id_on_parent_write_on_child_if_same_partner(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id})
+        child = self.env['project.task'].create({'name': 'child', 'parent_id': parent.id, 'partner_id': self.partner.id})
+        self.assertFalse(child.sale_line_id)
+        parent.write({'sale_line_id': self.order_line.id})
+        self.assertEqual(child.sale_line_id, parent.sale_line_id)
+        parent.write({'sale_line_id': False})
+        self.assertEqual(child.sale_line_id, self.order_line)
+
+    def test_write_sale_line_id_on_parent_write_on_child_with_partner_if_not_set(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id})
+        child = self.env['project.task'].create({'name': 'child', 'parent_id': parent.id})
+        self.assertFalse(child.sale_line_id)
+        parent.write({'sale_line_id': self.order_line.id})
+        self.assertEqual(child.sale_line_id, parent.sale_line_id)
+        self.assertEqual(child.partner_id, self.partner)
+        parent.write({'sale_line_id': False})
+        self.assertEqual(child.sale_line_id, self.order_line)
+
+    def test_write_sale_line_id_on_parent_dont_write_on_child_if_other_partner(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id})
+        child = self.env['project.task'].create({'name': 'child', 'parent_id': parent.id, 'partner_id': self.user.partner_id.id})
+        self.assertFalse(child.sale_line_id)
+        parent.write({'sale_line_id': self.order_line.id})
+        self.assertFalse(child.sale_line_id)
+
+    #----------------------------------
+    #
+    #   When linking two existent task, some values go on the child
+    #
+    #----------------------------------
+
+    def test_linking_user_id_on_parent_dont_write_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'user_id': self.user.id})
+        child = self.env['project.task'].create({'name': 'child', 'user_id': False})
+        self.assertFalse(child.user_id)
+        child.write({'parent_id': parent.id})
+        self.assertFalse(child.user_id)
+
+    def test_linking_partner_id_on_parent_write_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.user.partner_id.id})
+        child = self.env['project.task'].create({'name': 'child', 'partner_id': False})
+        self.assertFalse(child.partner_id)
+        child.write({'parent_id': parent.id})
+        self.assertEqual(child.partner_id, self.user.partner_id)
+
+    def test_linking_email_from_on_parent_write_on_child(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'email_from': 'a@c.be'})
+        child = self.env['project.task'].create({'name': 'child', 'email_from': False})
+        self.assertFalse(child.email_from)
+        child.write({'parent_id': parent.id})
+        self.assertEqual(child.email_from, 'a@c.be')
+
+    def test_linking_sale_line_id_on_parent_write_on_child_if_same_partner(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id, 'sale_line_id': self.order_line.id})
+        child = self.env['project.task'].create({'name': 'child', 'partner_id': self.partner.id})
+        self.assertFalse(child.sale_line_id)
+        child.write({'parent_id': parent.id})
+        self.assertEqual(child.sale_line_id, parent.sale_line_id)
+        parent.write({'sale_line_id': False})
+        self.assertEqual(child.sale_line_id, self.order_line)
+
+    def test_linking_sale_line_id_on_parent_write_on_child_with_partner_if_not_set(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id, 'sale_line_id': self.order_line.id})
+        child = self.env['project.task'].create({'name': 'child', 'partner_id': False})
+        self.assertFalse(child.sale_line_id)
+        self.assertFalse(child.partner_id)
+        child.write({'parent_id': parent.id})
+        self.assertEqual(child.partner_id, parent.partner_id)
+        self.assertEqual(child.sale_line_id, parent.sale_line_id)
+
+    def test_linking_sale_line_id_on_parent_write_dont_child_if_other_partner(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id, 'sale_line_id': self.order_line.id})
+        child = self.env['project.task'].create({'name': 'child', 'partner_id': self.user.partner_id.id})
+        self.assertFalse(child.sale_line_id)
+        self.assertNotEqual(child.partner_id, parent.partner_id)
+        child.write({'parent_id': parent.id})
+        self.assertFalse(child.sale_line_id)
+
+    def test_writing_on_parent_with_multiple_tasks(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'user_id': False, 'partner_id': self.partner.id})
+        children_values = [{'name': 'child%s' % i, 'user_id': False, 'parent_id': parent.id} for i in range(5)]
+        children = self.env['project.task'].create(children_values)
+        # test writing sale_line_id
+        for child in children:
+            self.assertFalse(child.sale_line_id)
+        parent.write({'sale_line_id': self.order_line.id})
+        for child in children:
+            self.assertEqual(child.sale_line_id, self.order_line)
+
+    def test_linking_on_parent_with_multiple_tasks(self):
+        parent = self.env['project.task'].create({'name': 'parent', 'partner_id': self.partner.id, 'sale_line_id': self.order_line.id, 'user_id': self.user.id})
+        children_values = [{'name': 'child%s' % i, 'user_id': False} for i in range(5)]
+        children = self.env['project.task'].create(children_values)
+        # test writing user_id and sale_line_id
+
+        for child in children:
+            self.assertFalse(child.user_id)
+            self.assertFalse(child.sale_line_id)
+
+        children.write({'parent_id': parent.id})
+
+        for child in children:
+            self.assertEqual(child.sale_line_id, self.order_line)
+            self.assertFalse(child.user_id)
diff --git a/odex25_project/purchase_project/tests/test_sale_project.py b/odex25_project/purchase_project/tests/test_sale_project.py
new file mode 100644
index 000000000..6defc0c6e
--- /dev/null
+++ b/odex25_project/purchase_project/tests/test_sale_project.py
@@ -0,0 +1,189 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests.common import SavepointCase, users
+
+
+class TestSaleProject(SavepointCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.analytic_account_sale = cls.env['account.analytic.account'].create({
+            'name': 'Project for selling timesheet - AA',
+            'code': 'AA-2030'
+        })
+
+        # Create projects
+        cls.project_global = cls.env['project.project'].create({
+            'name': 'Global Project',
+            'analytic_account_id': cls.analytic_account_sale.id,
+        })
+        cls.project_template = cls.env['project.project'].create({
+            'name': 'Project TEMPLATE for services',
+        })
+        cls.project_template_state = cls.env['project.task.type'].create({
+            'name': 'Only stage in project template',
+            'sequence': 1,
+            'project_ids': [(4, cls.project_template.id)]
+        })
+
+        # Create service products
+        uom_hour = cls.env.ref('uom.product_uom_hour')
+
+        cls.product_order_service1 = cls.env['product.product'].create({
+            'name': "Service Ordered, create no task",
+            'standard_price': 11,
+            'list_price': 13,
+            'type': 'service',
+            'invoice_policy': 'order',
+            'uom_id': uom_hour.id,
+            'uom_po_id': uom_hour.id,
+            'default_code': 'SERV-ORDERED1',
+            'purchase_service_tracking': 'no',
+            'project_id': False,
+        })
+        cls.product_order_service2 = cls.env['product.product'].create({
+            'name': "Service Ordered, create task in global project",
+            'standard_price': 30,
+            'list_price': 90,
+            'type': 'service',
+            'invoice_policy': 'order',
+            'uom_id': uom_hour.id,
+            'uom_po_id': uom_hour.id,
+            'default_code': 'SERV-ORDERED2',
+            'purchase_service_tracking': 'task_global_project',
+            'project_id': cls.project_global.id,
+        })
+        cls.product_order_service3 = cls.env['product.product'].create({
+            'name': "Service Ordered, create task in new project",
+            'standard_price': 10,
+            'list_price': 20,
+            'type': 'service',
+            'invoice_policy': 'order',
+            'uom_id': uom_hour.id,
+            'uom_po_id': uom_hour.id,
+            'default_code': 'SERV-ORDERED3',
+            'purchase_service_tracking': 'task_in_project',
+            'project_id': False,  # will create a project
+        })
+        cls.product_order_service4 = cls.env['product.product'].create({
+            'name': "Service Ordered, create project only",
+            'standard_price': 15,
+            'list_price': 30,
+            'type': 'service',
+            'invoice_policy': 'order',
+            'uom_id': uom_hour.id,
+            'uom_po_id': uom_hour.id,
+            'default_code': 'SERV-ORDERED4',
+            'purchase_service_tracking': 'project_only',
+            'project_id': False,
+        })
+        cls.partner = cls.env['res.partner'].create({'name': "Mur en béton"})
+
+    def test_sale_order_with_project_task(self):
+        SaleOrderLine = self.env['sale.order.line'].with_context(tracking_disable=True)
+
+        sale_order = self.env['sale.order'].with_context(tracking_disable=True).create({
+            'partner_id': self.partner.id,
+            'partner_invoice_id': self.partner.id,
+            'partner_shipping_id': self.partner.id,
+        })
+        so_line_order_no_task = SaleOrderLine.create({
+            'name': self.product_order_service1.name,
+            'product_id': self.product_order_service1.id,
+            'product_uom_qty': 10,
+            'product_uom': self.product_order_service1.uom_id.id,
+            'price_unit': self.product_order_service1.list_price,
+            'order_id': sale_order.id,
+        })
+
+        so_line_order_task_in_global = SaleOrderLine.create({
+            'name': self.product_order_service2.name,
+            'product_id': self.product_order_service2.id,
+            'product_uom_qty': 10,
+            'product_uom': self.product_order_service2.uom_id.id,
+            'price_unit': self.product_order_service2.list_price,
+            'order_id': sale_order.id,
+        })
+
+        so_line_order_new_task_new_project = SaleOrderLine.create({
+            'name': self.product_order_service3.name,
+            'product_id': self.product_order_service3.id,
+            'product_uom_qty': 10,
+            'product_uom': self.product_order_service3.uom_id.id,
+            'price_unit': self.product_order_service3.list_price,
+            'order_id': sale_order.id,
+        })
+
+        so_line_order_only_project = SaleOrderLine.create({
+            'name': self.product_order_service4.name,
+            'product_id': self.product_order_service4.id,
+            'product_uom_qty': 10,
+            'product_uom': self.product_order_service4.uom_id.id,
+            'price_unit': self.product_order_service4.list_price,
+            'order_id': sale_order.id,
+        })
+        sale_order.action_confirm()
+
+        # purchase_service_tracking 'no'
+        self.assertFalse(so_line_order_no_task.project_id, "The project should not be linked to no task product")
+        self.assertFalse(so_line_order_no_task.task_id, "The task should not be linked to no task product")
+        # purchase_service_tracking 'task_global_project'
+        self.assertFalse(so_line_order_task_in_global.project_id, "Only task should be created, project should not be linked")
+        self.assertEqual(self.project_global.tasks.sale_line_id, so_line_order_task_in_global, "Global project's task should be linked to so line")
+        #  purchase_service_tracking 'task_in_project'
+        self.assertTrue(so_line_order_new_task_new_project.project_id, "Sales order line should be linked to newly created project")
+        self.assertTrue(so_line_order_new_task_new_project.task_id, "Sales order line should be linked to newly created task")
+        # purchase_service_tracking 'project_only'
+        self.assertFalse(so_line_order_only_project.task_id, "Task should not be created")
+        self.assertTrue(so_line_order_only_project.project_id, "Sales order line should be linked to newly created project")
+
+    def test_sol_product_type_update(self):
+        sale_order = self.env['sale.order'].with_context(tracking_disable=True).create({
+            'partner_id': self.partner.id,
+            'partner_invoice_id': self.partner.id,
+            'partner_shipping_id': self.partner.id,
+        })
+        self.product_order_service3.type = 'consu'
+        sale_order_line = self.env['sale.order.line'].create({
+            'order_id': sale_order.id,
+            'name': self.product_order_service3.name,
+            'product_id': self.product_order_service3.id,
+            'product_uom_qty': 5,
+            'product_uom': self.product_order_service3.uom_id.id,
+            'price_unit': self.product_order_service3.list_price
+        })
+        self.assertFalse(sale_order_line.is_service, "As the product is consumable, the SOL should not be a service")
+
+        self.product_order_service3.type = 'service'
+        self.assertTrue(sale_order_line.is_service, "As the product is a service, the SOL should be a service")
+
+    @users('demo')
+    def test_cancel_so_linked_to_project(self):
+        """ Test that cancelling a SO linked to a project will not raise an error """
+        # Ensure user don't have edit right access to the project
+        group_sale_manager = self.env.ref('sales_team.group_sale_manager')
+        group_project_user = self.env.ref('project.group_project_user')
+        self.env.user.write({'groups_id': [(6, 0, [group_sale_manager.id, group_project_user.id])]})
+
+        sale_order = self.env['sale.order'].with_context(tracking_disable=True).create({
+            'partner_id': self.partner.id,
+            'partner_invoice_id': self.partner.id,
+            'partner_shipping_id': self.partner.id,
+            'project_id': self.project_global.id,
+        })
+        sale_order_line = self.env['sale.order.line'].create({
+            'name': self.product_order_service2.name,
+            'product_id': self.product_order_service2.id,
+            'order_id': sale_order.id,
+        })
+        self.assertFalse(self.project_global.tasks.sale_line_id, "The project tasks should not be linked to the SOL")
+
+        sale_order.action_confirm()
+        self.assertEqual(self.project_global.tasks.sale_line_id.id, sale_order_line.id, "The project tasks should be linked to the SOL from the SO")
+
+        self.project_global.sale_line_id = sale_order_line
+        sale_order.action_cancel()
+        self.assertFalse(self.project_global.sale_line_id, "The project should not be linked to the SOL anymore")
diff --git a/odex25_project/purchase_project/views/product_views.xml b/odex25_project/purchase_project/views/product_views.xml
new file mode 100644
index 000000000..b4cfbef11
--- /dev/null
+++ b/odex25_project/purchase_project/views/product_views.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="product_template_form_view_invoice_policy_inherit_sale_project" model="ir.ui.view">
+        <field name="name">product.template.inherit.sale.projectform</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_only_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='bill']" position="after">
+                <group name="purchase_projec" string="Purchase Project" attrs="{'invisible': [('type','!=','service')]}">
+                    <field name="purchase_service_tracking" 
+                    widget="radio" attrs="{'invisible': [('type','!=','service')]}"/>
+                    <field name="purchase_project_id" 
+                    context="{'default_allow_billable': True, 'default_bill_type': 'supplier_task'}"
+                     attrs="{'invisible':[('purchase_service_tracking','!=','task_global_project')], 
+                     'required':[('purchase_service_tracking','==','task_global_project')]}"/>
+                    <field name="purchase_project_template_id" 
+                    context="{'active_test': False, 'default_allow_billable': True, 'default_bill_type': 'supplier_project', 'default_pricing_type': 'fixed_rate'}"
+                     attrs="{'invisible':[('purchase_service_tracking','not in',['task_in_project', 'project_only'])]}"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/purchase_project/views/project_task_views.xml b/odex25_project/purchase_project/views/project_task_views.xml
new file mode 100644
index 000000000..73dc54b82
--- /dev/null
+++ b/odex25_project/purchase_project/views/project_task_views.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="project_project_view_tree_inherit_sale_project" model="ir.ui.view">
+        <field name="name">project.project.tree.inherit.sale.project</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.view_project"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='analytic_account_id']" position="after">
+                <field name="purchase_order_id" optional="hide"/>
+                <field name="purchase_line_id" optional="hide" readonly="1"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_edit_project_inherit_form" model="ir.ui.view">
+        <field name="name">project.project.view.inherit</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button class="d-none d-md-inline oe_stat_button" 
+                    type="object" name="action_view_po" icon="fa-dollar" 
+                    attrs="{'invisible': [('purchase_order_id', '=', False)]}" 
+                    string="Purchase Order">
+                    <field name="purchase_order_id" attrs="{'invisible': True}"/> 
+                </button>
+            </div>
+            <xpath expr="//field[@name='partner_id']" position="attributes">
+                <attribute name="options">{'always_reload': True}</attribute>
+                <attribute name="context">{'res_partner_search_mode': 'supplier'}</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_sale_project_inherit_form" model="ir.ui.view">
+        <field name="name">project.task.view.inherit</field>
+        <field name="model">project.task</field>
+        <field name="groups_id" eval="[(4, ref('base.group_user'))]"/>
+        <field name="inherit_id" ref="project.view_task_form2"/>
+        <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button class="oe_stat_button"
+                        type="object" name="action_view_po" icon="fa-dollar"
+                        attrs="{'invisible': [('purchase_order_id', '=', False)]}"
+                        string="Purchase Order"
+                        />
+            </div>
+            <xpath expr="//field[@name='partner_id']" position="attributes">
+                <attribute name="options">{'always_reload': True}</attribute>
+                <attribute name="context">{'res_partner_search_mode': 'supplier'}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='date_last_stage_update']" position="after">
+                <field name="purchase_order_id" attrs="{'invisible': True}" 
+                />
+                <field name="purchase_line_id" string="Purchase Order Item"
+                 attrs="{'invisible': [('partner_id', '=', False)]}"
+                  options='{"no_open": True}' readonly="1" 
+                  context="{'create': False, 'edit': False, 'delete': False}"/>
+                <field name="commercial_partner_id" invisible="1" />
+                <field name="project_purchase_order_id" invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="project_task_view_form_inherit_sale_line_editable" model="ir.ui.view">
+        <field name="name">project.task.form.inherit.sale.line.editable.salesman</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="view_sale_project_inherit_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='purchase_line_id']" position="attributes">
+                <attribute name="options">{"no_create": True}</attribute>
+                <attribute name="readonly">0</attribute>
+            </xpath>
+        </field>
+        <!-- <field name="groups_id" eval="[(4, ref('sales_team.group_sale_salesman'))]"/> -->
+    </record>
+
+    <record id="project_task_view_search" model="ir.ui.view">
+        <field name="name">project.task.search.inherit</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_search_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='stage_id']" position="before">
+                <field name="purchase_order_id" string="Purchase Order" 
+                filter_domain="['|', ('purchase_order_id', 'ilike', self), ('purchase_line_id', 'ilike', self)]"/>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- To invoice batch action -->
+    <!-- <record id="project_task_server_action_batch_invoice" model="ir.actions.server">
+        <field name="name">Create invoice</field>
+        <field name="model_id" ref="project.model_project_task"/>
+        <field name="binding_model_id" ref="project.model_project_task"/>
+        <field name="state">code</field>
+        <field name="code">
+            if records:
+                action = records.action_create_invoice()
+        </field>
+    </record> -->
+
+</odoo>
diff --git a/odex25_project/purchase_project/views/purchase_order_views.xml b/odex25_project/purchase_project/views/purchase_order_views.xml
new file mode 100644
index 000000000..40e89a3e4
--- /dev/null
+++ b/odex25_project/purchase_project/views/purchase_order_views.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_order_form_inherit_purchase_project" model="ir.ui.view">
+        <field name="name">purchase.order.form.project</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//header" position="inside">
+                <field name="tasks_ids" invisible="1"/>
+                <field name="project_ids" invisible="1"/>
+                <field name="visible_project_btn" invisible="1"/>
+                <button name="button_create_project_tasks" states="purchase"  attrs="{'invisible': ['|','|','|',('project_ids', '!=', []),('tasks_ids', '!=', []),('visible_project_btn','=',False)]}" string="Create Project" type="object" class="oe_highlight" groups="project.group_project_manager"/>
+            </xpath>
+            <xpath expr="//button[@name='action_view_invoice']" position="before">
+                <button type="object" name="action_view_task" class="oe_stat_button" icon="fa-tasks" attrs="{'invisible': [('tasks_count', '=', 0)]}" groups="project.group_project_user">
+                    <field name="tasks_count" widget="statinfo" string="Tasks"/>
+                </button>
+                <button type="object" name="action_view_project_ids" class="oe_stat_button" icon="fa-puzzle-piece" string="Project" attrs="{'invisible': ['|', ('state', 'in', ['draft', 'sent']), ('project_ids', '=', [])]}" groups="project.group_project_manager">
+                    <field name="project_ids" invisible="1"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='partner_ref']" position="after">
+                <field name="visible_project" invisible="1"/>
+                <field name="visible_project_btn" invisible="1"/>
+                <field name="project_id" options="{'no_create': True}" attrs="{'invisible': [('visible_project', '=', False)]}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/odex25_project/task_survey/__init__.py b/odex25_project/task_survey/__init__.py
new file mode 100644
index 000000000..511a0ca3a
--- /dev/null
+++ b/odex25_project/task_survey/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
+from . import models
\ No newline at end of file
diff --git a/odex25_project/task_survey/__manifest__.py b/odex25_project/task_survey/__manifest__.py
new file mode 100644
index 000000000..283484df6
--- /dev/null
+++ b/odex25_project/task_survey/__manifest__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Tasks Survey",
+    'summary': """ build survey for task""",
+    'description': """This addon made for task to build survey from this task""",
+    'author': "Expert",
+    'website': "http://www.yourcompany.com",
+    'category': 'Uncategorized',
+    'version': '14.0.1.9',
+    'depends': ['base','project_base','survey'],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/views.xml',
+        'views/project_task_survey.xml',
+        'views/templates.xml',
+    ],
+    'demo': [
+        'demo/demo.xml',
+    ],
+}
diff --git a/odex25_project/task_survey/controllers/__init__.py b/odex25_project/task_survey/controllers/__init__.py
new file mode 100644
index 000000000..457bae27e
--- /dev/null
+++ b/odex25_project/task_survey/controllers/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
\ No newline at end of file
diff --git a/odex25_project/task_survey/controllers/controllers.py b/odex25_project/task_survey/controllers/controllers.py
new file mode 100644
index 000000000..2d834c024
--- /dev/null
+++ b/odex25_project/task_survey/controllers/controllers.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# from odoo import http
+
+
+# class TaskSurvey(http.Controller):
+#     @http.route('/task_survey/task_survey/', auth='public')
+#     def index(self, **kw):
+#         return "Hello, world"
+
+#     @http.route('/task_survey/task_survey/objects/', auth='public')
+#     def list(self, **kw):
+#         return http.request.render('task_survey.listing', {
+#             'root': '/task_survey/task_survey',
+#             'objects': http.request.env['task_survey.task_survey'].search([]),
+#         })
+
+#     @http.route('/task_survey/task_survey/objects/<model("task_survey.task_survey"):obj>/', auth='public')
+#     def object(self, obj, **kw):
+#         return http.request.render('task_survey.object', {
+#             'object': obj
+#         })
diff --git a/odex25_project/task_survey/demo/demo.xml b/odex25_project/task_survey/demo/demo.xml
new file mode 100644
index 000000000..517e0c85c
--- /dev/null
+++ b/odex25_project/task_survey/demo/demo.xml
@@ -0,0 +1,30 @@
+<odoo>
+    <data>
+<!--
+          <record id="object0" model="task_survey.task_survey">
+            <field name="name">Object 0</field>
+            <field name="value">0</field>
+          </record>
+
+          <record id="object1" model="task_survey.task_survey">
+            <field name="name">Object 1</field>
+            <field name="value">10</field>
+          </record>
+
+          <record id="object2" model="task_survey.task_survey">
+            <field name="name">Object 2</field>
+            <field name="value">20</field>
+          </record>
+
+          <record id="object3" model="task_survey.task_survey">
+            <field name="name">Object 3</field>
+            <field name="value">30</field>
+          </record>
+
+          <record id="object4" model="task_survey.task_survey">
+            <field name="name">Object 4</field>
+            <field name="value">40</field>
+          </record>
+-->
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/task_survey/i18n/ar_001.po b/odex25_project/task_survey/i18n/ar_001.po
new file mode 100644
index 000000000..d3744646c
--- /dev/null
+++ b/odex25_project/task_survey/i18n/ar_001.po
@@ -0,0 +1,66 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* task_survey
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-06 07:18+0000\n"
+"PO-Revision-Date: 2024-06-06 07:18+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: task_survey
+#: model:ir.model.fields,field_description:task_survey.field_survey_user_input__task_id
+msgid "Project Task"
+msgstr ""
+
+#. module: task_survey
+#: model:ir.model.fields,field_description:task_survey.field_project_task__answer_count
+#: model_terms:ir.ui.view,arch_db:task_survey.project_task_inherit
+msgid "Registered"
+msgstr "الاجابات"
+
+
+#. module: task_survey
+#: model:ir.model.fields,field_description:task_survey.field_project_task__response_id
+msgid "Response"
+msgstr "الإجابة"
+
+#. module: task_survey
+#: model_terms:ir.ui.view,arch_db:task_survey.project_task_inherit
+msgid "Start Survey"
+msgstr "بدأ الاستطلاع"
+
+#. module: task_survey
+#: model:ir.model.fields,field_description:task_survey.field_project_task__survey_id
+msgid "Survey"
+msgstr "الاستطلاع"
+
+#. module: task_survey
+#: code:addons/task_survey/models/project_task_survey.py:0
+#, python-format
+msgid "Survey Responses"
+msgstr "ردود الاستطلاع"
+
+#. module: task_survey
+#: model:ir.model,name:task_survey.model_survey_user_input
+msgid "Survey User Input"
+msgstr "مُدخلات مستخدم الاستطلاع"
+
+#. module: task_survey
+#: model:ir.model,name:task_survey.model_project_task
+msgid "Task"
+msgstr "مهمة"
+
+#. module: task_survey
+#: code:addons/task_survey/models/project_task_survey.py:0
+#, python-format
+msgid ""
+"You can't respond to this survey because you are not in the resident list!"
+msgstr "لا يمكنك الرد على هذا الاستبيان لأنك لست في قائمة المقيمين!"
\ No newline at end of file
diff --git a/odex25_project/task_survey/models/__init__.py b/odex25_project/task_survey/models/__init__.py
new file mode 100644
index 000000000..e8928429f
--- /dev/null
+++ b/odex25_project/task_survey/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import project_task_survey
\ No newline at end of file
diff --git a/odex25_project/task_survey/models/models.py b/odex25_project/task_survey/models/models.py
new file mode 100644
index 000000000..561ec6137
--- /dev/null
+++ b/odex25_project/task_survey/models/models.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# from odoo import models, fields, api
+
+
+# class task_survey(models.Model):
+#     _name = 'task_survey.task_survey'
+#     _description = 'task_survey.task_survey'
+
+#     name = fields.Char()
+#     value = fields.Integer()
+#     value2 = fields.Float(compute="_value_pc", store=True)
+#     description = fields.Text()
+#
+#     @api.depends('value')
+#     def _value_pc(self):
+#         for record in self:
+#             record.value2 = float(record.value) / 100
diff --git a/odex25_project/task_survey/models/project_task_survey.py b/odex25_project/task_survey/models/project_task_survey.py
new file mode 100644
index 000000000..f2c55b72f
--- /dev/null
+++ b/odex25_project/task_survey/models/project_task_survey.py
@@ -0,0 +1,41 @@
+from odoo import api, fields, models, exceptions, _
+
+class ProjectTaskSurvey(models.Model):
+    _inherit = 'project.task'
+
+    survey_id = fields.Many2one(
+        comodel_name='survey.survey',
+        string='Survey',
+        required=False)
+    response_id = fields.Many2one('survey.user_input', "Response", ondelete='set null', oldname="response")
+    answer_count = fields.Integer("Registered", compute='_compute_answer_count')
+
+    def _compute_answer_count(self):
+        '''
+            Count total answers Per Task
+        '''
+        for task in self:
+            task.answer_count = self.env['survey.user_input'].search_count([('task_id', '=', task.id)])
+    def action_start_survey(self):
+        self.ensure_one()
+        response = self.survey_id._create_answer(user=self.env.user, partner=self.env.user.partner_id, email=False, test_entry=False, check_attempts=True, task_id=  self.id )
+        self.response_id = response.id
+        return self.survey_id.action_start_survey(answer=response)
+   
+        # return self.survey_id.with_context(survey_token=response.access_token).action_start_survey()
+
+    def action_survey_user_input_task(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Survey Responses'),
+            'view_mode': 'tree,form',
+            'res_model': 'survey.user_input',
+            'domain': [('task_id', '=', self.id)],
+            'context': {'create': False}
+        }
+
+class SurveyUserInput(models.Model):
+    _inherit = 'survey.user_input'
+
+    task_id = fields.Many2one('project.task', string='Project Task')
diff --git a/odex25_project/task_survey/security/ir.model.access.csv b/odex25_project/task_survey/security/ir.model.access.csv
new file mode 100644
index 000000000..312064358
--- /dev/null
+++ b/odex25_project/task_survey/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_survey_user_input_all,survey.user_input.all,survey.model_survey_user_input,base.group_user,1,1,1,0
+access_survey_user_input_line_all,survey.user_input.line.all,survey.model_survey_user_input_line,base.group_user,1,0,0,0
+access_survey_survey_survey_all,survey.survey.survey.all,survey.model_survey_survey,base.group_user,1,0,0,0
+access_survey_question_all,survey.survey.question.all,survey.model_survey_question,base.group_user,1,0,0,0
diff --git a/odex25_project/task_survey/views/project_task_survey.xml b/odex25_project/task_survey/views/project_task_survey.xml
new file mode 100644
index 000000000..611fb64ea
--- /dev/null
+++ b/odex25_project/task_survey/views/project_task_survey.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!-- Inherit Project Task Form View to Modify it -->
+        <record id="project_task_inherit" model="ir.ui.view">
+            <field name="name">project.task.inherit</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='tag_ids']" position="after">
+                    <field name="survey_id"/>
+                </xpath>
+                <xpath expr="//header" position="inside">
+                    <button name="action_start_survey" string="Start Survey" type="object" class="oe_highlight"
+                            attrs="{'invisible': [('survey_id', '=', False)]}"/>
+                </xpath>
+                <xpath expr="//sheet//button[@name='action_subtask']" position="after">
+                    <button name="action_survey_user_input_task"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-envelope-o">
+                        <field string="Registered" name="answer_count" widget="statinfo"/>
+                    </button>
+                </xpath>
+            </field>
+        </record>
+
+        <!-- Inherit Survey User Input Form View to Modify it -->
+        <record id="survey_user_input_vie_form_inherit" model="ir.ui.view">
+            <field name="name">survey.user_input.view.form.inherit</field>
+            <field name="model">survey.user_input</field>
+            <field name="inherit_id" ref="survey.survey_user_input_view_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='survey_id']" position="after">
+                    <field name="task_id"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/odex25_project/task_survey/views/templates.xml b/odex25_project/task_survey/views/templates.xml
new file mode 100644
index 000000000..cea6b39ad
--- /dev/null
+++ b/odex25_project/task_survey/views/templates.xml
@@ -0,0 +1,24 @@
+<odoo>
+    <data>
+<!--
+        <template id="listing">
+          <ul>
+            <li t-foreach="objects" t-as="object">
+              <a t-attf-href="#{ root }/objects/#{ object.id }">
+                <t t-esc="object.display_name"/>
+              </a>
+            </li>
+          </ul>
+        </template>
+        <template id="object">
+          <h1><t t-esc="object.display_name"/></h1>
+          <dl>
+            <t t-foreach="object._fields" t-as="field">
+              <dt><t t-esc="field"/></dt>
+              <dd><t t-esc="object[field]"/></dd>
+            </t>
+          </dl>
+        </template>
+-->
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/task_survey/views/views.xml b/odex25_project/task_survey/views/views.xml
new file mode 100644
index 000000000..1056ac580
--- /dev/null
+++ b/odex25_project/task_survey/views/views.xml
@@ -0,0 +1,60 @@
+<odoo>
+  <data>
+    <!-- explicit list view definition -->
+<!--
+    <record model="ir.ui.view" id="task_survey.list">
+      <field name="name">task_survey list</field>
+      <field name="model">task_survey.task_survey</field>
+      <field name="arch" type="xml">
+        <tree>
+          <field name="name"/>
+          <field name="value"/>
+          <field name="value2"/>
+        </tree>
+      </field>
+    </record>
+-->
+
+    <!-- actions opening views on models -->
+<!--
+    <record model="ir.actions.act_window" id="task_survey.action_window">
+      <field name="name">task_survey window</field>
+      <field name="res_model">task_survey.task_survey</field>
+      <field name="view_mode">tree,form</field>
+    </record>
+-->
+
+    <!-- server action to the one above -->
+<!--
+    <record model="ir.actions.server" id="task_survey.action_server">
+      <field name="name">task_survey server</field>
+      <field name="model_id" ref="model_task_survey_task_survey"/>
+      <field name="state">code</field>
+      <field name="code">
+        action = {
+          "type": "ir.actions.act_window",
+          "view_mode": "tree,form",
+          "res_model": model._name,
+        }
+      </field>
+    </record>
+-->
+
+    <!-- Top menu item -->
+<!--
+    <menuitem name="task_survey" id="task_survey.menu_root"/>
+-->
+    <!-- menu categories -->
+<!--
+    <menuitem name="Menu 1" id="task_survey.menu_1" parent="task_survey.menu_root"/>
+    <menuitem name="Menu 2" id="task_survey.menu_2" parent="task_survey.menu_root"/>
+-->
+    <!-- actions -->
+<!--
+    <menuitem name="List" id="task_survey.menu_1_list" parent="task_survey.menu_1"
+              action="task_survey.action_window"/>
+    <menuitem name="Server to list" id="task_survey" parent="task_survey.menu_2"
+              action="task_survey.action_server"/>
+-->
+  </data>
+</odoo>
\ No newline at end of file
diff --git a/odex25_project/to_safe_confirm_button/__init__.py b/odex25_project/to_safe_confirm_button/__init__.py
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/odex25_project/to_safe_confirm_button/__init__.py
@@ -0,0 +1 @@
+
diff --git a/odex25_project/to_safe_confirm_button/__manifest__.py b/odex25_project/to_safe_confirm_button/__manifest__.py
new file mode 100644
index 000000000..f91e54928
--- /dev/null
+++ b/odex25_project/to_safe_confirm_button/__manifest__.py
@@ -0,0 +1,44 @@
+{
+    'name': "Safe Confirm Button",
+
+    'summary': """
+Draw more attention on dangerous confirmation action
+        """,
+
+    'description': """
+This application adds safe_confirm attribute to button tag to draw more attention from users. It is useful for action 
+that could harm something 
+
+Example
+=======
+    <button name="action_clear_data" type="object" string="Clear Data"
+        safe_confirm="Odoo will connect and clear all device data (include: user, attendance report, finger database).
+         Do you want to proceed?"
+        help="Clear all data from the device" groups="hr_attendance.group_hr_attendance_manager" />
+    """,
+
+    'author': "T.V.T Marine Automation (aka TVTMA)",
+    'website': 'https://www.tvtmarine.com',
+    'live_test_url': 'https://v12demo-int.erponline.vn',
+    'support': "support@ma.tvtmarine.com",
+
+    # Categories can be used to filter modules in modules listing
+    # Check https://github.com/odoo/odoo/blob/master/odoo/addons/base/module/module_data.xml
+    # for the full list
+    'category': 'Hidden',
+    'version': '1.0.0',
+
+    # any module necessary for this one to work correctly
+    'depends': ['web'],
+
+    # always loaded
+    'data': [
+        'views/assets.xml',
+    ],
+
+    'installable': True,
+    'auto_install': True,
+    'price': 0.0,
+    'currency': 'EUR',
+    'license': 'OPL-1',
+}
diff --git a/odex25_project/to_safe_confirm_button/static/src/js/safe_confirm.js b/odex25_project/to_safe_confirm_button/static/src/js/safe_confirm.js
new file mode 100644
index 000000000..f993ecae9
--- /dev/null
+++ b/odex25_project/to_safe_confirm_button/static/src/js/safe_confirm.js
@@ -0,0 +1,50 @@
+odoo.define('to_safe_confirm_button.safe_confirm', function (require) {
+"use strict";
+
+var Dialog = require('web.Dialog')
+var form_controller = require('web.FormController')
+
+form_controller.include({
+	_onButtonClicked: function (event) {
+        event.stopPropagation();
+        var self = this;
+        var def;
+        this._disableButtons();
+        function saveAndExecuteAction () {
+            return self.saveRecord(self.handle, {
+                stayInEdit: true,
+            }).then(function () {
+                var record = self.model.get(event.data.record.id);
+                return self._callButtonAction(attrs, record);
+            });
+        }
+        var attrs = event.data.attrs;
+        if (attrs.confirm) {
+            var d = $.Deferred();
+            Dialog.confirm(this, attrs.confirm, {
+                confirm_callback: saveAndExecuteAction,
+            }).on("closed", null, function () {
+                d.resolve();
+            });
+            def = d.promise();
+        } 
+        else if (attrs.safe_confirm){
+        	var d = $.Deferred();
+            Dialog.safeConfirm(this, attrs.safe_confirm, {
+                confirm_callback: saveAndExecuteAction,
+            }).on("closed", null, function () {
+                d.resolve();
+            });
+            def = d.promise();
+        }
+        else if (attrs.special === 'cancel') {
+            def = this._callButtonAction(attrs, event.data.record);
+        } else if (!attrs.special || attrs.special === 'save') {
+            // save the record but don't switch to readonly mode
+            def = saveAndExecuteAction();
+        }
+        def.then(this._enableButtons.bind(this));
+    },
+});
+});
+
diff --git a/odex25_project/to_safe_confirm_button/views/assets.xml b/odex25_project/to_safe_confirm_button/views/assets.xml
new file mode 100644
index 000000000..f41ddbea5
--- /dev/null
+++ b/odex25_project/to_safe_confirm_button/views/assets.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <template id="assets_backend_inherit" name="Assets" inherit_id="web.assets_backend">
+        	<xpath expr="." position="inside">
+	            <script type="text/javascript" src="/to_safe_confirm_button/static/src/js/safe_confirm.js"></script>
+	        </xpath>
+        </template>
+    </data>
+</odoo>
diff --git a/odex25_project/web_gantt_native/__init__.py b/odex25_project/web_gantt_native/__init__.py
new file mode 100644
index 000000000..363d10f41
--- /dev/null
+++ b/odex25_project/web_gantt_native/__init__.py
@@ -0,0 +1,2 @@
+from . import ir_ui_view
+from . import models
diff --git a/odex25_project/web_gantt_native/__manifest__.py b/odex25_project/web_gantt_native/__manifest__.py
new file mode 100644
index 000000000..17a5e0647
--- /dev/null
+++ b/odex25_project/web_gantt_native/__manifest__.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+{
+    "name": """Gantt Native Web view""",
+    "summary": """One price = web_gant_native, project_native, project_native_report_advance, project_native_exchange hr_holidays_gantt_native, mrp_gantt_native""",
+    "category": "Odex25-Project/Odex25-Project",
+    "images": ['static/description/banner.gif'],
+    "version": "14.22.08.02.0",
+    "description": """
+        Main Module for Gantt Native
+        
+    """,
+
+    "author": "Viktor Vorobjov",
+    "license": "OPL-1",
+    "website": "https://www.youtube.com/watch?v=xbAoC_s5Et0&list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx",
+    "support": "vostraga@gmail.com",
+    "live_test_url": "https://demo14.garage12.eu",
+    "price": 299.00,
+    "currency": "EUR",
+
+    "depends": [
+        "web", "web_widget_time_delta"
+    ],
+    "external_dependencies": {"python": [], "bin": []},
+    "data": [
+        'views/web_gantt_src.xml',
+    ],
+    "qweb": [
+        'static/src/xml/*.xml',
+
+    ],
+    "demo": [],
+
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+    "installable": True,
+    "auto_install": False,
+    "application": False,
+}
diff --git a/odex25_project/web_gantt_native/doc/changelog.md b/odex25_project/web_gantt_native/doc/changelog.md
new file mode 100644
index 000000000..e0874e91f
--- /dev/null
+++ b/odex25_project/web_gantt_native/doc/changelog.md
@@ -0,0 +1,82 @@
+## Module <Project Native>
+
+#### Version 14.21.02.16.0
+##### fix
+UI improve.
+ISO week / Week for UI.
+
+
+#### Version 14.21.01.26.0
+##### fix
+Open Form wrong target.
+
+#### Version 14.21.01.19.0
+##### Update
+PDF arrows
+
+#### Version 14.20.12.19.0
+##### update
+MRP allows precedessor.
+Check precedessor befor save (not allow if group)
+Open any group in the treeview if related field
+
+
+#### Version 13.20.04.16.0
+##### update
+Update, Show list Hide/Show/... , Gantt Item offset: storage in local storage.
+
+#### Version 13.20.05.19.0
+##### update
+Group by 1+level Fix
+
+
+#### Version 13.20.04.08.0
+##### update
+Load Control View
+
+
+#### Version 13.20.03.25.0
+##### update
+
+
+#### 2020.02.06
+#### Version 13.20.02.06.0
+##### ADD
+
+- Export to PDF from any in web.
+
+
+#### History
+- Update: python 3.6.3 and click to gantt line
+- Fix: momentjs fix
+- Update: Calendar
+- Update: Info bar before and after Gantt Bar (it can use for addition info)
+- Update: Project manual start - and date, sorting from kanban / stage, small fix.
+- fix: sotring problem
+- Update: Drag UI.
+- Update: bug fix group by date 
+- Update: Folding
+- Update: Remove Canvas and Draw Line by div.
+- Update: version and remove js canvas
+- Fix: arrow FF position for UI, readonly check
+- UI: improve
+- UI: more improve
+- UI: Fix horizonatal scroll.
+- Update: Taks info and Critocal path
+- Update: UI not need to much block
+- Update: 12.0
+- Update: Detail plan, fix ghost bar, fix default start time: allow neagative value..
+- Fix: mouse flicker 
+- Update: UI - new arrows designe.
+- Update: added - bar load
+- Fix: some fix gantt bar
+- Update: Loop Detect.
+- Update: Add subtask in group, from tree
+- Fix: Model load
+- Update: Sorting and Deadline
+- FIX: wrong el for sorted
+- Update: UI ztree
+- Fix: Tree
+- Fix: Ghost field read.
+- Update: Fold Save and List view
+
diff --git a/odex25_project/web_gantt_native/doc/index.md b/odex25_project/web_gantt_native/doc/index.md
new file mode 100644
index 000000000..c81f8abde
--- /dev/null
+++ b/odex25_project/web_gantt_native/doc/index.md
@@ -0,0 +1,3 @@
+Changelog
+[a relative link](changelog.md)
+   
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/doc/index.rst b/odex25_project/web_gantt_native/doc/index.rst
new file mode 100644
index 000000000..9f90e54de
--- /dev/null
+++ b/odex25_project/web_gantt_native/doc/index.rst
@@ -0,0 +1,49 @@
+Info demo/video
+==========================
+
+* Youtube: `Odoo Gantt Native Play List <https://www.youtube.com/watch?v=xbAoC_s5Et0&list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx>`_
+
+* Demo: Odoo 14 Gantt - Go to Live Privew (button near Add to Cart)
+    * User: demo
+    * password: demog
+
+
+* Docs:  github.com/straga/gantt_native_doc
+
+  * Calc Type - Resources - Resources Task Link.md
+  * Detail Plan Control in actions.md
+  * Detail Plan Control.md
+  * Duration - Work.md
+  * Update Duration - Work.md
+  * New Task - Sub task.md
+
+* History:
+
+  * ver: 2022-08-02:
+      * UPDATE: datetime from field, remote user_id fro resources, resource active/archive view, import - comment nout use var
+
+
+  * ver: 2022-05-27:
+      * Data: remove unused field: user_id.
+
+  * ver: 2022-04-14:
+      * UI: update.
+
+  * ver: 2022-02-09:
+      * Fix: Color for Parent Task.
+
+  * ver: 2021-10-25:
+      * Warning message about Add Task with not select Project.
+
+  * ver: 2021-07-11:
+      * $buttons if exist first loaded.
+
+  * ver: 2021-07-06:
+      * Allow pdf from project from anywhere
+
+  * ver: 2021-05-30:
+      * Fix: Horizontal Slider Save position
+      * Add: Pissible change Record on Page (default limit 250)
+
+  * ver: Before :
+      * Look RELEASE_NOTES.md
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/i18n/ar_001.po b/odex25_project/web_gantt_native/i18n/ar_001.po
new file mode 100644
index 000000000..3dcf8c775
--- /dev/null
+++ b/odex25_project/web_gantt_native/i18n/ar_001.po
@@ -0,0 +1,843 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* project_native
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-05-03 08:25+0000\n"
+"PO-Revision-Date: 2023-05-03 08:25+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.view_project_task_resource_link_search
+msgid "Active"
+msgstr "نشط"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__detail_plan
+#: model:ir.model.fields,help:project_native.field_project_task__detail_plan
+msgid "Allow Save Detail Plan"
+msgstr "السماح بحفظ خطة التفاصيل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__active_task
+#: model_terms:ir.ui.view,arch_db:project_native.view_project_task_resource_link_search
+msgid "Archived"
+msgstr "مؤرشف"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "As Late As Possible"
+msgstr "التأخير قدر الإمكان"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "As Soon As Possible"
+msgstr "الإنجاز قدر الإمكان"
+
+#. module: project_native
+#: model:ir.actions.act_window,name:project_native.act_res_users_2_project_task_opened
+msgid "Assigned Tasks"
+msgstr "المهام المعينة"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task_detail_plan.py:0
+#, python-format
+msgid "Attendance"
+msgstr "الحضور"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#: model:ir.model.fields.selection,name:project_native.selection__project_task_detail_plan__schedule_mode__auto
+#, python-format
+msgid "Auto"
+msgstr "تلقائي"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Backward"
+msgstr "الخلف"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__fixed_calc_type
+msgid "Calc Type"
+msgstr "نوع الحساب"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_task__color_gantt
+msgid "Choose your color for Task Bar"
+msgstr "اختر لونًا لشريط المهام الخاص بك"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__color_gantt
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__color_gantt
+msgid "Color"
+msgstr "اللون"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__color_gantt_set
+msgid "Color Gantt Set"
+msgstr "ضبط لون Gantt"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__color_gantt
+msgid "Color Task Bar"
+msgstr "لون شريط المهام"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__constrain_date
+msgid "Constraint Date"
+msgstr "تاريخ القيود"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__constrain_type
+msgid "Constraint Type"
+msgstr "نوع القيد"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__cp_detail
+msgid "Cp Detail"
+msgstr "تفاصيل مسار التحكم"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__cp_shows
+msgid "Cp Shows"
+msgstr "عرض مسار التحكم"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__create_uid
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__create_uid
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__create_uid
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__create_uid
+msgid "Created by"
+msgstr "تم إنشاؤه بواسطة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__create_date
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__create_date
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__create_date
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__create_date
+msgid "Created on"
+msgstr "تم إنشاؤه في"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__cp_shows
+#: model:ir.model.fields,field_description:project_native.field_project_task__critical_path
+#: model_terms:ir.ui.view,arch_db:project_native.edit_project_ganttaps_inherited
+msgid "Critical Path"
+msgstr "مسار التحكم"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__cp_detail
+msgid "Critical Path Detail"
+msgstr "تفاصيل مسار التحكم"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__cp_shows
+#: model:ir.model.fields,help:project_native.field_project_task__cp_shows
+msgid "Critical Path Shows"
+msgstr "عرض مسار التحكم"
+
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__cp_detail
+#: model:ir.model.fields,help:project_native.field_project_task__cp_detail
+msgid "Critical Path Shows Detail on Gantt"
+msgstr ""
+
+#. module: project_native
+#: code:addons/project_native/models/project_task_detail_plan.py:0
+#, python-format
+msgid "Cut of DateTime"
+msgstr ""
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__data_aggr
+msgid "Date Aggr."
+msgstr "تجميع التاريخ"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__date_end
+msgid "Date End"
+msgstr "تاريخ الانتهاء"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__data_from
+msgid "Date From"
+msgstr "التاريخ من"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__date_start
+msgid "Date Start"
+msgstr "تاريخ البدء"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__date_start
+msgid "Date Start for Auto Mode"
+msgstr "تاريخ البدء للوضع التلقائي"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__data_to
+msgid "Date To"
+msgstr "التاريخ حتى"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Day"
+msgstr "يوم"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Day Second"
+msgstr "يوم ثانية"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__task_default_duration
+msgid "Default Task Duration"
+msgstr "المدة الزمنية الافتراضية للمهمة"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__task_default_start
+msgid "Default Task Start after midnight, UTC - without Time Zone"
+msgstr "البدء الافتراضي للمهمة بعد منتصف الليل بتوقيت UTC - بدون المنطقة الزمنية"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__task_default_start_end
+msgid "Default Task Start after midnight, with user Time Zone"
+msgstr "البدء الافتراضي للمهمة بعد منتصف الليل بتوقيت المستخدم"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.edit_project_ganttaps_inherited
+msgid "Default for Task"
+msgstr "الافتراضي للمهمة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__detail_plan
+#: model:ir.model.fields,field_description:project_native.field_project_task__detail_plan
+msgid "Detail Plan"
+msgstr "خطة التفاصيل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__detail_plan_ids
+msgid "Detail Plan List"
+msgstr "قائمة خطط التفاصيل"
+
+#. module: project_native
+#: model:ir.actions.act_window,name:project_native.act_project_task_detail_plan
+msgid "Detail Plan for Task"
+msgstr "خطة التفاصيل للمهمة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__detail_plan_count
+msgid "Detail plan Count"
+msgstr "عدد خطط التفاصيل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__detail_plan_work
+msgid "Detail plan work"
+msgstr "عمل خطة التفاصيل"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.view_task_form2_inherit_task_detail_plan
+msgid "Detail-Plan"
+msgstr "خطة التفاصيل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__display_name
+#: model:ir.model.fields,field_description:project_native.field_project_task__display_name
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__display_name
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__display_name
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__display_name
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__display_name
+#: model:ir.model.fields,field_description:project_native.field_resource_resource__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__date_finished
+msgid "Done Date"
+msgstr "تاريخ الانتهاء"
+
+#. module: project_native
+#: model:ir.model.constraint,message:project_native.constraint_project_task_resource_link_project_task_resource_link_uniq
+msgid "Duplicate Resource."
+msgstr "تكرار المورد"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#: model:ir.model.fields,field_description:project_native.field_project_task__duration
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__duration
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__duration
+#, python-format
+msgid "Duration"
+msgstr "المدة الزمنية"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__duration_picker
+#: model:ir.model.fields,field_description:project_native.field_project_task__duration_picker
+msgid "Duration Picker"
+msgstr "مُنتقي المدة الزمنية"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__duration_scale
+#: model:ir.model.fields,field_description:project_native.field_project_task__duration_scale
+#: model_terms:ir.ui.view,arch_db:project_native.edit_project_ganttaps_inherited
+msgid "Duration Scale"
+msgstr "مقياس المدة الزمنية"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__duration_work_scale
+#: model:ir.model.fields,field_description:project_native.field_project_task__duration_work_scale
+msgid "Duration Work Scale"
+msgstr "مقياس عمل المدة الزمنية"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__duration_picker
+#: model:ir.model.fields,help:project_native.field_project_task__duration_picker
+msgid "Empty it is Hide: day and second"
+msgstr "فارغ فهو مخفي: اليوم والثانية"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__end
+msgid "End"
+msgstr "النهاية"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__date_end
+#: model:ir.model.fields,field_description:project_native.field_project_task__date_end
+msgid "Ending Date"
+msgstr "تاريخ الانتهاء"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task_resource.py:0
+#, python-format
+msgid "Everywhere"
+msgstr "في كل مكان"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Finish No Earlier Than"
+msgstr "لا يُنهى قبل"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Finish No Later Than"
+msgstr "لا يُنهى بعد"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__fold
+msgid "Fold"
+msgstr "طي"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__fold
+msgid "Fold Task"
+msgstr "طي المهمة"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__fold
+msgid "Fold project"
+msgstr "طي المشروع"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_task__fold
+msgid "Fold task"
+msgstr "طي المهمة"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Forward"
+msgstr "إلى الأمام"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.edit_project_ganttaps_inherited
+#: model_terms:ir.ui.view,arch_db:project_native.ganttaps_view_task_form2
+msgid "Gantt View"
+msgstr "عرض جانت"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.view_project_task_resource_link_search
+msgid "Group By"
+msgstr "تجميع بواسطة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__id
+#: model:ir.model.fields,field_description:project_native.field_project_task__id
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__id
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__id
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__id
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__id
+#: model:ir.model.fields,field_description:project_native.field_resource_resource__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task_resource.py:0
+#, python-format
+msgid "In project"
+msgstr "في المشروع"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__info
+#: model_terms:ir.ui.view,arch_db:project_native.ganttaps_view_task_form2
+msgid "Info"
+msgstr "معلومات"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__info_ids
+msgid "Info Value"
+msgstr "قيمة المعلومة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__lag_qty
+msgid "Lag"
+msgstr "فراغ"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__lag_type
+msgid "Lag type"
+msgstr "نوع الفراغ"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project____last_update
+#: model:ir.model.fields,field_description:project_native.field_project_task____last_update
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan____last_update
+#: model:ir.model.fields,field_description:project_native.field_project_task_info____last_update
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor____last_update
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link____last_update
+#: model:ir.model.fields,field_description:project_native.field_resource_resource____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__write_uid
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__write_uid
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__write_uid
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__write_date
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__write_date
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__write_date
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__left_down
+msgid "Left Down"
+msgstr "يسار أسفل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__left_up
+msgid "Left Up"
+msgstr "يسار أعلى"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.project_task_detail_plan_search_view_form
+msgid "Level"
+msgstr "المستوى"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.view_project_task_resource_link_search
+msgid "Link Name"
+msgstr "اسم الرابط"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__predecessor_ids
+msgid "Links"
+msgstr "الروابط"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__load_control
+msgid "Load Control"
+msgstr "تحكّم في الحمل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__load_factor
+msgid "Load Factor"
+msgstr "عامل الحمل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__p_loop
+msgid "Loop Detected"
+msgstr "تم اكتشاف حلقة"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#: code:addons/project_native/models/project_task.py:0
+#: model:ir.model.fields.selection,name:project_native.selection__project_task_detail_plan__schedule_mode__manual
+#, python-format
+msgid "Manual"
+msgstr "يدوي"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__is_milestone
+msgid "Mark as Milestone"
+msgstr "وضع علامة كحدث مهم"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Must Finish On"
+msgstr "يجب الانتهاء في"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Must Start On"
+msgstr "يجب البدء في"
+
+#. module: project_native
+#: model:ir.model.constraint,message:project_native.constraint_project_task_predecessor_project_task_link_uniq
+msgid "Must be unique."
+msgstr "يجب أن يكون فريداً."
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__name
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__name
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__name_att
+msgid "Name att"
+msgstr "الاسم الفرعي"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task_resource.py:0
+#, python-format
+msgid "No"
+msgstr "لا"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Not work in manual mode. Please set in project: Backwork or Forward"
+msgstr "لا يعمل في الوضع اليدوي. يرجى تعيينه في المشروع: العمل العكسي أو العمل الأمامي"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__parent_task_id
+msgid "Parent Task"
+msgstr "المهمة الأصل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__plan_action
+msgid "Plan Action"
+msgstr "خطة العملية"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.ganttaps_view_task_form2
+msgid "Plan Duration"
+msgstr "مدة الخطة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__plan_duration
+msgid "Plan Value"
+msgstr "قيمة الخطة"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.ganttaps_view_task_form2
+msgid "Predecessor"
+msgstr "السابق"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__predecessor_count
+msgid "Predecessor Count"
+msgstr "عدد السابقين"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__predecessor_parent
+msgid "Predecessor parent"
+msgstr "سابق الأصل"
+
+#. module: project_native
+#: model:ir.model,name:project_native.model_project_project
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__project_id
+#: model_terms:ir.ui.view,arch_db:project_native.view_project_task_resource_link_search
+msgid "Project"
+msgstr "المشروع"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__resource_id
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__resource_id
+#: model:ir.ui.menu,name:project_native.project_resource_menu
+#: model_terms:ir.ui.view,arch_db:project_native.project_task_resource_link_form
+#: model_terms:ir.ui.view,arch_db:project_native.view_project_task_resource_link_search
+msgid "Resource"
+msgstr "المورد"
+
+#. module: project_native
+#: model:ir.actions.act_window,name:project_native.action_project_task_resource_link_tree
+msgid "Resource Task Link"
+msgstr "ربط مهمة المورد"
+
+#. module: project_native
+#: model:ir.model,name:project_native.model_resource_resource
+#: model:ir.model.fields,field_description:project_native.field_project_task__task_resource_ids
+#: model:ir.model.fields,field_description:project_native.field_resource_resource__resource_task_ids
+#: model_terms:ir.ui.view,arch_db:project_native.ganttaps_view_task_form2
+#: model_terms:ir.ui.view,arch_db:project_native.project_task_resource_link_tree
+msgid "Resources"
+msgstr "الموارد"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.ganttaps_view_task_form2
+msgid "Resources Link"
+msgstr "ربط الموارد"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__right_down
+msgid "Right Down"
+msgstr "اليمين السفلي"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__right_up
+msgid "Right Up"
+msgstr "اليمين العلوي"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__schedule_mode
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__schedule_mode
+msgid "Schedule Mode"
+msgstr "نمط الجدولة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__scheduling_type
+msgid "Scheduling Type"
+msgstr "نوع الجدولة"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.view_project_task_resource_link_search
+msgid "Search Resource"
+msgstr "البحث عن مورد"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Second"
+msgstr "ثانية"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__use_calendar
+msgid "Set Calendat in Setting Tab"
+msgstr "تعيين التقويم في علامة التبويب الإعدادات"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__color_gantt_set
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__color_gantt_set
+msgid "Set Color Task"
+msgstr "تعيين لون المهمة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__show
+msgid "Show"
+msgstr "عرض"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__sorting_level
+msgid "Sorting Level"
+msgstr "مستوى الترتيب"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__sorting_seq
+msgid "Sorting Seq."
+msgstr "تسلسل الترتيب"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__start
+msgid "Start"
+msgstr "بدء"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Start No Earlier Than"
+msgstr "البدء لا يتجاوز"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Start No Later Than"
+msgstr "البدء بعد لا يتجاوز"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__date_start
+#: model:ir.model.fields,field_description:project_native.field_project_task__date_start
+msgid "Starting Date"
+msgstr "تاريخ البدء"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__summary_date_end
+msgid "Summary Date End"
+msgstr "تاريخ نهاية الملخص"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__summary_date_start
+msgid "Summary Date Start"
+msgstr "تاريخ بدء الملخص"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__task_id
+#: model:ir.model.fields,field_description:project_native.field_project_task_info__task_id
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__task_id
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__task_id
+#: model_terms:ir.ui.view,arch_db:project_native.view_project_task_resource_link_search
+msgid "Task"
+msgstr "مهمة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__task_default_duration
+msgid "Task Duration"
+msgstr "مدة المهمة"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__task_default_start
+msgid "Task Start (UTC)"
+msgstr "بدء المهمة (توقيت عالمي منسق)"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__task_default_start_end
+msgid "Task Start (tz)"
+msgstr "بدء المهمة (منطقة زمنية)"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task__on_gantt
+msgid "Task name on gantt"
+msgstr "اسم المهمة على شكل دياجرام جانت"
+
+#. module: project_native
+#: model_terms:ir.ui.view,arch_db:project_native.edit_project_ganttaps_inherited
+msgid "Tasks in Auto Mode"
+msgstr "المهام في وضع السيارة"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__tz
+msgid "Time Zone"
+msgstr "المنطقة الزمنية"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__tz
+msgid "Timezone"
+msgstr "المنطقة الزمنية"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__tz_offset
+msgid "Timezone offset"
+msgstr "الانحراف عن المنطقة الزمنية"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__type_level
+#: model:ir.model.fields,field_description:project_native.field_project_task_predecessor__type
+#: model:ir.model.fields,field_description:project_native.field_project_task_resource_link__resource_type
+msgid "Type"
+msgstr "النوع"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__use_calendar
+msgid "Use Calendar"
+msgstr "استخدام التقويم"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid "Work"
+msgstr "العمل"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_project__resource_calendar_id
+msgid "Working Time"
+msgstr "فترة العمل"
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid ""
+"You can not add a Predecessor for Task with subtask ({}).\n"
+"Please Select Task inside Parent Task."
+msgstr "لا يمكنك إضافة سلف للمهمة التي تحتوي على مهام فرعية ({}).\nيرجى تحديد المهمة داخل المهمة الأصلية."
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid ""
+"You can not change a Project for Task.\n"
+"Please Delete or Remove - sub tasks first."
+msgstr "لا يمكنك تغيير المشروع المرتبط بالمهمة.\nيرجى حذف أو إزالة المهام الفرعية أولاً."
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid ""
+"You can not change a Project for task.\n"
+"Please Delete - Predecessor: for parent or child."
+msgstr "لا يمكنك تغيير المشروع المرتبط بالمهمة.\nيرجى حذف سلف المهمة الأصلية أو المهمة الفرعية."
+
+#. module: project_native
+#: code:addons/project_native/models/project_task.py:0
+#, python-format
+msgid ""
+"You can not delete a Parent Task.\n"
+"Please Delete - sub tasks first."
+msgstr "لا يمكنك حذف المهمة الأصلية.\nيرجى حذف المهام الفرعية أولاً."
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_project__duration_scale
+#: model:ir.model.fields,help:project_native.field_project_project__duration_work_scale
+#: model:ir.model.fields,help:project_native.field_project_task__duration_scale
+#: model:ir.model.fields,help:project_native.field_project_task__duration_work_scale
+msgid "You can set: y,mo,w,d,h,m,s,ms"
+msgstr "يمكنك تحديد: سنة، شهر، أسبوع، يوم، ساعة، دقيقة، ثانية، جزء من الثانية"
+
+#. module: project_native
+#: model:ir.model,name:project_native.model_project_task
+msgid "customize in Task"
+msgstr "تخصيص في المهمة"
+
+#. module: project_native
+#: model:ir.model.fields,help:project_native.field_project_task__critical_path
+msgid "is Critical Path"
+msgstr "هل هو مسار حرج"
+
+#. module: project_native
+#: model:ir.model.fields,field_description:project_native.field_project_task_detail_plan__iteration
+msgid "iteration"
+msgstr "دورة"
+
+#. module: project_native
+#: model:ir.model,name:project_native.model_project_task_detail_plan
+msgid "project.task.detail.plan"
+msgstr "تفاصيل المهمة"
+
+#. module: project_native
+#: model:ir.model,name:project_native.model_project_task_info
+msgid "project.task.info"
+msgstr "معلومات المهمة"
+
+#. module: project_native
+#: model:ir.model,name:project_native.model_project_task_predecessor
+msgid "project.task.predecessor"
+msgstr "سلف المهمة"
+
+#. module: project_native
+#: model:ir.model,name:project_native.model_project_task_resource_link
+msgid "project.task.resource.link"
+msgstr "رابط الموارد للمهمة"
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/images/gantt_native_view.png b/odex25_project/web_gantt_native/images/gantt_native_view.png
new file mode 100644
index 000000000..77cf5bf3f
Binary files /dev/null and b/odex25_project/web_gantt_native/images/gantt_native_view.png differ
diff --git a/odex25_project/web_gantt_native/ir_ui_view.py b/odex25_project/web_gantt_native/ir_ui_view.py
new file mode 100644
index 000000000..f1d3b66dc
--- /dev/null
+++ b/odex25_project/web_gantt_native/ir_ui_view.py
@@ -0,0 +1,7 @@
+from odoo import fields, models
+
+
+class IrUiView(models.Model):
+    _inherit = 'ir.ui.view'
+
+    type = fields.Selection(selection_add=[('ganttaps', 'Gantt APS')])
diff --git a/odex25_project/web_gantt_native/models/__init__.py b/odex25_project/web_gantt_native/models/__init__.py
new file mode 100644
index 000000000..d8e24203c
--- /dev/null
+++ b/odex25_project/web_gantt_native/models/__init__.py
@@ -0,0 +1,2 @@
+from . import gantt_native_tool
+from . import gantt_native_predecessor
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/models/gantt_native_predecessor.py b/odex25_project/web_gantt_native/models/gantt_native_predecessor.py
new file mode 100644
index 000000000..332045b10
--- /dev/null
+++ b/odex25_project/web_gantt_native/models/gantt_native_predecessor.py
@@ -0,0 +1,48 @@
+
+import logging
+from odoo import api, fields, models, _
+
+from odoo.exceptions import UserError
+
+_logger = logging.getLogger(__name__)
+
+
+class GanttNativePredecessor(models.AbstractModel):
+    _name = 'gantt.native.predecessor'
+    _description = "gantt.native.predecessor"
+
+
+    @api.model
+    def _get_link_type(self):
+        value = [
+            ('FS', _('Finish to Start (FS)')),
+            ('SS', _('Start to Start (SS)')),
+            ('FF', _('Finish to Finish (FF)')),
+            ('SF', _('Start to Finish (SF)')),
+
+        ]
+        return value
+
+    type = fields.Selection('_get_link_type',
+                            string='Type',
+                            required=True,
+                            default='FS')
+
+
+    @api.model
+    def _get_lag_type(self):
+        value = [
+            ('minute', _('minute')),
+            ('hour', _('hour')),
+            ('day', _('day')),
+            ('percent', _('percent')),
+        ]
+        return value
+
+    lag_type = fields.Selection('_get_lag_type',
+                                string='Lag type',
+                                required=True,
+                                default='day')
+
+    lag_qty = fields.Integer(string='Lag', default=0)
+
diff --git a/odex25_project/web_gantt_native/models/gantt_native_tool.py b/odex25_project/web_gantt_native/models/gantt_native_tool.py
new file mode 100644
index 000000000..4d5b68b27
--- /dev/null
+++ b/odex25_project/web_gantt_native/models/gantt_native_tool.py
@@ -0,0 +1,22 @@
+
+import logging
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+class GanttNativeTool(models.AbstractModel):
+    _name = "gantt.native.tool"
+    _description = 'Gantt Native Tool'
+
+    @api.model
+    def open_model(self, name_model, name_field):
+        field_data = self.sudo().env['ir.model.fields']._get(name_model, name_field)
+        return field_data.relation
+
+    @api.model
+    def exist_model(self, name_model):
+        status = self.sudo().env['ir.module.module'].search([('name', '=', name_model)])
+        if not status or status.state != 'installed':
+            raise UserError(_('Please install module first: Gantt Native PDF Advance (project_native_report_advance). It free parts for: web_gantt_native '))
+        return status
+
+
diff --git a/odex25_project/web_gantt_native/static/description/G0.png b/odex25_project/web_gantt_native/static/description/G0.png
new file mode 100644
index 000000000..77cf5bf3f
Binary files /dev/null and b/odex25_project/web_gantt_native/static/description/G0.png differ
diff --git a/odex25_project/web_gantt_native/static/description/banner.gif b/odex25_project/web_gantt_native/static/description/banner.gif
new file mode 100644
index 000000000..caa3184eb
Binary files /dev/null and b/odex25_project/web_gantt_native/static/description/banner.gif differ
diff --git a/odex25_project/web_gantt_native/static/description/gantt_native_main.gif b/odex25_project/web_gantt_native/static/description/gantt_native_main.gif
new file mode 100644
index 000000000..f4ac2afd6
Binary files /dev/null and b/odex25_project/web_gantt_native/static/description/gantt_native_main.gif differ
diff --git a/odex25_project/web_gantt_native/static/description/icon.png b/odex25_project/web_gantt_native/static/description/icon.png
new file mode 100644
index 000000000..f623dad42
Binary files /dev/null and b/odex25_project/web_gantt_native/static/description/icon.png differ
diff --git a/odex25_project/web_gantt_native/static/description/index.html b/odex25_project/web_gantt_native/static/description/index.html
new file mode 100644
index 000000000..499d8dca4
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/description/index.html
@@ -0,0 +1,76 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Main UI Gannt Module. It Only Web Gantt Framework. It is Main cost module. Other parts free. 14</h2>
+            <p class="oe_mt32">How it work, look project module. Get Project Module and MRP/MAnufacture - it free part Web Gantt Framework.
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/project_native/">Gantt Native view for Projects </a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/project_native_exchange/">Save/Load project in xml</a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/project_native_report_advance/">Save Gantt in PDF for Project</a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/mrp_gantt_native/">Gantt Native view for MRP / Manufacture </a>
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/hr_holidays_gantt_native/">Gantt Native view for Leave </a>
+            <p class="oe_mt32">14e Technical Module for View both Gantt
+            <p class="oe_mt32">0.00 Eur <a href="https://apps.odoo.com/apps/modules/14.0/project_native_ee/">View Standart Gantt in Project View </a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Gantt Charts for Odoo 14 Native Odoo interface.</h2>
+        <h3 class="oe_slogan">Based on Odoo framework.</h3>
+        <div class="oe_demo oe_picture oe_screenshot">
+            <img src="gantt_native_main.gif">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Descriptions</h2>
+        <h3 class="oe_slogan">More Details .... .</h3>
+        <div class="oe_span12">
+            <h2>Open "Gantt Native view for Project"</h2>
+            <a href="https://apps.odoo.com/apps/modules/14.0/project_native/">Gantt Native view for Projects </a>
+         </div>
+        </div>
+</section>
+
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Demo</h2>
+            <p class="oe_mt32">Live:https://demo14.garage12.eu/ </p>
+            <p class="oe_mt32">user: demo Password:demog </p>
+
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video PlayList <a href="https://www.youtube.com/playlist?list=PLmxcMU6Ko0NkqpGLcC44_GXo3_41pyLNx">Odoo Gantt Native</a>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Need our service?</h2>
+            <p class="oe_mt32">Contact us by <a href="mailto:vostraga@gmail.com">email</a>
+            <ul>
+                <li><a href="mailto:vostraga@gmail.com">vostraga@gmail.com <i class="fa fa-envelope-o"></i></a></li>
+            </ul>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_separator">
+</section>
diff --git a/odex25_project/web_gantt_native/static/src/css/gantt_native copy.css b/odex25_project/web_gantt_native/static/src/css/gantt_native copy.css
new file mode 100644
index 000000000..b2fb5b872
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/css/gantt_native copy.css	
@@ -0,0 +1,2216 @@
+.gantt-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    height: 100%;
+    min-height: 200px;
+}
+
+.o_native_gantt_view {
+    position: relative;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    height: 100%;
+}
+
+.task-gantt {
+    overflow: hidden;
+    border-bottom: 1px solid #dddee1;
+    background: #fff;
+    height: 65% timeline;
+    height: 100%;
+    overflow-y: scroll;
+}
+
+
+.timeline-gantt {
+    overflow-y: scroll;
+    border-top: 2px solid rgba(255, 255, 255, 0);
+    background: #edeef0;
+    float: left;
+    height: 52px;
+    position: relative;
+    padding: 0 0 50px 0;
+    width: 100%;
+    height: 15%;
+    padding-top: 2px;
+}
+
+.timeline-gantt-header {
+    overflow: hidden;
+    border-top: 2px solid rgba(255, 255, 255, 0);
+    background: #ff2a23;
+    float: left;
+    height: 40px;
+    position: relative;
+    padding: 0 0 50px 0;
+    width: 100%;
+    height: 100%;
+    padding-top: 2px;
+}
+
+.timeline-gantt-scroll {
+    overflow: hidden;
+    border-top: 2px solid rgba(255, 255, 255, 0);
+    background: rgba(54, 4, 54, 0.09);
+    /**/
+    float: left;
+    height: 40px;
+    position: relative;
+    padding: 0 0 30px 0;
+    width: 100%;
+    height: 100%;
+
+    padding-top: 2px;
+}
+
+
+.timeline-gantt-scroll-slider {
+    overflow: hidden;
+    border-top: 2px solid rgba(255, 255, 255, 0);
+    background: rgba(221, 217, 223, 0.45);
+    border-color: #3bcaf2;
+    border-top-width: 2px;
+    border-bottom-width: 2px;
+    border-left-width: 2px;
+    border-right-width: 2px;
+    border-style: solid;
+    float: left;
+    height: 25px;
+    position: sticky !important;
+    padding: 0 0 30px 0;
+    width: 50px;
+    height: 100%;
+    cursor: move;
+    padding-top: 2px;
+}
+
+.timeline-gantt-scroll-scale-end,
+.timeline-gantt-scroll-scale-end:after {
+    content: "";
+    position: absolute;
+    background: rgba(115, 193, 143, 0.96);
+    width: 150px;
+    height: 100%;
+    border-color: transparent transparent #3bcaf2;
+    border-top-width: 38px;
+    border-bottom-width: 38px;
+    border-left-width: 13px;
+    border-right-width: 3px;
+    border-style: solid;
+    top: -27px;
+    right: 0;
+}
+
+.timeline-gantt-scroll-scale-start,
+.timeline-gantt-scroll-scale-start:before {
+    content: "";
+    position: absolute;
+    background: rgba(115, 193, 143, 0.96);
+    width: 150px;
+    height: 100%;
+    border-color: transparent transparent #3bcaf2;
+    border-top-width: 38px;
+    border-bottom-width: 38px;
+    border-left-width: 13px;
+    border-right-width: 3px;
+    border-style: solid;
+    top: -27px;
+    left: 0;
+}
+
+.timeline-gantt-scroll-scale-start-date {
+
+    position: relative;
+    text-align: left;
+    color: #ffffff;
+    font-size: 13px !important;
+    margin-top: 3px;
+    margin-left: 6px;
+
+}
+
+.timeline-gantt-scroll-scale-end-date {
+
+    position: relative;
+    text-align: right;
+    color: #ffffff;
+    font-size: 13px !important;
+    margin-top: 3px;
+    margin-right: 6px;
+
+
+}
+
+
+
+.timeline-gantt-options {
+    position: absolute;
+    top: 0;
+    left: 5px;
+    width: 3px;
+    cursor: ew-resize;
+    height: 100%;
+    background: #dddee1;
+    display: inline-block;
+
+}
+
+.gantt-list-options {
+    position: absolute;
+    bottom: 0;
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+
+}
+
+.gantt-list-options-item {
+    width: max-content;
+    font-size: 12px;
+    color: #7c7a6b;
+    margin-top: auto;
+    margin-left: 5px;
+}
+
+.task-gantt-item-sort-name {
+    width: max-content;
+    display: inline-block;
+    font-weight: bold;
+    font-size: 12px;
+    color: #7c7a6b;
+}
+
+.task-gantt-item-sort-manual {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+    width: max-content;
+    font-size: 12px;
+}
+
+
+.gantt-list-options-item-sort {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+}
+
+
+.gantt-list-options-item-check {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+
+}
+
+
+.gantt-list-options-item-check-inactive {
+    color: rgba(171, 168, 170, 0.59);
+}
+
+.gantt-list-options-item-check-basic {
+    color: #2e7e59;
+    ;
+}
+
+.gantt-list-options-item-check-active {
+    color: #ce674d;
+    ;
+}
+
+
+
+.gantt-list-options-export-to-file {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+}
+
+
+.gantt-list-options-industry-show {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+}
+
+
+.gantt-list-options-industry-hide {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+}
+
+.gantt-list-options-week-week {
+    cursor: pointer;
+    color: #e28676;
+    margin-left: 3px;
+}
+
+
+.gantt-list-options-week-isoweek {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+}
+
+
+
+
+
+.timeline-gantt-gutter {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 3px;
+    cursor: ew-resize;
+    height: 100%;
+    background: #dddee1;
+    display: inline-block;
+}
+
+.timeline-gantt-items {
+    float: left;
+    width: 400px;
+    overflow: hidden;
+    position: relative;
+    padding: 0 0 52px 0;
+
+    background: #edeef0;
+
+}
+
+.timeline-gantt-head {
+    overflow-x: scroll;
+    overflow-x: hidden;
+    overflow-y: hidden;
+    height: 100%;
+    position: relative;
+
+    background: #edeef0;
+    padding: 0 0 40px 0;
+
+}
+
+
+.o_control_panel {
+    padding-top: 10px;
+    padding-right: 16px;
+    padding-bottom: 0px;
+    padding-left: 16px;
+    background-color: #f0eeee;
+    border-bottom: 1px solid #a8a8a8;
+}
+
+
+.item-action {
+    height: 30px;
+    display: flex;
+
+}
+
+.item-info {
+    height: 30px;
+}
+
+.item-info-hover {
+
+    background-color: #dfebf6 !important;
+    opacity: 0.6 !important;
+}
+
+
+.task-gantt-item-info {
+    overflow: hidden;
+    text-align: right;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    height: 22px;
+    min-width: 50px;
+}
+
+
+.task-gantt-items {
+
+    margin: 17px 0 0 0;
+    float: left;
+    min-width: 60%;
+    width: 100%;
+}
+
+.item-infos {
+
+    margin: 0px 4px 0 0;
+    float: right;
+    min-width: 25%;
+    display: flex;
+}
+
+.item-list {
+    margin: 0px 8px 0 0;
+
+}
+
+.item-info {
+    margin: 0px 8px 0 0;
+
+}
+
+.task-gantt-info {
+    position: absolute;
+    margin: 17px 4px 0 0;
+    float: right;
+    min-width: 25%;
+    display: flex;
+}
+
+.item-info * {
+    pointer-events: none;
+}
+
+
+.task-gantt-action {
+    position: absolute;
+    margin: 17px 0 0 2px;
+    float: left;
+
+    border-top: 1px solid #f00c24;
+
+    top: 0;
+    right: 0;
+    width: 3px;
+    cursor: ew-resize;
+    height: 100%;
+    background: #dddee1
+}
+
+.task-gantt-sorting {
+    float: left;
+    width: 20px;
+    overflow: hidden;
+    position: relative;
+    margin-top: -52px;
+}
+
+.task-sorting-items {
+    margin: 68px 0 0 0
+}
+
+.task-gantt-sorting-item {
+    height: 30px;
+    position: relative;
+    padding: 0 0 0 5px;
+    border-top: 1px solid #edeef0;
+    white-space: nowrap;
+    font: normal normal 13px/23px "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+    cursor: n-resize;
+
+}
+
+.task-gantt-sorting-item-hover {
+    background-color: #dfebf6;
+    opacity: 0.6;
+}
+
+
+.task-gantt-list {
+    float: left;
+    width: 400px;
+    overflow: hidden;
+    position: relative;
+    padding: 0 0 50px 0;
+    min-height: 400px;
+    display: flex;
+    flex-direction: row;
+    justify-content: left;
+    align-content: center;
+}
+
+.task-gantt-timeline {
+    overflow-x: scroll;
+    overflow-x: hidden;
+    overflow-y: hidden;
+    height: 100%;
+    position: relative;
+    min-height: 400px;
+
+}
+
+.task-gantt-gutter {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 3px;
+    cursor: ew-resize;
+    height: 100%;
+    background: #dddee1
+}
+
+.task-gantt-gutter-hover {
+    background-color: rgba(97, 162, 212, 0.5);
+
+}
+
+.task-gantt-items-gutter {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 3px;
+    cursor: ew-resize;
+    height: 100%;
+    background: #dddee1;
+    min-width: 3px;
+    cursor: ew-resize;
+    height: 100%;
+    background: #dddee12e;
+    display: flex;
+
+}
+
+.task-gantt-items-gutter-hover {
+    background-color: rgba(97, 162, 212, 0.5);
+
+}
+
+
+.task-gantt-list-controls {
+    height: 27px;
+    border-top: 1px solid #edeef0
+}
+
+.task-gantt-caret-right {
+    position: relative;
+    left: -2px;
+    right: 2px;
+    top: 1px;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+}
+
+
+
+.task-gantt-refresh {
+    position: absolute;
+    margin-left: 2px;
+    left: 18px;
+    right: 2px !important;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-refresh .fa-refresh:hover {
+    color: #f72f3e;
+}
+
+
+
+.task-gantt-add {
+    position: absolute;
+    margin-left: 2px;
+    left: 18px;
+    right: 2px !important;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-add .fa-plus:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-critical {
+    position: absolute;
+    margin-left: 2px;
+    left: 18px;
+    right: 2px !important;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgba(67, 92, 67, 0.41);
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-critical .fa-line-chart:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-wizard {
+    position: absolute;
+    margin-left: 2px;
+    left: 32px;
+    right: 2px !important;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-wizard .fa-arrow-right:hover {
+    color: #f72f3e;
+}
+
+
+.task-gantt-plus {
+    position: absolute;
+    left: 3px;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-plus .fa-plus:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-task-plus {
+    position: absolute;
+    left: 18px;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-task-plus .fa-plus-circle:hover {
+    color: rgb(141, 194, 141);
+}
+
+/*ACTIONS*/
+
+.action-focus {
+    margin-left: 1px;
+    margin-top: 4px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.action-focus .fa-dot-circle-o:hover {
+    color: #f72f3e;
+}
+
+.action-focus .fa-crosshairs:hover {
+    color: #f72f3e;
+}
+
+
+.action-plan {
+    margin-left: 3px;
+    top: 0;
+}
+
+
+.action-plus {
+    margin-left: 3px;
+    margin-top: 4px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.action-plus .fa-plus-circle:hover {
+    color: rgb(141, 194, 141);
+}
+
+
+
+.task-gantt-left {
+    position: absolute;
+    left: 16px;
+    top: 0;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-left .fa-arrow-circle-o-left:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-right {
+    position: absolute;
+    left: 29px;
+    top: 0;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-right .fa-arrow-circle-o-right:hover {
+    color: #f72f3e;
+}
+
+
+.task-gantt-up {
+    position: absolute;
+    left: 42px;
+    top: 0;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-up .fa-arrow-circle-o-up:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-down {
+    position: absolute;
+    left: 55px;
+    top: 0;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-down .fa-arrow-circle-o-down:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-today {
+    position: absolute;
+    width: 20px;
+    height: 20px;
+    right: 8px;
+    top: 3px;
+    cursor: pointer;
+    padding: 1px 2px;
+}
+
+.task-gantt-today .fa-dot-circle-o:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-zoom {
+    position: absolute;
+    width: 20px;
+    height: 20px;
+    right: -8px;
+    left: 8px;
+    top: 3px;
+    cursor: pointer;
+    padding: 1px 2px;
+}
+
+.task-gantt-zoom:hover {
+    color: #f7d6c4;
+}
+
+
+.task-gantt-zoom-out {
+    position: absolute;
+    width: 20px;
+    height: 20px;
+    right: -5px;
+    top: 3px;
+    cursor: pointer;
+    padding: 1px 2px;
+}
+
+.task-gantt-zoom-out .fa-minus-square-o:hover {
+    color: #f72f3e;
+}
+
+
+
+.task-gantt-list-title {
+
+    height: 26px;
+    background: #eef2f4;
+    color: #000;
+    font: normal normal normal 14px/26px Arial, Helvetica, sans-serif;
+    padding: 0 0 0 7px
+}
+
+.task-gantt-items-info {
+    margin: 16px 0 0 0
+}
+
+.task-gantt-items-group {
+    font-weight: bold;
+}
+
+.task-gantt-items-subtask {
+    font-weight: bold;
+    color: #787875 !important;
+}
+
+
+.task-gantt-items-critical-path {
+    border-color: red;
+    border-width: 1px;
+    border-style: dashed;
+    box-shadow: 0 0 3px 3px #f30b0b6e
+}
+
+.task-gantt-items-p-loop {
+    border-color: red;
+    border-width: 1px;
+    border-style: dashed;
+    box-shadow: 0 0 3px 3px rgba(243, 142, 0, 0.67)
+}
+
+
+.task-gantt-item {
+    height: 30px;
+    position: relative;
+    padding: 0 5px 0 14px;
+    border-top: 1px solid #edeef0;
+    white-space: nowrap;
+    font: normal normal 13px/23px "Lucida Grande",
+        Helvetica,
+        Verdana,
+        Arial,
+        sans-serif;
+    cursor: move;
+    display: flex;
+    flex-direction: row;
+    justify-content: left;
+    align-content: center;
+}
+
+.task-gantt-item .ui-state-highlight {
+    height: 2.0em;
+    line-height: 1.5em;
+}
+
+.task-sorting-items .ui-state-highlight {
+    height: 5px;
+}
+
+
+.task-sorting-items .ui-state-highlight {
+    height: 20px;
+    width: 18px;
+    line-height: 1px;
+    margin-top: -22px;
+    margin-left: -3px;
+
+}
+
+.task-sorting-items .fa-tasks {
+
+    cursor: pointer;
+    color: #aeafae;
+}
+
+.task-gantt-item .task-gantt-item-name {
+    display: inline-block;
+    color: #4c4c4c;
+    text-decoration: none;
+    vertical-align: middle;
+    cursor: pointer;
+    flex-grow: 1;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    height: 22px;
+    min-width: 50px;
+}
+
+.task-gantt-item-info {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 100%;
+    min-width: 50px;
+    text-align: right;
+    display: inline-block;
+    font-size: 9pt;
+}
+
+.task-gantt-item .task-gantt-item-name:hover {
+    text-decoration: none;
+    color: #000
+}
+
+.task-gantt-item-hidden {
+    display: none
+}
+
+
+.task-gantt-item-hover {
+    background-color: #dfebf6;
+    opacity: 0.6;
+    background-color: #dfebf6 !important;
+    color: white;
+    opacity: 0.6 !important;
+}
+
+.task-gantt-scale-primary {
+    height: 26px;
+    white-space: nowrap;
+    background: #F8F6F7;
+}
+
+.timeline-gantt-scale-primary {
+    height: 26px;
+    white-space: nowrap;
+    background: #F8F6F7;
+    display: inline-block;
+}
+
+.task-gantt-scale-month {
+    display: inline-block;
+    height: 26px;
+    font: normal normal normal 16px/24px Arial, Helvetica, sans-serif;
+    color: #000;
+    vertical-align: top
+}
+
+.task-gantt-scale-month-text {
+    display: inline-block;
+    margin: 0 0 0 13px
+}
+
+.task-gantt-scale-month-sep {
+    display: inline-block;
+    width: 1px;
+    height: 26px;
+    background: #d6d4c7;
+    vertical-align: top
+}
+
+
+
+.task-gantt-scale-secondary {
+    height: 0px;
+    border-top: 1px solid #ceebf5;
+    background: #EFEFEF;
+    white-space: nowrap
+}
+
+
+.timeline-gantt-scale-secondary {
+    height: 26px;
+    border-top: 1px solid #ceebf5;
+    background: #EFEFEF;
+    white-space: nowrap;
+    display: inline-block;
+}
+
+
+.task-gantt-scale-day {
+    display: inline-block;
+    width: 23px;
+    height: 26px;
+    vertical-align: top;
+    font: normal normal normal 10px/24px Arial, Helvetica, sans-serif;
+    color: #7c7a6b;
+    text-align: center
+}
+
+.task-gantt-scale-day-current {
+    font-size: 12px;
+    color: #000;
+    font-weight: bold
+}
+
+.task-gantt-scale-day-sep {
+    display: inline-block;
+    width: 1px;
+    height: 26px;
+    background: #e1dec2;
+    vertical-align: top
+}
+
+.task-gantt-scale-day-weekend {
+    color: #e67a6b
+}
+
+.task-gantt-current-day {
+    position: absolute;
+    width: 1px;
+    height: 100%;
+    left: -100px;
+    top: 22px;
+    border: 1px solid #daceaa;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    background: rgba(255, 229, 158, 0.4);
+    z-index: 1
+}
+
+.task-gantt-bottom-column {
+    display: inline-block;
+    box-sizing: border-box;
+    border-right: 1px solid #c9e5f0;
+    height: 26px;
+    vertical-align: top;
+    font: normal normal normal 10px/24px Arial, Helvetica, sans-serif;
+    color: #535c69;
+    text-align: center;
+    position: relative
+}
+
+.task-gantt-bottom-column:after {
+    content: "";
+    position: absolute;
+    top: 26px;
+    right: -1px;
+    width: 1px;
+    height: 32000px;
+    background: #ebebeb
+}
+
+.task-gantt-weekend-column:before,
+.task-gantt-holiday-column:before,
+.task-gantt-today-column:before {
+    content: "";
+    position: absolute;
+    top: 26px;
+    left: 0;
+    width: 100%;
+    height: 32000px
+}
+
+.task-gantt-weekend-column:before {
+    background: #f9fafb
+}
+
+.task-gantt-holiday-column:before {
+    background: #fee
+}
+
+.task-gantt-weekend-column {
+    background: #cce9f4
+}
+
+.task-gantt-holiday-column {
+    background: #efeff3
+}
+
+.task-gantt-today-column:before {
+    background: #fffded
+}
+
+.task-gantt-today-column {
+    background: #f77c91
+}
+
+.task-gantt-top-column {
+    display: inline-block;
+    box-sizing: border-box;
+    border-right: 1px solid #dae8ee;
+    height: 26px;
+    font: normal normal normal 13px/28px Arial, Helvetica, sans-serif;
+    color: #535c69;
+    background: #F8F6F7;
+    vertical-align: top;
+    text-align: center;
+    overflow: hidden
+}
+
+.task-gantt-timeline-data {
+    padding: 17px 0 0 0;
+    z-index: 2;
+    position: relative
+}
+
+.task-gantt-timeline-row {
+    height: 30px;
+    position: relative
+}
+
+.task-gantt-timeline-row-hover {
+    background-color: #dfebf6;
+    opacity: 0.6;
+}
+
+.task-gantt-bar-plan {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    background: rgba(242, 197, 116, 0.6);
+    border-radius: 2px;
+    z-index: 3;
+    cursor: move
+}
+
+.task-gantt-bar-plan-auto {
+
+    background: rgba(111, 197, 242, 0.6);
+
+}
+
+.task-gantt-bar-plan-constrain {
+
+    background: rgba(242, 133, 113, 0.6);
+
+}
+
+
+.task-gantt-bar-ghosts {
+    position: absolute;
+    top: 12px;
+    left: 0;
+    width: 4px;
+    height: 8px;
+    background: rgba(242, 20, 19, 0);
+    border-color: rgba(61, 144, 242, 0.9);
+    border-bottom-width: 1px;
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: -3;
+    cursor: move
+}
+
+.task-gantt-bar-ghost {
+    position: absolute;
+    top: 12px;
+    left: 0;
+    width: 8px;
+    height: 7px;
+    background: rgba(61, 144, 242, 0.9);
+    border: 1px solid rgb(154, 160, 167);
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: -2;
+    cursor: move;
+    border-color: rgb(154, 160, 167);
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-style: dotted;
+    border-top-style: solid;
+    border-left-style: solid;
+    border-right-style: solid;
+}
+
+.task-gantt-bar-plan:hover {
+    background: rgba(98, 196, 51, 0.38) !important;
+}
+
+.task-gantt-bar-plan:hover .task-gantt-name {
+    display: none;
+}
+
+.task-gantt-bar-plan:hover .task-gantt-progress2 {
+    display: none;
+}
+
+.task-gantt-bar-plan-droppable,
+.task-gantt-bar-plan-draggable {
+    box-shadow: 0 0 5px 0 #3bcaf2
+}
+
+.task-gantt-item-status-completed .task-gantt-bar-plan-droppable,
+.task-gantt-item-status-completed .task-gantt-bar-plan-draggable {
+    box-shadow: 0 0 5px 0 #bec4c9
+}
+
+
+.task-gantt-bar-plan-info-start {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-end;
+    justify-content: flex-end;
+    left: -20px;
+    top: 3px;
+    width: 1px;
+    height: 10px;
+
+}
+
+.task-gantt-bar-plan-info-start a {
+    white-space: nowrap;
+    font-size: 10px;
+}
+
+
+.task-gantt-bar-plan-info-end {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    right: -25px;
+    top: -2px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-end a {
+    white-space: nowrap;
+    font-size: 10px;
+}
+
+
+.task-gantt-bar-plan-info-left-up {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-end;
+    justify-content: flex-end;
+    left: -18px;
+    top: -8px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-left-up a {
+    white-space: nowrap;
+    font-size: 10px;
+    color: #4bcb00;
+}
+
+
+.task-gantt-bar-plan-info-left-down {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-end;
+    justify-content: flex-end;
+    left: -18px;
+    top: 12px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-left-down a {
+    white-space: nowrap;
+    font-size: 10px;
+    color: #fa0002;
+}
+
+
+
+.task-gantt-bar-plan-info-right-up {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    right: -23px;
+    top: -12px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-right-up a {
+    white-space: nowrap;
+    font-size: 10px;
+    color: #4bcb00;
+}
+
+.task-gantt-bar-plan-info-right-down {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    right: -23px;
+    top: 8px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-right-down a {
+    white-space: nowrap;
+    font-size: 10px;
+    color: #fa0002;
+}
+
+
+.task-gantt-bar-plan-start-info {
+    position: absolute;
+    left: 0;
+    top: -10px;
+    width: 1px;
+    height: 16px;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    white-space: nowrap;
+}
+
+
+.task-gantt-bar-plan-end-info {
+    position: absolute;
+    right: -25px;
+    top: -10px;
+    width: 1px;
+    height: 16px;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    white-space: nowrap;
+}
+
+.task-gantt-bar-plan-start {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 1px;
+    height: 16px;
+    cursor: w-resize;
+    z-index: 0;
+    background: rgba(153, 224, 246, 0.0);
+    opacity: .4;
+}
+
+.task-gantt-bar-plan-start:hover {
+
+    background: rgb(76, 92, 246);
+    width: 5px;
+}
+
+.task-gantt-ie7 .task-gantt-bar-plan-start,
+.task-gantt-ie8 .task-gantt-bar-plan-start {
+    cursor: e-resize
+}
+
+.task-gantt-bar-plan-end {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 1px;
+    height: 16px;
+    cursor: e-resize;
+    z-index: 0;
+    background: rgba(153, 224, 246, 0.0);
+    opacity: .4;
+}
+
+.task-gantt-bar-plan-end:hover {
+
+    background: rgb(76, 92, 246);
+    width: 5px;
+}
+
+.task-gantt-bar-plan-end-zero {
+
+    background: rgba(92, 186, 242, 0.48);
+    border-color: rgb(13, 23, 23);
+    border-right-width: 1px;
+    border-right-style: solid;
+}
+
+.task-gantt-bar-plan-start-zero {
+
+    background: rgba(92, 186, 242, 0.48);
+    border-color: rgb(13, 23, 23);
+    border-left-width: 1px;
+
+    border-left-style: solid;
+
+}
+
+
+.task-gantt-ie7 .task-gantt-bar-plan-end,
+.task-gantt-ie8 .task-gantt-bar-plan-end {
+    cursor: e-resize
+}
+
+.task-gantt-bar-plan-endless .task-gantt-bar-plan-end {
+    right: -4px;
+    width: 4px;
+    overflow: hidden
+}
+
+.task-gantt-bar-plan-endless .task-gantt-bar-plan-end:before {
+    content: "";
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-color: transparent transparent #3bcaf2;
+    border-top-width: 38px;
+    border-bottom-width: 38px;
+    border-left-width: 13px;
+    border-right-width: 3px;
+    border-style: solid;
+    top: -27px;
+    left: -9px
+}
+
+.task-gantt-bar-plan-read-only .task-gantt-bar-plan-start,
+.task-gantt-bar-plan-read-only .task-gantt-bar-plan-end,
+.task-gantt-bar-plan-read-only .task-gantt-point {
+    display: none
+}
+
+.task-gantt-bar-plan-read-only .task-gantt-bar-plan-end,
+.task-gantt-bar-plan-read-only .task-gantt-bar-plan {
+    cursor: default
+}
+
+.task-gantt-bar-first {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    background: rgba(242, 20, 19, 0);
+    border-color: rgba(61, 144, 242, 0.9);
+    border-bottom-width: 1px;
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: -3;
+    cursor: move;
+}
+
+.task-gantt-first {
+    -ms-filter: "alpha(opacity=0)";
+    opacity: 0;
+    width: 20px;
+    height: 30px;
+    position: absolute;
+    z-index: 1000;
+    overflow: hidden;
+    cursor: pointer;
+    top: -3px;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-color: #285e6a transparent transparent transparent;
+}
+
+
+
+.task-gantt-first-start {
+    border-width: 10px 10px 0 0px;
+    border-color: rgba(61, 144, 242, 0.9);
+    border-bottom-width: 1px;
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: 10;
+    position: absolute;
+    z-index: -1;
+    top: 0;
+    bottom: 0;
+    border-left: 2px dotted rgba(61, 144, 242, 0.6);
+    left: 0px;
+}
+
+.task-gantt-first-end {
+    border-width: 10px 0px 0 10px;
+    position: absolute;
+    z-index: -1;
+    top: 0;
+    bottom: 0;
+    border-right: 2px dotted rgba(61, 144, 242, 0.6);
+    right: 0px
+}
+
+.task-gantt-first:before {
+    content: "";
+    position: absolute;
+    height: 10px;
+    width: 10px;
+    background: #fff;
+    border: 1px solid rgb(154, 160, 167);
+    border-radius: 9px;
+    margin-top: -5px;
+    top: 50%;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-width: 6px 3px 0 3px;
+    border-color: #285e6a transparent transparent transparent;
+}
+
+.task-gantt-first:before {
+    left: 5px
+}
+
+.task-gantt-first:before {
+    left: 2px
+}
+
+.task-gantt-bar-summary {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    background: rgba(242, 20, 19, 0);
+    border-color: rgba(61, 144, 242, 0.9);
+    border-bottom-width: 1px;
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: -3;
+    cursor: move
+}
+
+.task-gantt-summary {
+    -ms-filter: "alpha(opacity=0)";
+    opacity: 0;
+    width: 20px;
+    height: 30px;
+    position: absolute;
+    z-index: 1000;
+    overflow: hidden;
+    cursor: pointer;
+    top: -3px;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-color: #285e6a transparent transparent transparent;
+}
+
+.task-gantt-summary-start {
+    border-width: 10px 10px 0 0px;
+    left: 0px
+}
+
+.task-gantt-summary-end {
+    border-width: 10px 0px 0 10px;
+    right: 0px
+}
+
+
+.task-gantt-summary:before {
+    content: "";
+    position: absolute;
+    height: 10px;
+    width: 10px;
+    background: #fff;
+    border: 1px solid rgb(154, 160, 167);
+    border-radius: 9px;
+    margin-top: -5px;
+    top: 50%;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-width: 6px 3px 0 3px;
+    border-color: #285e6a transparent transparent transparent;
+}
+
+.task-gantt-summary-start:before {
+    left: 5px
+}
+
+.task-gantt-summary-end:before {
+    left: 2px
+}
+
+.task-gantt-summary:hover:before {
+    background: #c7cacf
+}
+
+.task-gantt-pointer-start .task-gantt-summary-start:before,
+.task-gantt-pointer-end .task-gantt-summary-end:before {
+    background: #808892
+}
+
+.task-gantt-bar-plan:hover .task-gantt-summary,
+.task-gantt-bar-plan-droppable .task-gantt-summary,
+.task-gantt-bar-plan-draggable .task-gantt-summary {
+    -ms-filter: "alpha(opacity=100)";
+    opacity: 1
+}
+
+
+
+.task-gantt-summary-width {
+    position: absolute;
+    top: 0px;
+    left: 0;
+    width: 4px;
+    height: 2px;
+    background: #285e6a;
+    opacity: 0.7;
+    cursor: ew-resize;
+    z-index: -10;
+    box-shadow: 0 0 2px 1px #fff;
+
+}
+
+.task-gantt-pointer {
+    height: 0;
+    border: 0 #747d87;
+    border-bottom-style: dashed;
+    border-bottom-width: 2px;
+    -ms-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    transform-origin: 0 0;
+    z-index: 20;
+    margin-left: 1px;
+    position: absolute
+}
+
+.task-gantt-pointer-popup {
+    max-width: 350px;
+    padding: 3px;
+    font: normal 12px/normal Helvetica, Arial, sans-serif
+}
+
+.task-gantt-pointer-popup-from {
+    margin-bottom: 3px
+}
+
+.task-gantt-pointer-popup-label {
+    margin-right: 5px
+}
+
+.task-gantt-pointer-popup-title {
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 4px
+}
+
+.task-gantt-pointer-popup-error {
+    color: red
+}
+
+.task-gantt-drag-stub {
+    position: absolute;
+    width: 300px;
+    height: 32px;
+    white-space: nowrap;
+    padding: 0 5px 0 25px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    box-sizing: content-box;
+    background: #fff;
+    border: 1px solid #505966;
+    z-index: 100;
+    font: normal 13px/32px Helvetica, Arial, sans-serif;
+    opacity: .9
+}
+
+.task-gantt-drag-stub:before {
+    content: "";
+    display: block;
+    width: 15px;
+    height: 15px;
+    position: absolute;
+    left: 5px;
+    top: 9px;
+
+}
+
+.task-gantt-drag-stub-error:before {
+    background-position: -45px -190px
+}
+
+.task-gantt-drop-line {
+    position: absolute;
+    height: 2px;
+    background: #43474b
+}
+
+.task-gantt-drop-line-error {
+    background: red
+}
+
+
+/*Hint For Move Gantt Line*/
+
+.task-gantt-line-hint-move {
+    position: absolute;
+    top: -100px;
+    left: -100px;
+    top: 200px;
+    left: 400px;
+    z-index: 10;
+    white-space: nowrap;
+    padding: 4px 8px 4px 7px;
+    background: #fff;
+    border: 1px solid #e0e0e0;
+    border-radius: 2px;
+    font: normal 10px/normal Verdana, Arial, Helvetica, sans-serif
+}
+
+.task-gantt-line-hint-names {
+    display: inline-block;
+    vertical-align: top
+}
+
+.task-gantt-line-hint-values {
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 5px
+}
+
+.task-gantt-line-hint-name {
+    color: #7f7f7f;
+    display: block;
+    text-align: right
+}
+
+.task-gantt-line-hint-value {
+    color: #000;
+    display: block
+}
+
+.task-gantt-line-hint-year {
+    color: #888
+}
+
+/*Hit For Move Gantt Line*/
+
+.task-gantt-line-tip-bar {
+    position: absolute;
+    top: -100px;
+    left: -100px;
+    top: 200px;
+    left: 400px;
+    z-index: 100;
+    white-space: nowrap;
+    padding: 4px 8px 4px 7px;
+    background: #fff;
+    border: 1px solid #e0e0e0;
+    border-radius: 2px;
+    font: normal 10px/normal Verdana, Arial, Helvetica, sans-serif
+}
+
+.task-gantt-line-tip-names {
+    display: inline-block;
+    vertical-align: top
+}
+
+.task-gantt-line-tip-values {
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 5px
+}
+
+.task-gantt-line-tip-name {
+    color: #7f7f7f;
+    display: block;
+    text-align: right
+}
+
+.task-gantt-line-tip-value {
+    color: #000;
+    display: block
+}
+
+.task-gantt-line-tip-year {
+    color: #888
+}
+
+
+/*DEADLINE BAR*/
+
+.task-gantt-bar-deadline-info {
+    overflow: hidden;
+    text-align: right;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    height: 16px;
+    min-width: 50px;
+    font-size: 10px;
+    opacity: .7;
+}
+
+
+.task-gantt-bar-deadline {
+    position: absolute;
+    top: 0px;
+    left: 0;
+    width: 1px;
+    height: 16px;
+    z-index: -15;
+    background: rgba(255, 255, 255, 0.5);
+    border-top: 0px solid #e4e6e7;
+    border-bottom: 1px solid #e4e6e7;
+    box-sizing: border-box;
+    opacity: .7;
+}
+
+.task-gantt-deadline-slider {
+    position: absolute;
+    top: 0px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    background: #ff6762;
+    cursor: ew-resize;
+    z-index: -10;
+    box-shadow: 0 0 2px 1px #fff;
+    opacity: .7;
+}
+
+.task-gantt-done-slider {
+    position: absolute;
+    top: 2px;
+    top: 0px;
+    left: 0;
+    width: 3px;
+    height: 16px;
+    background: rgba(42, 175, 91, 0.3);
+    cursor: ew-resize;
+    z-index: -10;
+    box-shadow: 0 0 2px 1px #fff
+}
+
+.task-gantt-done-slider.fa-check-circle-o {
+    color: #69a133;
+    opacity: 1;
+    background: none;
+}
+
+.task-gantt-done-info {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .9;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    left: 20px;
+    top: 0px;
+    width: 1px;
+    height: 10px;
+
+}
+
+.task-gantt-done-info a {
+    white-space: nowrap;
+    font-size: 11px;
+}
+
+.task-gantt-docs {
+    position: relative;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .8;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    top: 1px;
+    width: 1px;
+    height: 10px;
+    color: black;
+    cursor: pointer;
+
+}
+
+.task-gantt-docs-slider {
+    left: 5px;
+
+}
+
+.task-gantt-docs-bar {
+    position: absolute;
+    z-index: 0;
+    right: -14px;
+    top: -1px;
+
+}
+
+.task-gantt-deadline-slider {
+    cursor: e-resize
+}
+
+.task-gantt-deadline-read-only {
+    width: 5px;
+    cursor: default
+}
+
+.task-gantt-progress {
+    position: absolute;
+    top: -3px;
+    left: 0;
+    width: 4px;
+    height: 3px;
+    background: #6276ff;
+    opacity: 0.7;
+    cursor: ew-resize;
+    z-index: -10;
+    box-shadow: 0 0 2px 1px #fff
+}
+
+.task-gantt-progress2 {
+    position: absolute;
+    top: -0.5px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    background: #6276ff;
+    opacity: 0.7;
+    cursor: ew-resize;
+    z-index: -20;
+    box-shadow: 0 0 2px 1px #fff;
+    color: #70716f;
+    user-select: none;
+}
+
+.task-gantt-milestone {
+    z-index: -50;
+    opacity: 1
+}
+
+.fa-flag {
+    color: #69a133;
+    opacity: 1;
+    background: none;
+}
+
+.fa-exclamation {
+    color: #eb5d52;
+    opacity: 1;
+    background: none;
+}
+
+.task-gantt-name {
+    /* style:"display:inline-block;width:90px;"; */
+    display: inline-block;
+    position: absolute;
+    top: 1px;
+    left: 5px;
+    font-size: 0.9em;
+    width: 4px;
+    height: 16px;
+    background: #ff6762;
+    cursor: ew-resize;
+    z-index: -20;
+    box-shadow: 0 0 2px 1px #fff;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: #70716f;
+    user-select: none;
+}
+
+.task-gantt-timeline-inner {
+    display: inline-block;
+
+}
+
+.task-gantt-timeline-arrow {
+    display: inline-block;
+
+    border: 1px solid #ff0000;
+    position: absolute;
+    position: relative;
+    display: inline-block;
+    z-index: 3;
+    width: 100%;
+    height: 100%;
+    width: 300px;
+    height: 300px;
+    padding: 17px 0 0 0;
+    vertical-align: top;
+    background: red;
+    height: 100%;
+    width: 100%;
+    margin: 0 auto;
+    position: absolute;
+    opacity: 0.2;
+    top: 16px;
+    display: inline-block;
+    z-index: 2;
+}
+
+.task-gantt-timeline-arrow-canvas {
+
+    border: 1px solid #ff0000;
+    display: inline-block;
+
+}
+
+.gantt_timeline_link .gantt_timeline_link_wrapper {
+
+    border: 1px solid #ff0000;
+    box-shadow: 0 0 1px 0px #9c5c11;
+    position: absolute;
+    cursor: pointer;
+    display: inline-block;
+    z-index: 3;
+
+}
+
+.gantt_timeline_link:hover .gantt_timeline_link_wrapper div {
+    box-shadow: 0 0 5px 1px #ffbb04 !important;
+}
+
+.gantt_timeline_link_type {
+    margin-left: 2px;
+    margin-right: 2px;
+    margin-top: 3px;
+    margin-bottom: 2px;
+    font-size: 0.7em;
+    width: 4px;
+    height: 10px;
+    position: absolute
+}
+
+.fa-exclamation {
+    padding-top: 5px;
+}
+
+.gantt_pager_info {
+    display: inline;
+}
+
+.task-gantt-bar-load {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 28px;
+    background: rgba(225, 225, 225, 0.57);
+    border: 1px solid rgb(154, 160, 167);
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: -2;
+    cursor: move;
+    border-color: rgb(154, 160, 167);
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-style: dotted;
+    border-top-style: solid;
+    border-left-style: solid;
+    border-right-style: solid;
+}
+
+.task-gantt-load-duration {
+    /*style="display:inline-block;width:90px;" */
+    display: block;
+    position: relative;
+    top: 1px;
+    left: 5px;
+    font-size: 0.9em;
+    width: 4px;
+    height: 14px;
+    background: #ff6762;
+    cursor: ew-resize;
+    z-index: -20;
+    box-shadow: 0 0 2px 1px #fff;
+    background: rgba(225, 225, 225, 0.57);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: rgba(112, 113, 111, 0.8);
+    user-select: none;
+}
+
+.task-gantt-load-duration_l {
+    /*style="display:inline-block;width:90px;" */
+    display: block;
+    position: relative;
+    top: 3px;
+    left: 5px;
+    font-size: 0.9em;
+    width: 4px;
+    height: 16px;
+    text-align: center;
+    background: rgba(223, 224, 222, 0.93);
+    cursor: ew-resize;
+    z-index: -20;
+    box-shadow: 0 0 2px 1px #fff;
+    background: rgba(225, 225, 225, 0.57);
+    border: 1px solid rgb(154, 160, 167);
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: -2;
+    cursor: move;
+    border-color: rgb(154, 160, 167);
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-style: dotted;
+    border-top-style: solid;
+    border-left-style: solid;
+    border-right-style: solid;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: rgba(112, 113, 111, 0.8);
+    user-select: none;
+}
+
+.task-gantt-load-duration-m {
+    /*style="display:inline-block;width:90px;" */
+    display: block;
+    position: relative;
+    top: 1px;
+    left: 5px;
+    font-size: 0.8em;
+    width: 4px;
+    height: 14px;
+    background: #ff6762;
+    cursor: ew-resize;
+    z-index: -20;
+    box-shadow: 0 0 2px 1px #fff;
+    background: rgba(20, 150, 255, 0.57);
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: rgba(186, 187, 185, 0.69);
+    user-select: none;
+}
+
+.task-gantt-bar-load-task {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    background: rgba(7, 52, 182, 0.57);
+    border: 1px solid rgb(154, 160, 167);
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: -2;
+    cursor: move;
+    border-color: rgb(154, 160, 167);
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-style: dotted;
+    border-top-style: solid;
+    border-left-style: solid;
+    border-right-style: solid;
+}
+
+
+.el-noselect {
+    -webkit-touch-callout: none;
+    /*  iOS Safari */
+    -webkit-user-select: none;
+    /*  Safari */
+    -khtml-user-select: none;
+    /*  Konqueror HTML */
+    -moz-user-select: none;
+    /*  Firefox */
+    -ms-user-select: none;
+    /*  Internet Explorer/Edge */
+    user-select: none;
+    /* Non-prefixed version, currently*/
+    /* supported by Chrome and Opera */
+}
+
+.task-gantt-bar-intersection {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 4px;
+    height: 14px;
+    background: rgba(242, 197, 116, 0.6);
+    border-radius: 2px;
+    z-index: 3;
+    cursor: move
+}
+
+.task-gantt-bar-intersection-hover {
+    background: rgba(108, 115, 210, 0.6) !important;
+
+}
+
+.task-gantt-bar-intersection:hover {
+    background: rgba(76, 92, 246, 0.6) !important;
+}
+
+.ui-resizable-e {
+    cursor: e-resize;
+    width: 5px;
+    right: 0px;
+    top: 0;
+    height: 100%;
+    background: rgba(219, 219, 219, 0.25);
+}
+
+.task-gantt-task-gantt-layout {
+    overflow: hidden;
+    border-bottom: 1px solid #dddee1;
+    background: #fff;
+    height: 20%;
+    overflow-y: scroll;
+}
+
+.timeline-gantt-layout {
+    overflow-y: scroll;
+    border-top: 2px solid rgba(255, 255, 255, 0);
+    background: #edeef0;
+    float: left;
+    height: 52px;
+    position: relative;
+    padding: 0 0 50px 0;
+    width: 100%;
+    height: 15%;
+    padding-top: 2px;
+}
+
+.timeline-gantt-header-layout {
+    overflow: hidden;
+    border-top: 2px solid rgba(255, 255, 255, 0);
+    background: #ff2a23;
+    float: left;
+    height: 40px;
+    position: relative;
+    padding: 0 0 50px 0;
+    width: 100%;
+    height: 100%;
+    padding-top: 2px;
+}
+
+
+.timeline-gantt-items-layout {
+    float: left;
+    width: 400px;
+    overflow: hidden;
+    position: relative;
+    padding: 0 0 52px 0;
+    background: #edeef0;
+}
+
+.timeline-gantt-options-layout {
+    position: absolute;
+    top: 0;
+    left: 5px;
+    width: 3px;
+    cursor: ew-resize;
+    height: 100%;
+    background: #dddee1;
+    display: inline-block;
+
+}
+
+.timeline-gantt-scroll-layout {
+    overflow: hidden;
+    border-top: 2px solid rgba(255, 255, 255, 0);
+    background: rgba(54, 4, 54, 0.09);
+    float: left;
+    height: 40px;
+    position: relative;
+    padding: 0 0 30px 0;
+    width: 100%;
+    height: 3px;
+    cursor: s-resize;
+    padding-top: 2px;
+}
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/css/gantt_native.css b/odex25_project/web_gantt_native/static/src/css/gantt_native.css
new file mode 100644
index 000000000..28b989b7a
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/css/gantt_native.css
@@ -0,0 +1,2377 @@
+.gantt-container {
+
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    height: 100%;
+    min-height: 200px;
+
+}
+
+/*.o_native_gantt_view{*/
+
+/*position: relative;*/
+/*top: 0;*/
+/*left: 0;*/
+/*bottom: 0;*/
+/*right: 0;*/
+/*height: 100%;*/
+
+/*}*/
+
+
+
+
+.task-gantt {
+    /*overflow:hidden;*/
+    border-bottom: 1px solid #dddee1;
+    background: #fff;
+
+
+    /*height: 65%;  timeline */
+    height: 100%;
+    overflow-y: scroll;
+
+}
+
+
+.timeline-gantt {
+    overflow-y: scroll;
+    /*border-top:2px solid rgba(255, 255, 255, 0);*/
+    background: #edeef0;
+
+    /*!*float:left;*!*/
+    /*height:52px;*/
+    position: relative;
+    /*!*padding:0 0 50px 0*!*/
+    width: 100%;
+    /*height: 15%;*/
+    /*padding-top: 2px;*/
+}
+
+.timeline-gantt-header {
+    overflow: hidden;
+    /*border-top:2px solid rgba(255, 255, 255, 0);*/
+    /*background: #ff2a23;*/
+    /**/
+    /*float:left;*/
+    /*height:40px;*/
+    position: relative;
+    /*padding:0 0 50px 0*/
+    width: 100%;
+    height: 100%;
+
+    /*padding-top: 2px;*/
+}
+
+.timeline-gantt-scroll {
+    overflow: hidden;
+    /*border-top:2px solid rgba(255, 255, 255, 0);*/
+    background: rgba(54, 4, 54, 0.09);
+    /**/
+    /*float:left;*/
+    /*height:40px;*/
+    position: relative;
+    /*padding:0 0 30px 0;*/
+    /*width: 100%;*/
+    height: 100%;
+
+    /*padding-top: 2px;*/
+}
+
+
+.timeline-gantt-scroll-slider {
+    overflow: hidden;
+    /*border-top:2px solid rgba(255, 255, 255, 0);*/
+    background: rgba(221, 217, 223, 0.45);
+    border-color: #3bcaf2;
+    border-top-width: 2px;
+    border-bottom-width: 2px;
+    border-left-width: 2px;
+    border-right-width: 2px;
+    border-style: solid;
+    /**/
+    /*float:left;*/
+    height: 25px;
+    /*position:sticky !important;*/
+    /*padding:0 0 30px 0;*/
+    width: 50px;
+    /*height: 100%;*/
+    cursor: move;
+
+    /*padding-top: 2px;*/
+}
+
+
+.timeline-gantt-scroll-scale-end,
+.timeline-gantt-scroll-scale-end:after {
+    /* content: ""; */
+    content: "\f096";
+    position: absolute;
+    background: rgba(115, 193, 143, 0.96);
+    width: 150px;
+    height: 100%;
+    /*border-color:transparent transparent #3bcaf2;*/
+    /*border-top-width:38px;*/
+    /*border-bottom-width:38px;*/
+    /*border-left-width:13px;*/
+    /*border-right-width:3px;*/
+    /*border-style:solid;*/
+    /*top:-27px;*/
+    right: 0;
+}
+
+.timeline-gantt-scroll-scale-start,
+.timeline-gantt-scroll-scale-start:before {
+    /* content: ""; */
+    content: "\f096";
+    position: absolute;
+    background: rgba(115, 193, 143, 0.96);
+    width: 150px;
+    height: 100%;
+    /*border-color:transparent transparent #3bcaf2;*/
+    /*border-top-width:38px;*/
+    /*border-bottom-width:38px;*/
+    /*border-left-width:13px;*/
+    /*border-right-width:3px;*/
+    /*border-style:solid;*/
+    /*top:-27px;*/
+    left: 0;
+}
+
+.timeline-gantt-scroll-scale-start-date {
+
+    position: relative;
+    text-align: left;
+    color: #ffffff;
+    font-size: 13px !important;
+    margin-top: 3px;
+    margin-left: 6px;
+
+}
+
+.timeline-gantt-scroll-scale-end-date {
+
+    position: relative;
+    text-align: right;
+    color: #ffffff;
+    font-size: 13px !important;
+    margin-top: 3px;
+    margin-right: 6px;
+
+
+}
+
+
+
+.timeline-gantt-options {
+    position: absolute;
+    top: 0;
+    /*left:5px;*/
+    /*width:3px;*/
+    /*cursor:ew-resize;*/
+    height: 100%;
+    /*background:#dddee1;*/
+    display: inline-block;
+
+}
+
+.gantt-list-options {
+    position: absolute;
+    bottom: 0;
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+
+}
+
+.gantt-list-options-item {
+    width: max-content;
+    font-size: 12px;
+    color: #7c7a6b;
+    margin-top: auto;
+    margin-left: 5px;
+}
+
+/*.task-gantt-item-sort-name {*/
+/*    width: max-content;*/
+/*    display: inline-block;*/
+/*    !*font-weight:bold;*!*/
+/*    font-size: 12px;*/
+/*    color:#7c7a6b;*/
+/*}*/
+
+.task-gantt-item-sort-manual {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+    width: max-content;
+    font-size: 12px;
+}
+
+
+.gantt-list-options-item-sort {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+}
+
+
+.gantt-list-options-item-check {
+    cursor: pointer;
+    /*color: #2e7e59;*/
+    margin-left: 3px;
+
+}
+
+
+.gantt-list-options-item-check-inactive {
+    color: rgba(171, 168, 170, 0.59);
+}
+
+.gantt-list-options-item-check-basic {
+    color: #2e7e59;
+    ;
+}
+
+.gantt-list-options-item-check-active {
+    color: #ce674d;
+    ;
+}
+
+
+
+.gantt-list-options-export-to-file {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+}
+
+
+.gantt-list-options-industry-show {
+    cursor: pointer;
+    color: #2e7e59;
+    margin-left: 3px;
+}
+
+
+.gantt-list-options-industry-hide {
+    cursor: pointer;
+    /*color: #2e7e59;*/
+    margin-left: 3px;
+}
+
+.gantt-list-options-week-week {
+    cursor: pointer;
+    color: #e28676;
+    margin-left: 3px;
+}
+
+
+.gantt-list-options-week-isoweek {
+    cursor: pointer;
+    /*color: #2e7e59;*/
+    margin-left: 3px;
+}
+
+
+
+
+
+.timeline-gantt-gutter {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 3px;
+    /*cursor:ew-resize;*/
+    height: 100%;
+    background: #dddee1;
+    display: inline-block;
+}
+
+.timeline-gantt-items {
+    float: left;
+    /*width:400px;*/
+    overflow: hidden;
+    position: relative;
+    padding: 0 0 52px 0;
+
+    background: #edeef0;
+
+}
+
+.timeline-gantt-head {
+    /*overflow-x:scroll;*/
+    overflow-x: hidden;
+    overflow-y: hidden;
+    /*height:100%;*/
+    position: relative;
+
+    background: #edeef0;
+    /*padding:0 0 40px 0;*/
+
+}
+
+
+/*.o_control_panel {*/
+/*!*padding-top: 10px;*!*/
+/*!*padding-right: 16px;*!*/
+/*padding-bottom: 0px;*/
+/*!*padding-left: 16px;*!*/
+/*!*background-color: #f0eeee;*!*/
+/*!*border-bottom: 1px solid #a8a8a8;*!*/
+/*}*/
+
+
+.item-action {
+    height: 30px;
+    display: flex;
+
+}
+
+.item-info {
+    height: 30px;
+}
+
+.item-info-hover {
+
+    background-color: #dfebf6 !important;
+    opacity: 0.6 !important;
+}
+
+
+/*.task-gantt-item-info {*/
+/*    overflow: hidden;*/
+/*    text-align: right;*/
+/*    white-space:nowrap;*/
+/*    text-overflow:ellipsis;*/
+/*    height: 22px;*/
+/*    min-width: 50px;*/
+/*}*/
+
+
+.task-gantt-items {
+
+    margin: 17px 0 0 0;
+    float: left;
+    /*min-width: 60%;*/
+    width: 100%;
+}
+
+.item-infos {
+
+    margin: 0px 4px 0 0;
+    float: right;
+    /*min-width: 25%;*/
+    display: flex;
+}
+
+.item-list {
+    margin: 0px 8px 0 0;
+
+}
+
+.item-info {
+    margin: 0px 8px 0 0;
+
+}
+
+.task-gantt-info {
+    /*position: absolute;*/
+    margin: 17px 4px 0 0;
+    float: right;
+    /*min-width: 25%;*/
+    display: flex;
+}
+
+.item-info * {
+    pointer-events: none;
+}
+
+
+.task-gantt-action {
+    /*position: absolute;*/
+    margin: 17px 0 0 2px;
+    float: left;
+
+    /*border-top:1px solid #f00c24;*/
+
+    /*top: 0;*/
+    /*!*right: 0;*!*/
+    /*width: 3px;*/
+    /*!*cursor: ew-resize;*!*/
+    /*height: 100%;*/
+    /*!*background: #dddee1*!*/
+}
+
+.task-gantt-sorting {
+    float: left;
+    width: 20px;
+    overflow: hidden;
+    position: relative;
+    margin-top: -52px;
+}
+
+.task-sorting-items {
+    margin: 68px 0 0 0
+}
+
+.task-gantt-sorting-item {
+    height: 30px;
+    position: relative;
+    padding: 0 0 0 5px;
+    border-top: 1px solid #edeef0;
+    white-space: nowrap;
+    font: normal normal 13px/23px "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+    cursor: n-resize;
+
+}
+
+.task-gantt-sorting-item-hover {
+    background-color: #dfebf6;
+    opacity: 0.6;
+}
+
+
+.task-gantt-list {
+    float: left;
+    /*width:400px;*/
+    overflow: hidden;
+    position: relative;
+    padding: 0 0 50px 0;
+    min-height: 400px;
+    display: flex;
+    flex-direction: row;
+    justify-content: left;
+    align-content: center;
+}
+
+.task-gantt-timeline {
+    /*overflow-x:scroll;*/
+    overflow-x: hidden;
+    overflow-y: hidden;
+    /*height:100%;*/
+    position: relative;
+    min-height: 400px;
+
+}
+
+.task-gantt-gutter {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 3px;
+    cursor: ew-resize;
+    height: 100%;
+    background: #dddee1
+}
+
+.task-gantt-gutter-hover {
+    background-color: rgba(97, 162, 212, 0.5);
+
+}
+
+.task-gantt-items-gutter {
+    /*position:absolute;*/
+    /*top:0;*/
+    /*right:0;*/
+    /*width:3px;*/
+    /*cursor:ew-resize;*/
+    /*height:100%;*/
+    /*background:#dddee1*/
+
+    min-width: 3px;
+    cursor: ew-resize;
+    /* height: 100%; */
+    background: #dddee12e;
+    display: flex;
+
+}
+
+.task-gantt-items-gutter-hover {
+    background-color: rgba(97, 162, 212, 0.5);
+
+}
+
+
+.task-gantt-list-controls {
+    height: 27px;
+    border-top: 1px solid #edeef0
+}
+
+.task-gantt-caret-right {
+    position: relative;
+    left: -2px;
+    right: 2px;
+    top: 1px;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+}
+
+
+
+.task-gantt-refresh {
+    /*position:absolute;*/
+    margin-left: 2px;
+    left: 18px;
+    right: 2px !important;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-refresh .fa-refresh:hover {
+    color: #f72f3e;
+}
+
+
+
+.task-gantt-add {
+    /*position:absolute;*/
+    margin-left: 2px;
+    left: 18px;
+    right: 2px !important;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-add .fa-plus:hover {
+    color: #f72f3e;
+}
+
+
+
+
+/*.task-gantt-critical*/
+/*{*/
+/*!*position:absolute;*!*/
+/*margin-left: 2px;*/
+/*left: 18px;*/
+/*right: 2px; !important*/
+/*top: 0;*/
+/*width: 10px;*/
+/*height: 23px;*/
+/*cursor:pointer;*/
+/*color: rgba(67, 92, 67, 0.41);*/
+/*!*color: rgb(141, 194, 141);*!*/
+/*}*/
+
+/*.task-gantt-critical .fa-line-chart:hover {*/
+/*color: #f72f3e;*/
+/*}*/
+
+
+.task-gantt-wizard {
+    position: absolute;
+    margin-left: 2px;
+    left: 32px;
+    right: 2px important;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-wizard .fa-arrow-right:hover {
+    color: #f72f3e;
+}
+
+
+.task-gantt-plus {
+    position: absolute;
+    left: 3px;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: rgb(141, 194, 141);
+}
+
+.task-gantt-plus .fa-plus:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-task-plus {
+    position: absolute;
+    left: 18px;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-task-plus .fa-plus-circle:hover {
+    color: rgb(141, 194, 141);
+}
+
+
+
+
+/*ACTIONS*/
+
+
+.action-focus {
+    margin-left: 1px;
+    margin-top: 4px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.action-focus .fa-dot-circle-o:hover {
+    color: #f72f3e;
+}
+
+.action-focus .fa-crosshairs:hover {
+    color: #f72f3e;
+}
+
+
+.action-plan {
+    margin-left: 3px;
+    top: 0;
+}
+
+
+.action-plus {
+    margin-left: 3px;
+    margin-top: 4px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.action-plus .fa-plus-circle:hover {
+    color: rgb(141, 194, 141);
+}
+
+
+
+.task-gantt-left {
+    position: absolute;
+    left: 16px;
+    top: 0;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-left .fa-arrow-circle-o-left:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-right {
+    position: absolute;
+    left: 29px;
+    top: 0;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-right .fa-arrow-circle-o-right:hover {
+    color: #f72f3e;
+}
+
+
+.task-gantt-up {
+    position: absolute;
+    left: 42px;
+    top: 0;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-up .fa-arrow-circle-o-up:hover {
+    color: #f72f3e;
+}
+
+.task-gantt-down {
+    position: absolute;
+    left: 55px;
+    top: 0;
+    top: 0;
+    width: 10px;
+    height: 23px;
+    cursor: pointer;
+    color: #e9eae9;
+}
+
+.task-gantt-down .fa-arrow-circle-o-down:hover {
+    color: #f72f3e;
+}
+
+
+
+
+/*.task-gantt-today*/
+/*{*/
+/*position:absolute;*/
+/*!*width:20px;*!*/
+/*!*height:20px;*!*/
+/*right:8px;*/
+/*top:3px;*/
+/*cursor:pointer;*/
+/*padding: 1px 2px;*/
+/*}*/
+
+.task-gantt-today .fa-dot-circle-o:hover {
+    color: #f72f3e;
+}
+
+
+/*.task-gantt-zoom*/
+/*{*/
+/*position:absolute;*/
+/*!*width:20px;*!*/
+/*!*height:20px;*!*/
+/*!*right:-8px;*!*/
+/*left:8px;*/
+/*top:3px;*/
+/*cursor:pointer;*/
+/*padding: 1px 2px;*/
+/*}*/
+
+.task-gantt-zoom:hover {
+    color: #f7d6c4;
+}
+
+
+/*.task-gantt-zoom-out*/
+/*{*/
+/*position:absolute;*/
+/*!*width:20px;*!*/
+/*!*height:20px;*!*/
+/*right:-5px;*/
+/*top:3px;*/
+/*cursor:pointer;*/
+/*padding: 1px 2px;*/
+/*}*/
+
+/*.task-gantt-zoom-out .fa-minus-square-o:hover {*/
+/*color: #f72f3e;*/
+/*}*/
+
+
+
+.task-gantt-list-title {
+
+    height: 26px;
+    background: #eef2f4;
+    color: #000;
+    font: normal normal normal 14px/26px Arial, Helvetica, sans-serif;
+    padding: 0 0 0 7px
+}
+
+
+
+
+/*.task-gantt-items-info{*/
+/*margin:16px 0 0 0*/
+/*}*/
+
+
+.task-gantt-items-group {
+    font-weight: bold;
+}
+
+.task-gantt-items-subtask {
+    font-weight: bold;
+    /*color: #787875 !important;*/
+}
+
+
+.task-gantt-items-critical-path {
+    /*border-color:red;*/
+    /*border-width:1px;*/
+    /*border-style:dashed;*/
+    box-shadow: 0 0 3px 3px #f30b0b6e
+}
+
+.task-gantt-items-p-loop {
+    /*border-color:red;*/
+    /*border-width:1px;*/
+    /*border-style:dashed;*/
+    box-shadow: 0 0 3px 3px rgba(243, 142, 0, 0.67)
+}
+
+
+/*.task-gantt-item*/
+/*{*/
+/*    height:30px;*/
+/*    position:relative;*/
+/*    padding:0 5px 0 14px;*/
+/*    border-top:1px solid #edeef0;*/
+/*    !*white-space:nowrap;*!*/
+/*    font:normal normal 13px/23px "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;*/
+/*     cursor: move;*/
+
+/*    display: flex;*/
+/*    flex-direction: row;*/
+/*    justify-content: left;*/
+/*    align-content: center;*/
+/*}*/
+
+
+.task-gantt-item .ui-state-highlight {
+    height: 2.0em;
+    line-height: 1.5em;
+}
+
+/*.task-sorting-items  .ui-state-highlight { height: 5px;  }*/
+
+
+.task-sorting-items .ui-state-highlight {
+    height: 20px;
+    width: 18px;
+    line-height: 1px;
+    margin-top: -22px;
+    margin-left: -3px;
+
+}
+
+.task-sorting-items .fa-tasks {
+
+    cursor: pointer;
+    color: #aeafae;
+}
+
+.task-gantt-item .task-gantt-item-name {
+    display: inline-block;
+    color: #4c4c4c;
+    text-decoration: none;
+    vertical-align: middle;
+    cursor: pointer;
+    flex-grow: 1;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    height: 22px;
+    min-width: 50px;
+}
+
+.task-gantt-item-info {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 100%;
+    min-width: 50px;
+    text-align: right;
+    /*display: inline-block;*/
+    font-size: 9pt;
+}
+
+
+
+
+.task-gantt-item .task-gantt-item-name:hover {
+    text-decoration: none;
+    color: #000
+}
+
+.task-gantt-item-hidden {
+    display: none
+}
+
+
+.task-gantt-item-hover {
+    /*background-color: #dfebf6;*/
+    /*opacity:0.6;*/
+
+    background-color: #dfebf6 !important;
+    color: white;
+    opacity: 0.6 !important;
+}
+
+
+
+.task-gantt-scale-primary {
+    height: 26px;
+    white-space: nowrap;
+    background: #F8F6F7;
+
+}
+
+.timeline-gantt-scale-primary {
+    height: 26px;
+    white-space: nowrap;
+    /*background:#F8F6F7;*/
+    /*display: inline-block;*/
+}
+
+.task-gantt-scale-month {
+    display: inline-block;
+    height: 26px;
+    font: normal normal normal 16px/24px Arial, Helvetica, sans-serif;
+    color: #000;
+    vertical-align: top
+}
+
+.task-gantt-scale-month-text {
+    display: inline-block;
+    margin: 0 0 0 13px
+}
+
+.task-gantt-scale-month-sep {
+    display: inline-block;
+    width: 1px;
+    height: 26px;
+    background: #d6d4c7;
+    vertical-align: top
+}
+
+
+
+.task-gantt-scale-secondary {
+    height: 0px;
+    /*border-top:1px solid #ceebf5;*/
+    /*background:#EFEFEF;*/
+    white-space: nowrap
+}
+
+
+.timeline-gantt-scale-secondary {
+    height: 26px;
+    border-top: 1px solid #ceebf5;
+    background: #EFEFEF;
+    white-space: nowrap;
+    display: inline-block;
+}
+
+
+.task-gantt-scale-day {
+    display: inline-block;
+    width: 23px;
+    height: 26px;
+    vertical-align: top;
+    font: normal normal normal 10px/24px Arial, Helvetica, sans-serif;
+    color: #7c7a6b;
+    text-align: center
+}
+
+.task-gantt-scale-day-current {
+    font-size: 12px;
+    color: #000;
+    font-weight: bold
+}
+
+.task-gantt-scale-day-sep {
+    display: inline-block;
+    width: 1px;
+    height: 26px;
+    background: #e1dec2;
+    vertical-align: top
+}
+
+.task-gantt-scale-day-weekend {
+    color: #e67a6b
+}
+
+.task-gantt-current-day {
+    position: absolute;
+    width: 1px;
+    height: 100%;
+    left: -100px;
+    top: 22px;
+    border: 1px solid #daceaa;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    background: rgba(255, 229, 158, 0.4);
+    z-index: 1
+}
+
+.task-gantt-bottom-column {
+    display: inline-block;
+    box-sizing: border-box;
+    border-right: 1px solid #c9e5f0;
+    height: 26px;
+    vertical-align: top;
+    font: normal normal normal 10px/24px Arial, Helvetica, sans-serif;
+    color: #535c69;
+    text-align: center;
+    position: relative
+}
+
+.task-gantt-bottom-column:after {
+    /* content: ""; */
+    content: "\f096";
+    position: absolute;
+    top: 26px;
+    right: -1px;
+    width: 1px;
+    height: 32000px;
+    background: #ebebeb
+}
+
+.task-gantt-weekend-column:before,
+.task-gantt-holiday-column:before,
+.task-gantt-today-column:before {
+    /* content: ""; */
+    content: "\f096";
+    position: absolute;
+    top: 26px;
+    left: 0;
+    width: 100%;
+    height: 32000px
+}
+
+.task-gantt-weekend-column:before {
+    background: #f9fafb
+}
+
+.task-gantt-holiday-column:before {
+    background: #fee
+}
+
+.task-gantt-weekend-column {
+    background: #cce9f4
+}
+
+.task-gantt-holiday-column {
+    background: #efeff3
+}
+
+.task-gantt-today-column:before {
+    background: #fffded
+}
+
+.task-gantt-today-column {
+    background: #f77c91
+}
+
+.task-gantt-top-column {
+    display: inline-block;
+    box-sizing: border-box;
+    border-right: 1px solid #dae8ee;
+    height: 26px;
+    font: normal normal normal 13px/28px Arial, Helvetica, sans-serif;
+    color: #535c69;
+    background: #F8F6F7;
+    vertical-align: top;
+    text-align: center;
+    overflow: hidden
+}
+
+.task-gantt-timeline-data {
+    padding: 17px 0 0 0;
+    z-index: 2;
+    position: relative
+}
+
+.task-gantt-timeline-row {
+    height: 30px;
+    position: relative
+}
+
+.task-gantt-timeline-row-hover {
+    background-color: #dfebf6;
+    opacity: 0.6;
+}
+
+.task-gantt-bar-plan {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    /*background: rgba(242, 197, 116, 0.6);*/
+    border-radius: 2px;
+    z-index: 3;
+    cursor: move
+}
+
+.task-gantt-bar-plan-auto {
+
+    /*background: rgba(111, 197, 242, 0.6);*/
+
+}
+
+.task-gantt-bar-plan-constrain {
+
+    /*background: rgba(242, 133, 113, 0.6);*/
+
+}
+
+
+.task-gantt-bar-ghosts {
+    position: absolute;
+    top: 12px;
+    left: 0;
+    width: 4px;
+    height: 8px;
+    background: rgba(242, 20, 19, 0);
+    border-color: rgba(61, 144, 242, 0.9);
+    border-bottom-width: 1px;
+    /*border-radius:2px;*/
+    border-bottom-style: dotted;
+    /*z-index:-3;*/
+    /*cursor:move*/
+}
+
+.task-gantt-bar-ghost {
+    position: absolute;
+    top: 12px;
+    left: 0;
+    width: 8px;
+    height: 7px;
+    background: rgba(61, 144, 242, 0.9);
+    /*border:1px solid rgb(154, 160, 167);*/
+    border-radius: 2px;
+    /*border-bottom-style: dotted ;*/
+    /*z-index:-2;*/
+    /*cursor:move;*/
+
+    border-color: rgb(154, 160, 167);
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-style: dotted;
+    border-top-style: solid;
+    border-left-style: solid;
+    border-right-style: solid;
+}
+
+.task-gantt-bar-plan:hover {
+
+    background: rgba(98, 196, 51, 0.38) !important;
+
+
+}
+
+
+
+.task-gantt-bar-plan:hover .task-gantt-name {
+
+    display: none;
+
+}
+
+.task-gantt-bar-plan:hover .task-gantt-progress2 {
+
+    display: none;
+
+}
+
+
+.task-gantt-bar-plan-droppable,
+.task-gantt-bar-plan-draggable {
+    box-shadow: 0 0 5px 0 #3bcaf2
+}
+
+.task-gantt-item-status-completed .task-gantt-bar-plan-droppable,
+.task-gantt-item-status-completed .task-gantt-bar-plan-draggable {
+    box-shadow: 0 0 5px 0 #bec4c9
+}
+
+
+.task-gantt-bar-plan-info-start {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-end;
+    justify-content: flex-end;
+    left: -20px;
+    top: 3px;
+    width: 1px;
+    height: 10px;
+
+}
+
+.task-gantt-bar-plan-info-start a {
+    white-space: nowrap;
+    font-size: 10px;
+}
+
+
+.task-gantt-bar-plan-info-end {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    right: -25px;
+    top: -2px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-end a {
+    white-space: nowrap;
+    font-size: 10px;
+}
+
+
+.task-gantt-bar-plan-info-left-up {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-end;
+    justify-content: flex-end;
+    left: -18px;
+    top: -8px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-left-up a {
+    white-space: nowrap;
+    font-size: 10px;
+    color: #4bcb00;
+}
+
+
+.task-gantt-bar-plan-info-left-down {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-end;
+    justify-content: flex-end;
+    left: -18px;
+    top: 12px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-left-down a {
+    white-space: nowrap;
+    font-size: 10px;
+    color: #fa0002;
+}
+
+
+
+.task-gantt-bar-plan-info-right-up {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    right: -23px;
+    top: -12px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-right-up a {
+    white-space: nowrap;
+    font-size: 10px;
+    color: #4bcb00;
+}
+
+.task-gantt-bar-plan-info-right-down {
+    position: absolute;
+    z-index: 0;
+    background: rgba(52, 75, 104, 0);
+    opacity: .6;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    right: -23px;
+    top: 8px;
+    width: 1px;
+    height: 10px;
+}
+
+.task-gantt-bar-plan-info-right-down a {
+    white-space: nowrap;
+    font-size: 10px;
+    color: #fa0002;
+}
+
+
+/*.task-gantt-bar-plan-start-info*/
+/*{*/
+/*position:absolute;*/
+/*left:0;*/
+/*top: -10px;*/
+/*!*width:1px;*!*/
+/*height:16px;*/
+/*z-index:0;*/
+/*background: rgba(52, 75, 104, 0);*/
+/*opacity:.6;*/
+/*white-space:nowrap;*/
+/*}*/
+
+
+/*.task-gantt-bar-plan-end-info*/
+/*{*/
+/*position:absolute;*/
+/*right:-25px;*/
+/*top: -10px;*/
+/*!*width:1px;*!*/
+/*height:16px;*/
+/*z-index:0;*/
+/*background: rgba(52, 75, 104, 0);*/
+/*opacity:.6;*/
+/*white-space:nowrap;*/
+/*}*/
+
+
+
+
+.task-gantt-bar-plan-start {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 1px;
+    height: 16px;
+    cursor: w-resize;
+    z-index: 0;
+    background: rgba(153, 224, 246, 0.0);
+    opacity: .4;
+}
+
+.task-gantt-bar-plan-start:hover {
+
+    background: rgb(76, 92, 246);
+    width: 5px;
+}
+
+.task-gantt-ie7 .task-gantt-bar-plan-start,
+.task-gantt-ie8 .task-gantt-bar-plan-start {
+    cursor: e-resize
+}
+
+.task-gantt-bar-plan-end {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 1px;
+    height: 16px;
+    cursor: e-resize;
+    z-index: 0;
+    background: rgba(153, 224, 246, 0.0);
+    opacity: .4;
+}
+
+.task-gantt-bar-plan-end:hover {
+
+    background: rgb(76, 92, 246);
+    width: 5px;
+}
+
+.task-gantt-bar-plan-end-zero {
+
+    background: rgba(92, 186, 242, 0.48);
+    border-color: rgb(13, 23, 23);
+    border-right-width: 1px;
+    border-right-style: solid;
+}
+
+.task-gantt-bar-plan-start-zero {
+
+    background: rgba(92, 186, 242, 0.48);
+    border-color: rgb(13, 23, 23);
+    border-left-width: 1px;
+
+    border-left-style: solid;
+
+}
+
+
+.task-gantt-ie7 .task-gantt-bar-plan-end,
+.task-gantt-ie8 .task-gantt-bar-plan-end {
+    cursor: e-resize
+}
+
+.task-gantt-bar-plan-endless .task-gantt-bar-plan-end {
+    right: -4px;
+    width: 4px;
+    overflow: hidden
+}
+
+.task-gantt-bar-plan-endless .task-gantt-bar-plan-end:before {
+    /* content: ""; */
+    content: "\f096";
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-color: transparent transparent #3bcaf2;
+    border-top-width: 38px;
+    border-bottom-width: 38px;
+    border-left-width: 13px;
+    border-right-width: 3px;
+    border-style: solid;
+    top: -27px;
+    left: -9px
+}
+
+.task-gantt-bar-plan-read-only .task-gantt-bar-plan-start,
+.task-gantt-bar-plan-read-only .task-gantt-bar-plan-end,
+.task-gantt-bar-plan-read-only .task-gantt-point {
+    display: none
+}
+
+.task-gantt-bar-plan-read-only .task-gantt-bar-plan-end,
+.task-gantt-bar-plan-read-only .task-gantt-bar-plan {
+    cursor: default
+}
+
+.task-gantt-bar-first {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    /*background: rgba(242, 20, 19, 0);*/
+    border-color: rgba(61, 144, 242, 0.9);
+    border-bottom-width: 1px;
+    border-radius: 2px;
+    border-bottom-style: dotted;
+    z-index: -3;
+    /*cursor:move*/
+}
+
+.task-gantt-first {
+    /*-ms-filter:"alpha(opacity=0)";*/
+    /*opacity:0;*/
+    /*width:20px;*/
+    /*height:30px;*/
+    position: absolute;
+    /*z-index:1000;*/
+    /*overflow:hidden;*/
+    /*cursor:pointer;*/
+    /*top:-3px;*/
+
+    width: 0;
+    height: 0;
+    border-style: solid;
+
+    border-color: #285e6a transparent transparent transparent;
+}
+
+
+
+.task-gantt-first-start {
+    /*border-width: 10px 10px 0 0px;*/
+    /*border-color: rgba(61, 144, 242, 0.9);*/
+    /*border-bottom-width:1px;*/
+    /*border-radius:2px;*/
+    /*border-bottom-style: dotted ;*/
+    /*z-index:10;*/
+
+    position: absolute;
+    z-index: -1;
+    top: 0;
+    bottom: 0;
+    border-left: 2px dotted rgba(61, 144, 242, 0.6);
+
+
+
+    left: 0px;
+}
+
+.task-gantt-first-end {
+    /*border-width: 10px 0px 0 10px;*/
+
+    position: absolute;
+    z-index: -1;
+    top: 0;
+    bottom: 0;
+    border-right: 2px dotted rgba(61, 144, 242, 0.6);
+
+
+    right: 0px
+}
+
+
+/*.task-gantt-first:before*/
+/*{*/
+/*!*content:"";*!*/
+/*position:absolute;*/
+/*!*height:10px;*!*/
+/*!*width:10px;*!*/
+/*!*background:#fff;*!*/
+/*!*border:1px solid rgb(154, 160, 167);*!*/
+/*!*border-radius:9px;*!*/
+/*!*margin-top:-5px;*!*/
+/*!*top:50%*!*/
+/*width: 0;*/
+/*height: 0;*/
+/*border-style: solid;*/
+/*border-width: 6px 3px 0 3px;*/
+/*border-color: #285e6a transparent transparent transparent;*/
+/*}*/
+
+/*.task-gantt-first:before*/
+/*{*/
+/*left:5px*/
+/*}*/
+
+/*.task-gantt-first:before*/
+/*{*/
+/*left:2px*/
+/*}*/
+
+
+
+
+.task-gantt-bar-summary {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    /*background: rgba(242, 20, 19, 0);*/
+    /*border-color: rgba(61, 144, 242, 0.9);*/
+    /*border-bottom-width:1px;*/
+    /*border-radius:2px;*/
+    /*border-bottom-style: dotted ;*/
+    z-index: -3;
+    /*cursor:move*/
+}
+
+
+
+.task-gantt-summary {
+    /*-ms-filter:"alpha(opacity=0)";*/
+    /*opacity:0;*/
+    /*width:20px;*/
+    /*height:30px;*/
+    position: absolute;
+    /*z-index:1000;*/
+    /*overflow:hidden;*/
+    /*cursor:pointer;*/
+    /*top:-3px;*/
+
+    width: 0;
+    height: 0;
+    border-style: solid;
+
+    border-color: #285e6a transparent transparent transparent;
+
+}
+
+.task-gantt-summary-start {
+    border-width: 10px 10px 0 0px;
+    left: 0px
+}
+
+.task-gantt-summary-end {
+    border-width: 10px 0px 0 10px;
+    right: 0px
+}
+
+
+.task-gantt-summary:before {
+    /*content:"";*/
+    position: absolute;
+    /*height:10px;*/
+    /*width:10px;*/
+    /*background:#fff;*/
+    /*border:1px solid rgb(154, 160, 167);*/
+    /*border-radius:9px;*/
+    /*margin-top:-5px;*/
+    /*top:50%*/
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-width: 6px 3px 0 3px;
+    border-color: #285e6a transparent transparent transparent;
+}
+
+.task-gantt-summary-start:before {
+    left: 5px
+}
+
+.task-gantt-summary-end:before {
+    left: 2px
+}
+
+.task-gantt-summary:hover:before {
+    background: #c7cacf
+}
+
+.task-gantt-pointer-start .task-gantt-summary-start:before,
+.task-gantt-pointer-end .task-gantt-summary-end:before {
+    background: #808892
+}
+
+.task-gantt-bar-plan:hover .task-gantt-summary,
+.task-gantt-bar-plan-droppable .task-gantt-summary,
+.task-gantt-bar-plan-draggable .task-gantt-summary {
+    -ms-filter: "alpha(opacity=100)";
+    opacity: 1
+}
+
+
+
+.task-gantt-summary-width {
+    position: absolute;
+    top: 0px;
+    left: 0;
+    /*width: 4px;*/
+    height: 2px;
+    background: #285e6a;
+    opacity: 0.7;
+    /*cursor: ew-resize;*/
+    z-index: -10;
+    /*box-shadow: 0 0 2px 1px #fff*/
+
+}
+
+/*.task-gantt-pointer*/
+/*{*/
+/*height:0;*/
+/*border:0 #747d87;*/
+/*border-bottom-style:dashed;*/
+/*border-bottom-width:2px;*/
+/*-ms-transform-origin:0 0;*/
+/*-webkit-transform-origin:0 0;*/
+/*transform-origin:0 0;*/
+/*z-index:20;*/
+/*margin-left:1px;*/
+/*position:absolute*/
+/*}*/
+
+/*.task-gantt-pointer-popup*/
+/*{*/
+/*max-width:350px;*/
+/*padding:3px;*/
+/*font:normal 12px/normal Helvetica, Arial,sans-serif*/
+/*}*/
+
+/*.task-gantt-pointer-popup-from*/
+/*{*/
+/*margin-bottom:3px*/
+/*}*/
+
+/*.task-gantt-pointer-popup-label*/
+/*{*/
+/*margin-right:5px*/
+/*}*/
+
+/*.task-gantt-pointer-popup-title*/
+/*{*/
+/*display:inline-block;*/
+/*font-weight:bold;*/
+/*margin-right:4px*/
+/*}*/
+
+/*.task-gantt-pointer-popup-error*/
+/*{*/
+/*color:red*/
+/*}*/
+
+.task-gantt-drag-stub {
+    position: absolute;
+    width: 300px;
+    height: 32px;
+    white-space: nowrap;
+    padding: 0 5px 0 25px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    box-sizing: content-box;
+    background: #fff;
+    border: 1px solid #505966;
+    z-index: 100;
+    font: normal 13px/32px Helvetica, Arial, sans-serif;
+    opacity: .9
+}
+
+.task-gantt-drag-stub:before {
+    /* content: ""; */
+    content: "\f096";
+    display: block;
+    width: 15px;
+    height: 15px;
+    position: absolute;
+    left: 5px;
+    top: 9px;
+
+}
+
+.task-gantt-drag-stub-error:before {
+    background-position: -45px -190px
+}
+
+.task-gantt-drop-line {
+    position: absolute;
+    height: 2px;
+    background: #43474b
+}
+
+.task-gantt-drop-line-error {
+    background: red
+}
+
+
+/*Hint For Move Gantt Line*/
+
+.task-gantt-line-hint-move {
+    position: absolute;
+    top: -100px;
+    left: -100px;
+    /*top: 200px;*/
+    /*left: 400px;*/
+    z-index: 10;
+    white-space: nowrap;
+    padding: 4px 8px 4px 7px;
+    background: #fff;
+    border: 1px solid #e0e0e0;
+    border-radius: 2px;
+    font: normal 10px/normal Verdana, Arial, Helvetica, sans-serif
+}
+
+.task-gantt-line-hint-names {
+    display: inline-block;
+    vertical-align: top
+}
+
+.task-gantt-line-hint-values {
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 5px
+}
+
+.task-gantt-line-hint-name {
+    color: #7f7f7f;
+    display: block;
+    text-align: right
+}
+
+.task-gantt-line-hint-value {
+    color: #000;
+    display: block
+}
+
+.task-gantt-line-hint-year {
+    color: #888
+}
+
+/*Hit For Move Gantt Line*/
+
+.task-gantt-line-tip-bar {
+    position: absolute;
+    top: -100px;
+    left: -100px;
+    /*top: 200px;*/
+    /*left: 400px;*/
+    z-index: 100;
+    white-space: nowrap;
+    padding: 4px 8px 4px 7px;
+    background: #fff;
+    border: 1px solid #e0e0e0;
+    border-radius: 2px;
+    font: normal 10px/normal Verdana, Arial, Helvetica, sans-serif
+}
+
+.task-gantt-line-tip-names {
+    display: inline-block;
+    vertical-align: top
+}
+
+.task-gantt-line-tip-values {
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 5px
+}
+
+.task-gantt-line-tip-name {
+    color: #7f7f7f;
+    display: block;
+    text-align: right
+}
+
+.task-gantt-line-tip-value {
+    color: #000;
+    display: block
+}
+
+.task-gantt-line-tip-year {
+    color: #888
+}
+
+
+/*DEADLINE BAR*/
+
+.task-gantt-bar-deadline-info {
+    overflow: hidden;
+    text-align: right;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    height: 16px;
+    min-width: 50px;
+    font-size: 10px;
+    opacity: .7;
+}
+
+
+.task-gantt-bar-deadline {
+    position: absolute;
+    top: 0px;
+    left: 0;
+    width: 1px;
+    height: 16px;
+    z-index: -15;
+    background: rgba(255, 255, 255, 0.5);
+
+    border-top: 0px solid #e4e6e7;
+    border-bottom: 1px solid #e4e6e7;
+    box-sizing: border-box;
+
+    opacity: .7;
+}
+
+.task-gantt-deadline-slider {
+    position: absolute;
+    top: 0px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    background: #ff6762;
+
+    cursor: ew-resize;
+    z-index: -10;
+    box-shadow: 0 0 2px 1px #fff;
+    opacity: .7;
+}
+
+.task-gantt-done-slider {
+    position: absolute;
+    top: 2px;
+    /*top: 0px;*/
+    /*left: 0;*/
+    /*width: 3px;*/
+    /*height: 16px;*/
+    /*background: rgba(42, 175, 91, 0.3);*/
+
+    /*cursor: ew-resize;*/
+    z-index: -10;
+    /*box-shadow: 0 0 2px 1px #fff*/
+}
+
+.task-gantt-done-slider.fa-check-circle-o {
+    color: #69a133;
+    opacity: 1;
+    background: none;
+}
+
+.task-gantt-done-info {
+    position: absolute;
+    z-index: 0;
+    /*background: rgba(52, 75, 104, 0);*/
+    opacity: .9;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    left: 20px;
+    top: 0px;
+    /*width:1px;*/
+    height: 10px;
+
+}
+
+.task-gantt-done-info a {
+    white-space: nowrap;
+    font-size: 11px;
+}
+
+.task-gantt-docs {
+    position: relative;
+    z-index: 0;
+    /*background: rgba(52, 75, 104, 0);*/
+    opacity: .8;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+
+    top: 1px;
+    width: 1px;
+    height: 10px;
+    color: black;
+
+    cursor: pointer;
+
+}
+
+.task-gantt-docs-slider {
+    left: 5px;
+
+}
+
+.task-gantt-docs-bar {
+    position: absolute;
+    z-index: 0;
+    right: -14px;
+    top: -1px;
+
+}
+
+
+
+
+
+.task-gantt-deadline-slider {
+    /*cursor: e-resize*/
+}
+
+.task-gantt-deadline-read-only {
+    width: 5px;
+    /*cursor: default*/
+}
+
+.task-gantt-progress {
+    position: absolute;
+    top: -3px;
+    left: 0;
+    /*width: 4px;*/
+    height: 3px;
+    background: #6276ff;
+    opacity: 0.7;
+    /*cursor: ew-resize;*/
+    z-index: -10;
+    /*box-shadow: 0 0 2px 1px #fff*/
+
+}
+
+.task-gantt-progress2 {
+    position: absolute;
+    top: -0.5px;
+    /*left: 0;*/
+    /*width: 4px;*/
+    height: 16px;
+    /*background: #6276ff;*/
+    /*opacity: 0.7;*/
+    /*cursor: ew-resize;*/
+    z-index: -20;
+    /*box-shadow: 0 0 2px 1px #fff*/
+    color: #70716f;
+
+    user-select: none;
+
+}
+
+
+.task-gantt-milestone {
+
+    /*z-index: -50;*/
+    opacity: 1
+}
+
+.fa-flag {
+    color: #69a133;
+    opacity: 1;
+    background: none;
+}
+
+.fa-exclamation {
+    color: #eb5d52;
+    opacity: 1;
+    background: none;
+}
+
+.task-gantt-name {
+    /*style="display:inline-block;width:90px;" */
+
+    display: inline-block;
+
+    position: absolute;
+    /*top: 1px;*/
+    left: 5px;
+    font-size: 0.9em;
+    /*width: 4px;*/
+    height: 16px;
+    /*background: #ff6762;*/
+    /*cursor: ew-resize;*/
+    z-index: -20;
+    /*box-shadow: 0 0 2px 1px #fff*/
+
+
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
+    color: #70716f;
+
+    user-select: none;
+
+
+}
+
+.task-gantt-timeline-inner {
+    display: inline-block;
+
+}
+
+.task-gantt-timeline-arrow {
+    /*!*display: inline-block;*!*/
+
+    /*border: 1px solid #ff0000;*/
+    /*!*position: absolute;*!*/
+    /*position: relative;*/
+    /*!*display: inline-block;*!*/
+    /*z-index: 3;*/
+    /*!*width:100%;*!*/
+    /*!*height:100%;*!*/
+    /*!*width:300px;*!*/
+    /*!*height: 300px;*!*/
+
+    /*!*padding:17px 0 0 0;*!*/
+
+    /*!*vertical-align: top;*!*/
+
+    /*background: red;*/
+    /*height:100%;*/
+    /*width:100%;*/
+    /*margin: 0 auto;*/
+    position: absolute;
+    /*opacity: 0.2;*/
+    top: 16px;
+    display: inline-block;
+    /*z-index: 2;*/
+
+
+}
+
+.task-gantt-timeline-arrow-canvas {
+
+    /*border: 1px solid #ff0000;*/
+
+    display: inline-block;
+
+}
+
+.gantt_timeline_link .gantt_timeline_link_wrapper {
+
+    /*border: 1px solid #ff0000;*/
+    /*box-shadow: 0 0 1px 0px #9c5c11;*/
+    position: absolute;
+    cursor: pointer;
+    display: inline-block;
+    z-index: 3;
+
+}
+
+.gantt_timeline_link:hover .gantt_timeline_link_wrapper div {
+    box-shadow: 0 0 5px 1px #ffbb04 !important;
+}
+
+.gantt_timeline_link_type {
+    margin-left: 2px;
+    margin-right: 2px;
+    margin-top: 3px;
+    margin-bottom: 2px;
+    font-size: 0.7em;
+    /*width: 4px;*/
+    /*height: 10px;*/
+    position: absolute
+}
+
+.fa-exclamation {
+    padding-top: 5px;
+}
+
+
+
+.gantt_pager_info {
+
+    display: inline;
+
+}
+
+.task-gantt-bar-load {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    width: 4px;
+    height: 28px;
+    /*background: rgba(225, 225, 225, 0.57);*/
+    /*border:1px solid rgb(154, 160, 167);*/
+    border-radius: 2px;
+    /*border-bottom-style: dotted ;*/
+    /*z-index:-2;*/
+    /*cursor:move;*/
+
+    /*border-color: rgb(154, 160, 167);*/
+    /*border-top-width:1px;*/
+    /*border-bottom-width:1px;*/
+    /*border-left-width:1px;*/
+    /*border-right-width:1px;*/
+    /*border-bottom-style: dotted;*/
+    /*border-top-style:solid;*/
+    /*border-left-style:solid;*/
+    /*border-right-style:solid;*/
+}
+
+.task-gantt-load-duration {
+    /*style="display:inline-block;width:90px;" */
+
+    display: block;
+
+    position: relative;
+    /*top: 1px;*/
+    left: 5px;
+    font-size: 0.9em;
+    /*width: 4px;*/
+    height: 14px;
+    /*background: #ff6762;*/
+    /*cursor: ew-resize;*/
+    z-index: -20;
+    /*box-shadow: 0 0 2px 1px #fff*/
+    /*background: rgba(225, 225, 225, 0.57);*/
+
+
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: rgba(112, 113, 111, 0.8);
+
+
+
+    user-select: none;
+
+
+}
+
+.task-gantt-load-duration_l {
+    /*style="display:inline-block;width:90px;" */
+
+    display: block;
+
+    position: relative;
+    top: 3px;
+    left: 5px;
+    font-size: 0.9em;
+    /*width: 4px;*/
+    height: 16px;
+    text-align: center;
+    /*background: rgba(223, 224, 222, 0.93);*/
+    /*cursor: ew-resize;*/
+    z-index: -20;
+    /*box-shadow: 0 0 2px 1px #fff*/
+    /*background: rgba(225, 225, 225, 0.57);*/
+
+    /*border:1px solid rgb(154, 160, 167);*/
+    /*border-radius:2px;*/
+    /*border-bottom-style: dotted ;*/
+    /*z-index:-2;*/
+    /*cursor:move;*/
+
+    /*border-color: rgb(154, 160, 167);*/
+    /*border-top-width:1px;*/
+    /*border-bottom-width:1px;*/
+    /*border-left-width:1px;*/
+    /*border-right-width:1px;*/
+    /*border-bottom-style: dotted;*/
+    /*border-top-style:solid;*/
+    /*border-left-style:solid;*/
+    /*border-right-style:solid;*/
+
+
+
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    color: rgba(112, 113, 111, 0.8);
+    user-select: none;
+}
+
+.task-gantt-load-duration-m {
+    /*style="display:inline-block;width:90px;" */
+
+    display: block;
+    position: relative;
+
+    /*top: 1px;*/
+    left: 5px;
+    font-size: 0.8em;
+    /*width: 4px;*/
+    height: 14px;
+    /*background: #ff6762;*/
+    /*cursor: ew-resize;*/
+    z-index: -20;
+    /*box-shadow: 0 0 2px 1px #fff*/
+    /*background: rgba(20, 150, 255, 0.57);*/
+
+
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
+    color: rgba(186, 187, 185, 0.69);
+
+    user-select: none;
+
+
+}
+
+
+
+.task-gantt-bar-load-task {
+    position: absolute;
+    top: 3px;
+    left: 0;
+    /*width:4px;*/
+    height: 16px;
+    background: rgba(7, 52, 182, 0.57);
+    /*border:1px solid rgb(154, 160, 167);*/
+    /*border-radius:2px;*/
+    /*border-bottom-style: dotted ;*/
+    /*z-index:-2;*/
+    /*cursor:move;*/
+
+    /*border-color: rgb(154, 160, 167);*/
+    /*border-top-width:1px;*/
+    /*border-bottom-width:1px;*/
+    /*border-left-width:1px;*/
+    /*border-right-width:1px;*/
+    /*border-bottom-style: dotted;*/
+    /*border-top-style:solid;*/
+    /*border-left-style:solid;*/
+    /*border-right-style:solid;*/
+}
+
+
+/*.el-noselect {*/
+/*  -webkit-touch-callout: none; !* iOS Safari *!*/
+/*    -webkit-user-select: none; !* Safari *!*/
+/*     -khtml-user-select: none; !* Konqueror HTML *!*/
+/*       -moz-user-select: none; !* Firefox *!*/
+/*        -ms-user-select: none; !* Internet Explorer/Edge *!*/
+/*            user-select: none; !* Non-prefixed version, currently*/
+/*                                  supported by Chrome and Opera *!*/
+/*}*/
+
+
+.task-gantt-bar-intersection {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 4px;
+    height: 14px;
+    /*background: rgba(242, 197, 116, 0.6);*/
+    border-radius: 2px;
+    z-index: 3;
+    /*cursor:move*/
+}
+
+.task-gantt-bar-intersection-hover {
+    background: rgba(108, 115, 210, 0.6) !important;
+
+}
+
+.task-gantt-bar-intersection:hover {
+    background: rgba(76, 92, 246, 0.6) !important;
+}
+
+.ui-resizable-e {
+    cursor: e-resize;
+    width: 5px;
+    right: 0px;
+    top: 0;
+    height: 100%;
+    background: rgba(219, 219, 219, 0.25);
+}
+
+
+
+
+.task-gantt-task-gantt-layout {
+    /*overflow:hidden;*/
+    border-bottom: 1px solid #dddee1;
+    background: #fff;
+
+    height: 20%;
+    overflow-y: scroll;
+
+}
+
+.timeline-gantt-layout {
+    overflow-y: scroll;
+    /*border-top:2px solid rgba(255, 255, 255, 0);*/
+    background: #edeef0;
+
+    /*!*float:left;*!*/
+    /*height:52px;*/
+    position: relative;
+    /*!*padding:0 0 50px 0*!*/
+    width: 100%;
+    /*height: 15%;*/
+    /*padding-top: 2px;*/
+}
+
+.timeline-gantt-header-layout {
+    overflow: hidden;
+    /*border-top:2px solid rgba(255, 255, 255, 0);*/
+    /*background: #ff2a23;*/
+    /**/
+    /*float:left;*/
+    /*height:40px;*/
+    position: relative;
+    /*padding:0 0 50px 0*/
+    width: 100%;
+    height: 100%;
+
+    /*padding-top: 2px;*/
+}
+
+
+/*.timeline-gantt-items-layout*/
+/*{*/
+/*    float:left;*/
+/*    !*width:400px;*!*/
+/*    overflow:hidden;*/
+/*    position:relative;*/
+/*    padding:0 0 52px 0;*/
+
+/*    background: #edeef0;*/
+
+/*}*/
+
+/*.timeline-gantt-options-layout*/
+/*{*/
+/*    position:absolute;*/
+/*    top:0;*/
+/*    !*left:5px;*!*/
+/*    !*width:3px;*!*/
+/*    !*cursor:ew-resize;*!*/
+/*    height:100%;*/
+/*    !*background:#dddee1;*!*/
+/*    display: inline-block;*/
+
+/*}*/
+
+.timeline-gantt-scroll-layout {
+    overflow: hidden;
+    /*border-top:2px solid rgba(255, 255, 255, 0);*/
+    background: rgba(54, 4, 54, 0.09);
+    /**/
+    /*float:left;*/
+    /*height:40px;*/
+    position: relative;
+    /*padding:0 0 30px 0;*/
+    /*width: 100%;*/
+    height: 3px;
+    cursor: s-resize;
+
+    /*padding-top: 2px;*/
+}
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/css/gantt_native_ztree.css b/odex25_project/web_gantt_native/static/src/css/gantt_native_ztree.css
new file mode 100644
index 000000000..a27b1ddd2
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/css/gantt_native_ztree.css
@@ -0,0 +1,440 @@
+
+.ztree li ul.line {
+  background: none;
+}
+
+.ztree * {
+  padding: 0;
+  margin: 0;
+  /*font-size: 1.08333333rem;*/
+}
+
+.ztree {
+  margin: 0;
+  /*padding: 5px;*/
+	padding-top: 0px;
+    padding-right: 5px;
+    padding-bottom: 0px;
+    padding-left: 5px;
+  color: #666666;
+}
+
+.ztree li {
+  /*padding: 0 5px;*/
+  margin: 0;
+  list-style: none;
+  line-height: 17px;
+  text-align: left;
+  white-space: nowrap;
+  outline: 0;
+	/*border-top:1px solid #edeef0;*/
+}
+
+.ztree li ul {
+  margin: 0px;
+  padding: 0 0 0 17px;
+}
+
+.ztree li a {
+  padding-right: 3px;
+  margin: 0;
+  cursor: pointer;
+  height: 30px;
+  color: #666666;
+  background-color: transparent;
+  text-decoration: none;
+  /*vertical-align: top;*/
+  display: inline-block;
+  width: calc(100% - 10px);
+
+
+}
+
+
+.node_name{
+
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: calc(100% - 50px);
+    display: inline-block;
+
+}
+
+.ztree li a input.rename {
+  height: 27px;
+  width: auto;
+  padding: 0;
+  margin: 0;
+  color: #666666;
+  background-color:  white;
+  font-size: 1.08333333rem;
+  border: 1px #585956 solid;
+  border: 0px;
+}
+
+.ztree li a:hover {
+  background-color: #dfebf6;
+  /*color: white;*/
+  opacity: 0.6;
+}
+
+.ztree li a.curSelectedNode {
+  padding-top: 0px;
+  background-color: #dfebf6;
+  color: #015272;
+  height: 30px;
+  opacity: 0.6;
+  font-weight: bold;
+}
+
+.ztree li a.curSelectedNode_Edit {
+  padding-top: 0px;
+  background-color: transparent;
+  color: white;
+  height: 30px;
+  /*border: 1px #dfebf6 solid;*/
+  opacity: 0.6;
+}
+
+.ztree li a.tmpTargetNode_next {
+
+  border-bottom-width: 3px;
+    border-bottom-style: solid;
+    border-bottom-color: #599aff;
+
+}
+
+.ztree li a.tmpTargetNode_prev {
+
+  border-top-width: 3px;
+    border-top-style: solid;
+    border-top-color: #599aff;
+
+}
+
+.ztree li a.tmpTargetNode_inner {
+  padding-top: 0px;
+  /*background-color: #a2eeee;*/
+  color: #141414;
+  height: 30px;
+  /*border: 1px #dfebf6 solid;*/
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+  font-weight: bold;
+}
+
+.ztree li span {
+  line-height: 24px;
+  margin-right: 2px;
+  background-color: transparent;
+}
+
+.ztree li span.button {
+  line-height: 0;
+  margin: 0;
+  padding: 0 0px;
+  width: 15px;
+  height: 30px;
+  display: inline-block;
+  vertical-align: top;
+  border: 0px solid;
+  cursor: pointer;
+  outline: none;
+  background-color: transparent;
+  background-repeat: no-repeat;
+  background-attachment: scroll;
+}
+
+.ztree li span.button::before {
+  font-family: FontAwesome;
+  padding-top: 10px;
+}
+
+.ztree li span.button.chk {
+  margin: 0px;
+  cursor: auto;
+  width: 12px;
+  display: inline-block;
+  padding-top: 10px;
+  padding-left: 2px;
+}
+
+.ztree li span.button.chk.checkbox_false_full::before {
+  content: "\f096";
+}
+.ztree li span.button.chk.checkbox_false_full_focus::before {
+  content: "\f096";
+  color: #ffff00;
+}
+.ztree li span.button.chk.checkbox_false_part::before {
+  content: "\f096";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.checkbox_false_part_focus::before {
+  content: "\f096";
+  color: #cad96c;
+}
+.ztree li span.button.chk.checkbox_false_disable::before {
+  content: "\f096";
+  color: #808080;
+}
+.ztree li span.button.chk.checkbox_true_full::before {
+  content: "\f046";
+}
+.ztree li span.button.chk.checkbox_true_full_focus::before {
+  content: "\f046";
+}
+.ztree li span.button.chk.checkbox_true_part::before {
+  content: "\f14a";
+}
+.ztree li span.button.chk.checkbox_true_part_focus::before {
+  content: "\f14a";
+  color: #32a444;
+}
+.ztree li span.button.chk.checkbox_true_full_focus::before {
+  content: "\f046";
+  color: #32a444;
+}
+.ztree li span.button.chk.checkbox_true_part::before {
+  content: "\f046";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.checkbox_true_part_focus::before {
+  content: "\f046";
+  color: #32a444;
+}
+.ztree li span.button.chk.checkbox_true_disable::before {
+  content: "\f046";
+  color: #808080;
+}
+.ztree li span.button.chk.radio_false_full::before {
+  content: "\f10c";
+}
+.ztree li span.button.chk.radio_false_full_focus::before {
+  content: "\f10c";
+  color: #32a444;
+}
+.ztree li span.button.chk.radio_false_part::before {
+  content: "\f10c";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.radio_false_part_focus::before {
+  content: "\f10c";
+  color: #32a444;
+}
+.ztree li span.button.chk.radio_false_disable::before {
+  content: "\f1db";
+  color: #808080;
+}
+.ztree li span.button.chk.radio_true_full::before {
+  content: "\f192";
+}
+.ztree li span.button.chk.radio_true_full_focus::before {
+  content: "\f192";
+  color: #32a444;
+}
+.ztree li span.button.chk.radio_true_part::before {
+  content: "\f192";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.radio_true_part_focus::before {
+  content: "\f192";
+  color: #aaaaaa;
+}
+.ztree li span.button.chk.radio_true_disable::before {
+  content: "\f1db";
+  color: #808080;
+}
+.ztree li span.button.switch {
+  width: 15px;
+  height: 16px;
+}
+.ztree li span.button.root_open::before {
+  content: "\f078";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.root_close::before {
+  content: "\f115";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.roots_open::before {
+  content: "\f078";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.roots_close::before {
+  content: "\f054";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.center_open::before {
+  content: "\f078";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.center_close::before {
+  content: "\f054";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.bottom_open::before {
+  content: "\f078";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.bottom_close::before {
+  content: "\f054";
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+}
+.ztree li span.button.root_docu {
+  background: none;
+}
+.ztree li span.button.roots_docu::before {
+  content: "\f022";
+  padding-left: 2px;
+  display: inline-block;
+  color: #4e5564;
+}
+.ztree li span.button.center_docu::before {
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #4e5564;
+}
+.ztree li span.button.bottom_docu::before {
+  padding-top: 10px;
+  padding-left: 2px;
+  display: inline-block;
+  color: #4e5564;
+}
+.ztree li span.button.noline_docu {
+  background: none;
+}
+/*.ztree li span.button.ico_open::before {*/
+/*  content: "\f115";*/
+/*  font-family: FontAwesome;*/
+/*  padding-top: 10px;*/
+/*  padding-left: 2px;*/
+/*  display: inline-block;*/
+/*  color: #4e5564;*/
+/*}*/
+/*.ztree li span.button.ico_close::before {*/
+/*  content: "\f114";*/
+/*  font-family: FontAwesome;*/
+/*  padding-top: 10px;*/
+/*  padding-left: 2px;*/
+/*  display: inline-block;*/
+/*  color: #4e5564;*/
+/*}*/
+/*.ztree li span.button.ico_docu::before {*/
+/*  content: "\f022";*/
+/*  font-family: FontAwesome;*/
+/*  padding-top: 10px;*/
+/*  padding-left: 2px;*/
+/*  display: inline-block;*/
+/*  color: #4e5564;*/
+/*}*/
+
+
+
+.ztree li span.button.custom {
+    margin-left: 4px;
+    margin-right: -1px;
+    vertical-align: top;
+    padding-top: 5px;
+}
+
+
+.ztree li span.button.edit {
+  margin-left: 4px;
+  margin-right: -1px;
+  vertical-align: top;
+  vertical-align: middle;
+  padding-top: 10px;
+}
+
+
+.ztree li span.button.edit::before {
+  content: "\f044";
+  font-family: FontAwesome;
+}
+.ztree li span.button.remove {
+  margin-left: 4px;
+  margin-right: -1px;
+  vertical-align: top;
+  vertical-align: middle;
+  padding-top: 10px;
+}
+.ztree li span.button.remove::before {
+  content: "\f1f8";
+  font-family: FontAwesome;
+}
+.ztree li span.button.add {
+  margin-left: 4px;
+  margin-right: -1px;
+  vertical-align: top;
+  vertical-align: middle;
+  padding-top: 10px;
+}
+.ztree li span.button.add::before {
+  content: "\f067";
+  font-family: FontAwesome;
+}
+.ztree li span.button.ico_loading {
+  margin-right: 2px;
+  background: url(./img/loading.gif) no-repeat scroll 0 0 transparent;
+  vertical-align: top;
+  vertical-align: middle;
+}
+ul.tmpTargetzTree {
+  background-color: #FFE6B0;
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+span.tmpzTreeMove_arrow {
+  width: 16px;
+  height: 17px;
+  display: inline-block;
+  padding: 0;
+  margin: 2px 0 0 1px;
+  border: 0 none;
+  position: absolute;
+  background-color: transparent;
+  background-attachment: scroll;
+}
+span.tmpzTreeMove_arrow::before {
+  content: "\f04b";
+  font-family: FontAwesome;
+  color: #7a96a4;
+}
+ul.ztree.zTreeDragUL {
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  width: auto;
+  height: auto;
+  overflow: hidden;
+  background-color: #cfcfcf;
+  border: 1px #32a444 dotted;
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.ztreeMask {
+  z-index: 10000;
+  background-color: #cfcfcf;
+  opacity: 0.0;
+  filter: alpha(opacity=0);
+  position: absolute;
+}
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/css/img/loading.gif b/odex25_project/web_gantt_native/static/src/css/img/loading.gif
new file mode 100644
index 000000000..e8c289293
Binary files /dev/null and b/odex25_project/web_gantt_native/static/src/css/img/loading.gif differ
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_item_action.js b/odex25_project/web_gantt_native/static/src/js/gantt_item_action.js
new file mode 100644
index 000000000..31e69c760
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_item_action.js
@@ -0,0 +1,135 @@
+odoo.define('web_gantt_native.ItemAction', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+
+
+var GanttListAction = Widget.extend({
+    template: "GanttList.action",
+
+    custom_events: {
+        'focus_gantt_line' : 'focus_gantt_line'
+    },
+
+    init: function(parent, options) {
+
+        this._super(parent);
+        this.parent = parent;
+        this.items_sorted = options.items_sorted;
+        this.export_wizard = options.export_wizard;
+        this.main_group_id_name = options.main_group_id_name;
+        this.action_menu = options.action_menu;
+        this.tree_view = options.tree_view;
+        this.$zTree = parent.widget_ztree.$zTree;
+
+
+    },
+
+    start: function() {
+
+        var self = this;
+        var $zTree = this.$zTree;
+
+        var nodes = $zTree.getNodes();
+
+         _.each(nodes, function (node) {
+
+             var childNodes = $zTree.transformToArray(node);
+
+             _.each(childNodes, function (child) {
+
+                var item_action = $('<div class="item-action"/>');
+
+
+                var id = child["zt_id"];
+
+                if (id !== undefined) {
+                    item_action.prop('id', "item-action-" + id + "");
+                    item_action.attr('data-id', id);
+                }
+
+
+                item_action.append('<span class="action-focus"><i class="fa fa-crosshairs fa-1x"></i></span>');
+
+
+                if (child["plan_action"]) {
+                    item_action.append('<span class="action-plan"><i class="fa fa-exclamation"></i></span>');
+                }
+
+
+                var fold = child["fold"];
+                // if (self.tree_view) {
+                    if (fold) {
+                        item_action.css({'display': 'none'});
+                    }
+
+                // }
+
+                self.$el.append(item_action);
+
+             });
+
+         });
+
+    },
+
+
+
+    renderElement: function () {
+        this._super();
+
+        // this.$el.data('record', this);
+        this.$el.on('click', this.proxy('on_global_click'));
+
+    },
+
+
+
+    focus_gantt_line: function (event) {
+
+        var self = this.parent.__parentedParent;
+        var $zTree = this.$zTree;
+
+        var record = $zTree.getNodeByParam('zt_id', event.data["id"]);
+        $zTree.selectNode(record);
+
+        if (!record.is_group){
+            var toscale = Math.round((record.task_start.getTime()-self.renderer.firstDayScale) / self.renderer.pxScaleUTC);
+            self.renderer.TimeToLeft = toscale;
+
+            var new_toscale = toscale-500;
+            if (new_toscale < 0){
+                new_toscale = 0;
+            }
+
+
+            $('.timeline-gantt-head').animate( { scrollLeft: new_toscale }, 1000);
+            $('.task-gantt-timeline').animate( { scrollLeft: new_toscale }, 1000);
+            self.renderer.gantt_timeline_scroll_widget.scrollOffset(new_toscale);
+
+        }
+
+    },
+
+
+    on_global_click: function (ev) {
+
+        if (!ev.isTrigger) { //human detect
+
+            var id = $(ev.target).parent().parent().data("id");
+
+            //Focus Task
+            if ($(ev.target).hasClass("fa-crosshairs")) {
+               this.trigger_up('focus_gantt_line', {id: id});
+            }
+
+        }
+    },
+
+
+
+});
+
+return GanttListAction;
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_item_info.js b/odex25_project/web_gantt_native/static/src/js/gantt_item_info.js
new file mode 100644
index 000000000..4e089c166
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_item_info.js
@@ -0,0 +1,181 @@
+odoo.define('web_gantt_native.ItemInfo', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+
+var dialogs = require('web.view_dialogs');
+
+var Widget = require('web.Widget');
+var Model = require('web.AbstractModel');
+
+var framework = require('web.framework');
+
+var time = require('web.time');
+
+
+var _lt = core._lt;
+var _t = core._t;
+
+
+
+
+
+var GanttListInfo = Widget.extend({
+    template: "GanttList.info",
+
+    init: function(parent, options) {
+
+        this._super(parent);
+        this.parent = parent;
+        this.items_sorted = options.items_sorted;
+        this.export_wizard = options.export_wizard;
+        this.main_group_id_name = options.main_group_id_name;
+        this.action_menu = options.action_menu;
+        this.tree_view = options.tree_view;
+        this.$zTree = parent.widget_ztree.$zTree;
+
+
+    },
+
+    start: function() {
+
+        var self = this;
+        var $zTree = this.$zTree;
+
+        var nodes = $zTree.getNodes();
+
+        var items_start = $('<div class="item-list"/>');
+        var items_stop = $('<div class="item-list"/>');
+        var l10n = _t.database.parameters;
+        var formatDate = time.strftime_to_moment_format( l10n.date_format + ' ' + l10n.time_format);
+
+
+        var items_duration = $('<div class="item-info"/>');
+
+        _.each(nodes, function (node) {
+            var childNodes = $zTree.transformToArray(node);
+
+            _.each(childNodes, function (child) {
+
+
+                var item_info = $('<div class="item-info"/>');
+                var id = child["id"];
+
+                if (id !== undefined) {
+                    item_info.prop('id', "item-info-" + id);
+                    item_info.prop('data-id', id);
+                    item_info.prop('allowRowHover', true);
+                }
+
+                var fold = child["fold"];
+                // if (self.tree_view) {
+                    if (fold) {
+                        item_info.css({'display': 'none'});
+                    // }
+                }
+
+
+                //Duration
+                var item_duration = item_info.clone();
+                var duration = child['duration'];
+                var duration_units = undefined;
+
+                if (duration){
+
+                    var duration_scale = child['duration_scale'];
+
+                    if (duration_scale) {
+
+                        duration_units =  duration_scale.split(",");
+
+                    }
+                    // Array of strings to define which units are used to display the duration (if needed).
+                    // Can be one, or a combination of any, of the following:
+                    // ['y', 'mo', 'w', 'd', 'h', 'm', 's', 'ms']
+                    //
+                    // humanizeDuration(3600000, { units: ['h'] })       // '1 hour'
+                    // humanizeDuration(3600000, { units: ['m'] })       // '60 minutes'
+                    // humanizeDuration(3600000, { units: ['d', 'h'] })  // '1 hour'
+
+                    var duration_humanize = humanizeDuration(duration*1000, { round: true });
+
+                    if (duration_units){
+                        duration_humanize = humanizeDuration(duration*1000,{ units: duration_units, round: true });
+                    }
+
+                    if (self.parent.list_show !== -1) {
+
+                        if (child['isParent']) {
+                            item_duration.append('<div class="task-gantt-item-info task-gantt-items-subtask" style="float: right;">' + duration_humanize + '</div>');
+                        } else {
+                            item_duration.append('<div class="task-gantt-item-info" style="float: right;">' + duration_humanize + '</div>');
+                        }
+                    }
+
+                }
+
+                items_duration.append(item_duration);
+
+
+
+
+                if (self.parent.list_show === 1){
+
+                    //Start
+                    var item_start = item_info.clone();
+                    var task_start = child['task_start'];
+
+                    if (task_start){
+                        var start_date_html = moment(task_start).format(formatDate);
+
+                        if (child['isParent']){
+                            item_start.append('<div class="task-gantt-item-info task-gantt-items-subtask" style="float: right;">'+start_date_html+'</div>');
+                        }
+                        else{
+                            item_start.append('<div class="task-gantt-item-info" style="float: right;">'+start_date_html+'</div>');
+                        }
+
+                }
+
+
+                //Stop
+                var item_stop = item_info.clone();
+                var task_stop = child['task_stop'];
+
+                if (task_stop){
+                    var stop_date_html = moment(task_stop).format(formatDate);
+
+                    if (child['isParent']){
+                        item_stop.append('<div class="task-gantt-item-info task-gantt-items-subtask" style="float: right;">'+stop_date_html+'</div>');
+                    }
+                    else{
+                        item_stop.append('<div class="task-gantt-item-info" style="float: right;">'+stop_date_html+'</div>');
+                    }
+                }
+
+
+                items_start.append(item_start);
+                items_stop.append(item_stop);
+
+
+                }
+
+            })
+
+
+        });
+
+        self.$el.append(items_duration);
+        self.$el.append(items_start);
+        self.$el.append(items_stop);
+
+
+    },
+
+
+});
+
+return GanttListInfo;
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_item_options.js b/odex25_project/web_gantt_native/static/src/js/gantt_item_options.js
new file mode 100644
index 000000000..93ebefaa2
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_item_options.js
@@ -0,0 +1,352 @@
+odoo.define('web_gantt_native.ItemOptions', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+var Model = require('web.AbstractModel');
+var framework = require('web.framework');
+
+var dialogs = require('web.view_dialogs');
+var core = require('web.core');
+var _t = core._t;
+var _lt = core._lt;
+
+var time = require('web.time');
+
+var GanttListOptionsItem = Widget.extend({
+    template: "GanttList.options",
+
+    custom_events: {
+        'item_order' : 'order_action',
+        'item_list' : 'list_action',
+        'item_export' : 'export_action',
+        'item_industry' : 'industry_action',
+        'item_week' : 'week_action'
+
+    },
+
+    init: function(parent) {
+        this.parent = parent;
+        this._super.apply(this, arguments);
+        this.$zTree = parent.widget_ztree.$zTree;
+    },
+
+    start: function () {
+        // var _widget =  this.parent.gantt_timeline_header_widget;
+        // var el_widget = _widget.$el;
+
+        if (this.parent.ItemsSorted){
+
+            // var div_manual = $('<div class="text-left task-gantt-item-sort-manual"/>');
+            // div_manual.text("Manual Sort");
+            // this.$el.append(div_manual);
+
+        } else if (this.parent.state.orderedBy && this.parent.state.orderedBy.length){
+
+            // Sort Options
+            var div_ = $('<div class="text-left gantt-list-options-item"/>');
+            // div_.text(this.parent.fields[this.parent.state.orderedBy[0].name].string);
+            var _text = "Sort - " + this.parent.fields[this.parent.state.orderedBy[0].name].string;
+
+            var  div_typer = $('<div class="fa fa-sort-amount-desc gantt-list-options-item-sort" aria-hidden="false" title="desc '+ _text +'"></div>');
+
+
+            if (this.parent.state.orderedBy[0].asc){
+                 div_typer = $('<div class="fa fa-sort-amount-asc gantt-list-options-item-sort" aria-hidden="false" title="asc '+ _text +'"></div>');
+            }
+
+            div_.append(div_typer);
+            this.$el.append(div_);
+
+        }
+
+        // Show List -basic, -active, -inactive
+
+        var item_list = $('<div class="text-left gantt-list-options-item"/>');
+
+        var list_div = $('<div class="fa fa-list gantt-list-options-item-check gantt-list-options-item-check-basic" data-key="basic" aria-hidden="false" title="Show Basic"></div>');
+
+        if (this.parent.list_show === 1){
+            list_div = $('<div class="fa fa-list gantt-list-options-item-check gantt-list-options-item-check-active" data-key="active" aria-hidden="false" title="Show All"></div>');
+        }
+        else if (this.parent.list_show === -1){
+            list_div = $('<div class="fa fa-list gantt-list-options-item-check gantt-list-options-item-check-inactive" data-key="inactive" aria-hidden="false" title="Show Disable"></div>');
+        }
+
+        item_list.append(list_div);
+        this.$el.append(item_list);
+
+
+        //Export to file
+
+        var export_to_file = $('<div class="text-left gantt-list-options-item"/>');
+        var export_to_file_div = $('<div class="fa fa-file-text-o gantt-list-options-export-to-file" aria-hidden="false" title="Screen to PDF"></div>');
+
+        export_to_file.append(export_to_file_div);
+        this.$el.append(export_to_file);
+
+
+        // Time line for Industry
+        var industry_to_file = $('<div class="text-left gantt-list-options-item"/>');
+        var industry_to_file_div = $('<div class="fa fa-industry gantt-list-options-industry gantt-list-options-industry-hide " data-key="hide" aria-hidden="false" title="Time Line"></div>');
+        if (this.parent.industry_show === 1){
+            industry_to_file_div = $('<div class="fa fa-industry gantt-list-options-industry gantt-list-options-industry-show" data-key="show" aria-hidden="false" title="Time Line"></div>');
+        }
+
+        industry_to_file.append(industry_to_file_div);
+        this.$el.append(industry_to_file);
+
+        //IsoWeek
+
+        var week_icon = $('<div class="text-left gantt-list-options-item"/>');
+        var week_icon_div = $('<div class="fa fa-building gantt-list-options-week gantt-list-options-week-isoweek " data-key="isoweek" aria-hidden="false" title="Iso Week"></div>');
+        if (this.parent.week_type === "week"){
+            week_icon_div = $('<div class="fa fa-building gantt-list-options-week gantt-list-options-week-week" data-key="week" aria-hidden="false" title="Week"></div>');
+        }
+
+        week_icon.append(week_icon_div);
+        this.$el.append(week_icon);
+
+
+    },
+
+
+    renderElement: function () {
+        this._super();
+
+        this.$el.data('parent', this);
+        this.$el.on('click', this.proxy('on_global_click'));
+
+    },
+
+    on_global_click: function (ev) {
+
+        if (!ev.isTrigger) { //human detect
+
+            if ($(ev.target).hasClass("gantt-list-options-item-sort" )) {
+
+                this.trigger_up('item_order', {
+                    orderedBy: this.parent.state.orderedBy,
+                });
+            }
+
+            else if ($(ev.target).hasClass("gantt-list-options-item-check" )) {
+                this.trigger_up('item_list', {"key": ev.target.dataset.key});
+            }
+
+            else if ($(ev.target).hasClass("gantt-list-options-export-to-file" ))
+            {
+                this.trigger_up('item_export', {});
+            }
+            else if ($(ev.target).hasClass("gantt-list-options-industry" )) {
+                this.trigger_up('item_industry', {"key": ev.target.dataset.key});
+            }
+            else if ($(ev.target).hasClass("gantt-list-options-week" )) {
+                this.trigger_up('item_week', {"key": ev.target.dataset.key});
+            }
+
+        }
+    },
+
+    order_action: function(event) {
+
+        var self = this.__parentedParent;
+        var parent = this.parent;
+        var orderedBy = event.data.orderedBy;
+
+
+        if (orderedBy.length){
+
+            if (orderedBy[0].asc){
+                orderedBy[0].asc = false
+            }else{
+
+                orderedBy[0].asc = true
+            }
+
+            self.trigger_up('gantt_refresh_after_change' )
+
+        }
+    },
+
+    list_action: function(event) {
+
+        var self = this.__parentedParent;
+        var parent = this.parent;
+
+        var e_key = event.data.key;
+        let list_show = 0
+        // basic, active, inactive
+        if (e_key === "active") {
+            list_show = -1
+        } else if (e_key === "inactive") {
+            list_show = 0
+        } else if (e_key === "basic") {
+            list_show = 1
+        }
+
+        parent.list_show = list_show
+        parent.local_storage.setItem("gantt_list_show", list_show)
+
+        self.trigger_up('gantt_fast_refresh_after_change' )
+
+    },
+
+    industry_action: function(event) {
+
+        var self = this.__parentedParent;
+        var parent = this.parent;
+
+        var e_key = event.data.key;
+        let industry_show = 0
+        // basic, active, inactive
+        if (e_key === "hide") {
+            industry_show = 1
+        }
+
+        parent.industry_show = industry_show
+        parent.local_storage.setItem("gantt_industry_show", industry_show)
+
+        self.trigger_up('gantt_fast_refresh_after_change' )
+
+    },
+
+    week_action: function(event) {
+
+        var self = this.__parentedParent;
+        var parent = this.parent;
+
+        var e_key = event.data.key;
+        let week_type = "week"
+        // basic, active, inactive
+        if (e_key === "week") {
+            week_type = "isoweek"
+        }
+
+        parent.week_type = week_type
+        parent.local_storage.setItem("gantt_week_type", week_type)
+
+        self.trigger_up('gantt_fast_refresh_after_change' )
+
+    },
+
+
+
+
+    export_action: function(event) {
+
+        var self = this;
+        var parent_app = this.__parentedParent;
+        var parent = this.parent;
+
+
+        var zTree = this.$zTree;
+        //
+        var nodes = zTree.getNodes();
+
+
+        var rows_to_gantt = [];
+
+        _.each(nodes, function (node) {
+
+            var childNodes = zTree.transformToArray(node);
+
+            _.each(childNodes, function (row) {
+
+
+
+                var date_start = undefined;
+                if (typeof row.task_start !== "undefined" ){
+                    date_start = time.auto_date_to_str(row.task_start, "datetime")
+                }
+
+                var date_end = undefined;
+                if (typeof row.task_stop !== "undefined" ){
+                    date_end = time.auto_date_to_str(row.task_stop, "datetime")
+                }
+
+
+                var subtask_count = 0;
+                if (row.isParent){
+                        subtask_count = 1
+                    }
+
+                var for_update = {
+                        "id": row.id,
+                        "name": row.value_name,
+                        "duration": row.duration,
+                        "date_start": date_start,
+                        "date_end": date_end,
+                        "sorting_level": row.level,
+                        "subtask_count": subtask_count,
+                        "wbs": undefined,
+                        "stuff": "",
+                        "separate": row.is_group
+
+                };
+                rows_to_gantt.push(for_update)
+
+            });
+
+        });
+
+        var pre_data = []
+
+        _.each(parent_app.Predecessor, function (predecessor) {
+
+            var pre_update = {
+
+                "task_id": predecessor.task_id[0],
+                "parent_task_id": predecessor.parent_task_id[0],
+                "type": predecessor.type
+            }
+            pre_data.push(pre_update)
+
+        })
+
+
+        var context = this.__parentedParent.state.contexts;
+
+        context['time_type'] = parent_app.timeType || false;
+        context['default_screen'] = true;
+        context['default_data_json'] = JSON.stringify(rows_to_gantt);
+        context['default_pre_json'] = JSON.stringify(pre_data);
+
+
+
+        var res_model = "project.native.report"; //event.data["exoprt_wizard"];
+
+        parent_app._rpc({
+            model: 'gantt.native.tool',
+            method: 'exist_model',
+            args: ['project_native_report_advance'],
+            context: parent_app.state.contexts
+            }).then(function(data) {
+                self.export_open(parent_app, res_model, context)
+            });
+    },
+
+
+    export_open: function(parent, res_model, context) {
+        new dialogs.FormViewDialog(parent, {
+            res_model: res_model,
+            res_id: false,
+            context: context,
+            title: _t("PDF Report for Screen"),
+        }).open();
+    }
+
+
+
+
+});
+
+
+
+return {
+
+    OptionsItem : GanttListOptionsItem
+
+};
+
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_item_ztree.js b/odex25_project/web_gantt_native/static/src/js/gantt_item_ztree.js
new file mode 100644
index 000000000..ff0c0bd33
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_item_ztree.js
@@ -0,0 +1,977 @@
+odoo.define('web_gantt_native.ItemzTree', function (require) {
+    "use strict";
+
+    var core = require('web.core');
+    var _t = core._t;
+    var _lt = core._lt;
+    var Widget = require('web.Widget');
+    var rpc = require('web.rpc');
+    var session = require('web.session');
+    var framework = require('web.framework');
+    var Dialog = require('web.Dialog');
+    var view_dialogs = require('web.view_dialogs');
+    var dialogs = require('web.view_dialogs');
+    var NativeGanttData = require('web_gantt_native.NativeGanttData');
+
+    var ztree_Max = 160;
+
+//                   setting.edit.drag.isMove = true
+// Position settings:
+// prev  inner  next
+// setting.edit.drag.prev = true
+// setting.edit.drag.inner = true
+// setting.edit.drag.next = true
+
+    var ItemzTree = Widget.extend({
+        className: 'zitemtree',
+        template: 'GanttList.item.ztree',
+
+        custom_events: {
+            'item_plan_action' : 'plan_action',
+            'item_export_wizard': 'open_export_wizard',
+            'item_record_edit': 'edit_record',
+            'item_record_add':  'add_record',
+
+        },
+
+        init: function (parent, data, options) {
+            var self = this;
+            this._super.apply(this, arguments);
+            this.items_sorted = options.items_sorted;
+            this.export_wizard = options.export_wizard;
+            this.main_group_id_name = options.main_group_id_name;
+            this.action_menu = options.action_menu;
+            this.tree_view = options.tree_view;
+
+            this.parent = parent;
+
+            this.setting = {
+
+                edit: {
+                    enable: this.parent.ItemsSorted,
+                    showRemoveBtn: false,
+                    showRenameBtn: self.showRenameBtn,
+                    drag: {
+                        next: true,
+                        inner: true,
+                        prev: true,
+                        isCopy: false
+                      }
+                },
+                view: {
+
+                    selectedMulti: false,
+                    fontCss: self.getFont,
+                    nameIsHTML: true,
+                    showIcon: false,
+                    txtSelectedEnable: false,
+                    addHoverDom: self.addHoverDom,
+                    removeHoverDom: self.removeHoverDom,
+                    // addDiyDom: self.addDiyDom
+                },
+                data: {
+                    key: {
+                        name: "value_name"
+                    },
+                    simpleData: {
+                        enable: true,
+                        idKey: "zt_id",
+                        pIdKey: "zt_pId",
+
+                    }
+                },
+                callback: {
+				    beforeDrag: self.beforeDrag,
+				    beforeDrop: self.beforeDrop,
+                    onDrop: self.onDrop,
+                    onClick: self.zTreeOnClick,
+                    onCollapse: self.onCollapse,
+				    onExpand: self.onExpand,
+                    beforeCollapse: self.beforeCollapse,
+                    beforeEditName: self.beforeEditName,
+                    onRename: self.OnRename,
+
+			    }
+            };
+
+            if (data)
+                this.records = data;
+
+
+            // this.ztree_field = data.ztree_field;
+            // this.ztree_model = data.ztree_model;
+            // this.ztree_parent_key = data.ztree_parent_key;
+            // this.ztree_domain = data.ztree_domain;
+            // this.ztree_context = data.ztree_context ? data.ztree_context : session.user_context;
+            // this.order = data.order;
+            // this.ztree_selected_id = Number(data.ztree_selected_id);
+            // this.ztree_selected_vals = [];
+            // this.ztree_with_sub_node = data.ztree_with_sub_node;
+            // this.ztree_index = data.ztree_index;
+            // this.ztree_add_show_all = data.ztree_add_show_all;
+            // this.ztree_expend_level = data.ztree_expend_level >= 0 ? Number(data.ztree_expend_level) : 3;
+            // this.limit = data.limit > 0 ? data.limit : 160;
+            // this.ztree_id = 'ztree-' + this.guid();
+            // this.ztree_type = data.ztree_type;
+        },
+
+        getFont: function (treeId, node) {
+
+            //Task have subtask
+             if (node['subtask_count']){
+                return {'font-weight':'bold'}
+            }else{
+                return {}
+             }
+
+		},
+
+
+        showRenameBtn: function (treeId, treeNode) {
+			return !treeNode.is_group;
+
+		},
+        beforeEditName: function (treeId, treeNode) {
+
+            var check_field = ["name"];
+            var self = treeNode.widget;
+            var parent = treeNode.widget_parent;
+
+			var _read_only = NativeGanttData.CheckReadOnly(check_field,  parent.fields, treeNode);
+			var check_readonly = _.findWhere(_read_only,{readonly: true});
+
+			if (check_readonly){
+
+			    self.trigger_up('warning', {
+                    title: _t('Try update'),
+                    message: _.str.sprintf(_t("You are trying to edit on a read-only field! : '%s' "),check_readonly["field"])
+                });
+
+                return false;
+            }
+        },
+
+
+        OnRename: function(event, treeId, treeNode, isCancel) {
+
+            var self = treeNode.widget;
+
+            if (!isCancel){
+
+
+                var parent = treeNode.widget_parent;
+                var r_id = treeNode.id;
+
+                // if (treeNode.is_group && treeNode.group_id){
+                //     r_id = treeNode.group_id[0];
+                // }
+
+                var data = {};
+
+                data["name"] = treeNode.value_name;
+
+                parent._rpc({
+                    model: parent.state.modelName,
+                    method: 'write',
+                    args: [[r_id], data],
+                    context: parent.state.contexts
+                })
+                .then(function(ev) {
+
+                    self.trigger_up('warning', {
+                        title: _t('Item Data Update'),
+                        message: _t('Data updated : ') + ev
+                    });
+
+                    var match_item = _.find(parent.rows_to_gantt, function(item) { return item.id === treeNode.id });
+                    match_item.value_name = treeNode.value_name;
+
+                    if (treeNode.on_gantt){
+                        parent.trigger_up('gantt_fast_refresh_after_change');
+                    }
+
+
+
+                });
+            }else{
+
+                self.$zTree.cancelEditName();
+
+
+            }
+
+
+            // parent.trigger_up('gantt_fast_refresh_after_change');
+
+        },
+
+
+
+		beforeCollapse: function (treeId, treeNode) {
+
+            var collaplse = treeNode.collapse;
+
+            // if (!treeNode.widget.tree_view){
+            //     collaplse = false;
+            // }
+
+			return (collaplse !== false);
+		},
+
+
+        getChildNodes: function getChildNodes(treeNode) {
+            var childNodes = this.$zTree.transformToArray(treeNode);
+            var nodes = [];
+
+             _.each(childNodes, function (child) {
+
+                 if (treeNode.zt_id !== child.zt_id) {
+                     nodes.push(child)
+                 }
+             });
+
+            return nodes
+        },
+
+
+        fold_bar: function(node, childs, fold){
+            var self = this;
+
+            _.each(childs, function (child) {
+                var match_task_id = _.find(self.parent.rows_to_gantt, function(item) { return item.id === child.id });
+
+                match_task_id.fold = fold;
+                child.fold = fold;
+
+
+            });
+
+            self.parent.trigger_up('gantt_fast_refresh_after_change');
+
+
+            if (node.widget.tree_view){
+
+                var fold_dic = {};
+
+                if (node["id"]) {
+                    fold_dic[node["id"]] = fold;
+
+                    var parent = self.parent;
+                    var task_model = parent.state.modelName;
+
+                     parent._rpc({
+                            model: task_model,
+                            method: 'fold_update',
+                            args: [fold_dic],
+                            context: parent.state.contexts
+                        })
+                        .then(function(ev) {
+                            // parent.trigger_up('warning', {
+                            //     title: _t('Tree Data Update'),
+                            //     message: _t('Data updated : ') + ev
+                            // });
+                     });
+
+                }
+
+            }
+
+
+        },
+
+
+        onCollapse: function(event, treeId, treeNode) {
+
+
+            var self = this;
+
+            var widget = treeNode.widget;
+            var zTree = widget.$zTree;
+
+            var node = zTree.getNodeByTId(treeNode.tId);
+
+            var childs =  treeNode.widget.getChildNodes(node);
+
+            // console.log(lch);
+
+            widget.fold_bar(node, childs, true)
+
+
+        },
+
+        onExpand: function (event, treeId, treeNode) {
+
+            var widget = treeNode.widget;
+            var zTree = widget.$zTree;
+            // var zTree = $.fn.zTree.getZTreeObj("treeGantt");
+
+            var node = zTree.getNodeByTId(treeNode.tId);
+
+            var childs =  treeNode.widget.getChildNodes(node);
+
+            // console.log(lch)
+
+             widget.fold_bar(node, childs, false)
+        },
+
+
+
+
+        addHoverDom: function (treeId, treeNode) {
+
+            var widget = treeNode.widget;
+
+            treeNode.widget_parent.trigger_up('gantt_add_hover', {
+                data_id: treeNode.id
+            });
+
+
+
+
+            //              if (this.record.group_field === self.action_menu){
+            //
+            //     var first_bar = $('<div class="task-gantt-item-info" style="float: right;"/>');
+            //
+            //
+            //
+            //      // this.$el.append('<div class="task-gantt-item-info" style="float: right;">'+duration_humanize+'</div>');
+            //
+            //     first_bar.append('<span class="task-gantt-plus"><i class="fa fa-plus fa-1x"></i></span>');
+            //     first_bar.append('<span class="task-gantt-refresh"><i class="fa fa-refresh fa-1x"></i></span>');
+            //
+            //     if (self.export_wizard){
+            //         first_bar.append('<span class="task-gantt-wizard"><i class="fa fa-arrow-right fa-arrow-click fa-1x"></i></span>');
+            //     }
+            //
+            //     // first_bar.append('<span class="task-gantt-critical"><i class="fa fa-line-chart fa-1x"></i></span>');
+            //     this.$el.append(first_bar);
+            // }
+
+
+
+
+                 if (!$(".item-button_" + treeNode.tId).length) {
+
+                     var aObj = $("#" + treeNode.tId + "_a");
+
+                     if (widget.tree_view ) {
+
+                         //add
+                         var add_bar = $('<span class="button custom task-gantt-add"/>');
+                         add_bar.addClass("item-button_" + treeNode.tId);
+                         add_bar.append('<i class="fa fa-plus fa-1x"></i>');
+                         add_bar.attr("title", "Add Record");
+                         aObj.append(add_bar);
+                     }
+
+
+
+                     if (treeNode.group_field && treeNode.group_field === widget.action_menu) {
+
+
+                        //  //Refresh
+                        //  var refresh_bar = $('<span class="button custom task-gantt-refresh"/>');
+                        //  refresh_bar.addClass("item-button_" + treeNode.tId);
+                        //  refresh_bar.append('<i class="fa fa-refresh fa-1x"></i>');
+                        //   refresh_bar.attr("title", "Rescheduling");
+                        //  aObj.append(refresh_bar);
+
+
+                         //Export
+                         if (widget.export_wizard){
+                             var export_bar = $('<span class="button custom task-gantt-wizard"/>');
+                             export_bar.addClass("item-button_" + treeNode.tId);
+                             export_bar.append('<i class="fa fa-arrow-right fa-arrow-click fa-1x"></i>');
+                             export_bar.attr("title", "Record to PDF");
+                             aObj.append(export_bar);
+                         }
+
+                     }
+
+
+             }
+
+        },
+
+        removeHoverDom: function (treeId, treeNode) {
+
+            treeNode.widget_parent.trigger_up('gantt_remove_hover', {
+                    treeNode: treeNode,
+                    treeId: treeId,
+                    data_id: treeNode.id
+                });
+
+            $(".item-button_" + treeNode.tId).remove();
+
+        },
+
+
+        open_record: async function (event, options) {
+
+            var self = this.__parentedParent;
+            var res_id = false;
+            var res_model = false;
+            var res_open = false;
+            var start_date = false;
+            var readonly = false;
+
+            if (event.data.is_group === false && event.data.id) {
+
+                res_id = event.data.id;
+                res_model = this.__parentedParent.state.modelName;
+                this.open_form(self, res_id, res_model)
+
+            } else if (event.data.is_group){
+                self = this;
+                res_id = event.data.group_id;
+                let name_model = this.__parentedParent.state.modelName;
+                let name_field = event.data.group_field
+
+                res_model = await this.__parentedParent._rpc({
+                    model: 'gantt.native.tool',
+                    method: 'open_model',
+                    args: [name_model, name_field],
+                    context: self.__parentedParent.state.contexts
+                })
+                    .then(function(data) {
+                        if (data === "project.project"){
+                            readonly = false
+                        }
+                        self.open_form(self, res_id, res_model = data, event.data.is_group, readonly)
+                    });
+            }
+
+
+
+        },
+
+
+        open_form: function(parent, res_id, res_model, is_group, readonly = false) {
+
+            this.remember_position(this.__parentedParent, res_id)
+            if (res_model){
+
+                var buttons = [
+
+                    {
+                        text: _lt("Delete"),
+                        classes: 'btn-default',
+                        close: true,
+                        click: function () {
+
+                            parent._rpc({
+                                model: res_model,
+                                method: 'unlink',
+                                args: [res_id],
+                            })
+                                .then(function (ev) {
+                                    parent.trigger_up('gantt_refresh_after_change', ev);
+                                });
+
+                        }
+                    },
+
+                    {
+                        text: _lt("Close"),
+                        classes: 'btn-default',
+                        close: true,
+                        click: function () {
+                            parent.trigger_up('gantt_refresh_after_change')
+                        }
+                    }
+                ];
+
+                if (!is_group) {
+                        let edit_button = {
+                            text: _t("Edit in Form View"),
+                            classes: 'btn-primary',
+                            close: true,
+                            click: function () {
+                                parent.trigger_up('open_record', {res_id: res_id, mode: "edit", model: res_model});
+                            }
+
+                        }
+
+                        buttons.push(edit_button)
+                }
+
+
+
+
+
+
+
+
+
+                let form_dialog = new view_dialogs.FormViewDialog(this.__parentedParent, {
+
+                    size: 'large',
+                    res_model: res_model,
+                    res_id: res_id,
+                    // view_id: view_id,
+                    context: this.__parentedParent.state.contexts,
+                    readonly: readonly,
+                    on_saved: this.trigger_up.bind(this, 'gantt_refresh_after_change'),
+
+                });
+
+                form_dialog.buttons = form_dialog.buttons.concat(buttons);
+                form_dialog.open();
+
+            } else{
+                this.__parentedParent.do_warn("Gannt: Open Only - Relation Field");
+            }
+
+
+        },
+
+        remember_position: function(parent ,res_id){
+
+            var self = parent;
+
+            var rowdata = '#task-gantt-timeline-row-' + res_id;
+            var rowitem = '#task-gantt-item-' + res_id;
+
+            $(rowdata).addClass("task-gantt-timeline-row-hover");
+            $(rowitem).addClass("task-gantt-item-hover");
+
+            self.hover_id = res_id;
+
+            self.TimeToLeft = $('.task-gantt-timeline').scrollLeft();
+            self.ScrollToTop = $('.task-gantt').scrollTop();
+
+        },
+
+
+
+
+        edit_record: function (event) {
+            this.open_record(event, {mode: 'edit'});
+        },
+
+
+        zTreeOnClick: function(ev, treeId, treeNode) {
+
+            //alert(treeNode.tId + ", " + treeNode.zt_id);
+
+            //Scheduling action
+            var is_group = treeNode.is_group || false;
+            var group_id = false;
+            var group_field = false;
+
+
+            //Edit Task
+            if ($(ev.target).hasClass("node_name" )) {
+
+                if (is_group) {
+
+                    group_id = treeNode.group_id[0];
+                    group_field = treeNode.group_field;
+                }
+
+                treeNode.widget.trigger_up('item_record_edit', {
+                    id: treeNode.id,
+                    is_group: is_group,
+                    group_id: group_id,
+                    group_field: group_field,
+                    start_date: treeNode.start_date
+
+                });
+
+            }
+
+
+
+            //Resechuling
+            if ($(ev.target).hasClass("fa-refresh")) {
+
+                if (is_group) {
+                    group_id = treeNode.group_id[0];
+                    group_field = treeNode.group_field;
+                }
+
+                treeNode.widget.trigger_up('item_plan_action', {
+                    id: treeNode.id,
+                    is_group: is_group,
+                    group_id: group_id,
+                    group_field: group_field,
+                    start_date: treeNode.start_date
+                });
+            }
+
+
+            //Wizard export
+            if ($(ev.target).hasClass("fa-arrow-click" )) {
+
+                if (is_group) {
+
+                    group_id = treeNode.group_id[0];
+                    group_field = treeNode.group_field;
+                }
+
+               treeNode.widget.trigger_up('item_export_wizard', {
+                   id: treeNode.id,
+                   is_group: is_group,
+                   group_id: group_id,
+                   group_field: group_field,
+                   exoprt_wizard: treeNode.widget.export_wizard,
+               });
+
+            }
+
+
+            //Add Task
+            if ($(ev.target).hasClass("fa-plus")) {
+
+                // var is_group = match_node.is_group || false;
+
+                var parent_id = false;
+                var project_id = false;
+
+                if (is_group) {
+                    project_id = treeNode.group_id[0];
+                }
+                else{
+                    parent_id = treeNode.id;
+                    project_id = treeNode.subtask_project_id[0]
+                }
+
+                if (project_id){
+
+                    treeNode.widget.trigger_up('item_record_add', {
+                        project_id: project_id,
+                        parent_id: parent_id,
+                    });
+
+                }else{
+                    treeNode.widget.trigger_up('warning', {
+                        title: _t('Ops'),
+                        message: _.str.sprintf(_t("You are trying add task to not select Project!"))
+                    });
+                }
+
+            }
+
+        },
+
+
+        beforeDrag: function (treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+        beforeDrop: function (treeId, treeNodes, targetNode, moveType) {
+
+            var result = false;
+
+            // if (targetNode.parentTId !== treeNodes[0].parentTId){
+            //     return result
+            // }
+
+            if (targetNode && targetNode.drop !== false) {
+                result = true;
+            }
+            return result
+        },
+
+
+		onDrop: function (ev, treeId, treeNodes, targetNode, moveType) {
+
+            var self = this;
+            var result = false;
+            if (targetNode && targetNode.drop !== false){
+
+                var treeNode = treeNodes[0];
+
+
+                //if (child['isParent']) {
+                //     aObj.addClass("task-gantt-items-subtask")
+                // }
+
+                var zTree = targetNode.widget.$zTree;
+
+                var nodes = zTree.getNodes();
+
+                var match_task = undefined;
+                var zt_pId = undefined;
+
+                if (moveType === "inner"){
+
+                    match_task = zTree.getNodeByParam('id', treeNode.id);
+                    match_task.plan_action = 1;
+                    zt_pId = targetNode.zt_id;
+                }
+
+                if (moveType === "next" || moveType === "prev"){
+
+                    // if (targetNode.is_group){
+                    //     targetNode.widget_parent.trigger_up('gantt_refresh_after_change');
+                    //     return false
+                    // }
+
+                    match_task = zTree.getNodeByParam('id', treeNode.id);
+                    match_task.plan_action = 1;
+                    zt_pId = targetNode.zt_pId
+
+                }
+                // console.log(moveType);
+
+
+                var rows_to_gantt = [];
+
+                _.each(nodes, function (node) {
+
+                    var childNodes = zTree.transformToArray(node);
+
+                    _.each(childNodes, function (child) {
+
+                        var root_node_select =  "root_"+treeNode.subtask_project_id[0]+"_"+treeNode.subtask_project_id[1];
+
+                        if (root_node_select  === node.zt_id){
+
+                            if (child.isParent){
+                                child.fontCss = {'font-weight':'bold'}
+                            }else{
+                                child.fontCss = {}
+                            }
+
+
+
+                            var for_update = {
+                                "id": child.id,
+                                "plan_action": child.plan_action,
+                                "is_group": child.is_group,
+                                "sorting_level": child.level
+                            };
+                            rows_to_gantt.push(for_update)
+                        }
+
+                    });
+
+                });
+
+
+                if (match_task){
+
+                    var parent = targetNode.widget_parent;
+                    var task_model = parent.state.modelName;
+
+                     parent._rpc({
+                            model: task_model,
+                            method: 'tree_update',
+                            args: [rows_to_gantt, treeNode.zt_id, zt_pId],
+                            context: parent.state.contexts
+                        })
+                        .then(function(ev) {
+                            parent.trigger_up('warning', {
+                                title: _t('Tree Data Update'),
+                                message: _t('Data updated : ') + ev
+                            });
+                     });
+
+                }
+
+                targetNode.widget_parent.trigger_up('gantt_fast_refresh_after_change');
+
+                result = true;
+            }
+
+            return result;
+
+		},
+
+
+        plan_action: function(event) {
+
+            if (event.data.is_group && event.data.group_field === 'project_id') {
+                var self = this.__parentedParent;
+
+                var  res_id = event.data.group_id;
+
+                var  res_model = 'project.task';
+                framework.blockUI();
+
+                self._rpc({
+                        model: res_model,
+                        method: 'scheduler_plan',
+                        args: [res_id],
+                        context: self.state.contexts
+                    })
+                    .then(function(ev) {
+                        framework.unblockUI();
+                        self.trigger_up('gantt_refresh_after_change',ev );
+                });
+            }
+        },
+
+        // _start: async function() {
+        //
+        // },
+
+        start: async function () {
+            var self = this;
+            this._super.apply(this, arguments);
+
+            if (this.parent.fast_update) {
+                this.$zTree = this.parent.$zTree
+                this.parent.fast_update = false;
+            }
+
+
+            if (!this.$zTree) {
+
+                _.each(this.records, function (record) {
+                    record["open"] = !record["fold"]
+                });
+
+
+
+                let $zTree = $.fn.zTree.init(this.$el.find("#treeGantt"), this.setting, this.records);
+
+                this.$zTree = $zTree;
+                this.parent.$zTree = $zTree;
+                // this.parent.widget_ztree.$zTree = $zTree;
+
+
+                var nodes = $zTree.getNodes();
+
+                 _.each(nodes, function (node) {
+
+                    if (typeof(node["fold"]) != 'undefined' && node["fold"] != null) {
+
+                        // if (!node["fold"]){
+                        //     self.$zTree.expandNode(node, true, true, true);
+                        // }
+
+                    }else{
+                        $zTree.expandAll(true);
+                    }
+
+
+                     var childNodes = $zTree.transformToArray(node);
+
+
+                     _.each(childNodes, function (child) {
+
+                         var nnode = $zTree.getNodeByTId(child.tId);
+                         var nchildren = nnode.children;
+
+                         _.each(nchildren, function (nchild) {
+                                nchild["fold"] = !child["open"]
+                         });
+
+                         var aObj = self.$el.find("#" + child.tId + "_a");
+                         aObj.addClass("task-gantt-item-"  + child.zt_id + "");
+                         aObj.addClass("task-gantt-item");
+                         aObj.prop('data-id', child.zt_id);
+
+                         child["widget_parent"] = self.parent;
+                         child["widget"] = self;
+
+                         if (child["is_group"]) {
+                             aObj.addClass("task-gantt-items-group");
+                             aObj.css({'background-color':  "rgba(40, 95, 143, 0.10)"});
+                         }
+
+                         if (child["is_group"] && child["level"] === 0) {
+                             aObj.css({'background-color':  "beige"});
+                         }
+
+                     })
+
+                 });
+
+
+
+            }
+            else{
+                // this.$zTree = this.parent.$zTree;
+                // this.parent.widget_ztree.$zTree = this.parent.$zTree;
+            }
+            // return this._super.apply(this, arguments);
+            // return Promise.all([this._super.apply(this, arguments), this._start()]);
+        },
+
+
+        add_record: function(event){
+
+            var context = this.__parentedParent.state.contexts;
+            var self = this.__parentedParent;
+
+            context['default_project_id'] = event.data.project_id || false;
+            context['default_parent_id'] = event.data.parent_id || false;
+
+
+            self.TimeToLeft = $('.task-gantt-timeline').scrollLeft();
+            self.ScrollToTop = $('.task-gantt').scrollTop();
+
+
+            var pop = new dialogs.FormViewDialog(self, {
+                res_model: 'project.task',
+                res_id: false,
+                context: context,
+                title: _t("Please Select Project First For Task"),
+                on_saved: function () {
+                    self.trigger_up('gantt_refresh_after_change' )
+                    },
+            }).open();
+
+        },
+
+
+        open_export_wizard: function(event){
+
+            var self = this;
+            var context = this.__parentedParent.state.contexts;
+            var parent_app = this.__parentedParent;
+
+            var time_type = parent_app.timeType;
+
+            var group_id = event.data["group_id"];
+            var group_field = event.data["group_field"];
+            context['default_group_id'] = group_id || false;
+            context['default_'+group_field] = group_id || false;
+            context['time_type'] = time_type || false;
+
+            var res_model = event.data["exoprt_wizard"];
+
+            parent_app._rpc({
+                model: 'gantt.native.tool',
+                method: 'exist_model',
+                args: ['project_native_report_advance'],
+                context: parent_app.state.contexts
+            }).then(function(data) {
+                self.export_open(parent_app, res_model, context)
+            });
+
+
+            // var pop = new dialogs.FormViewDialog(this.__parentedParent, {
+            //     res_model: res_model,
+            //     res_id: false,
+            //     context: context,
+            //     title: _t("PDF Report for Project"),
+            // }).open();
+
+        },
+
+        export_open: function(parent, res_model, context) {
+
+            new dialogs.FormViewDialog(parent, {
+                res_model: res_model,
+                res_id: false,
+                context: context,
+                title: _t("PDF Report for Project"),
+            }).open();
+        }
+
+
+
+    });
+
+    return ItemzTree
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_pager.js b/odex25_project/web_gantt_native/static/src/js/gantt_pager.js
new file mode 100644
index 000000000..0c3d9a5d9
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_pager.js
@@ -0,0 +1,165 @@
+odoo.define('web_gantt_native.Pager', function (require) {
+"use strict";
+
+
+var Widget = require('web.Widget');
+
+
+var GanttPager = Widget.extend({
+    template: "GanttAPS.Pager",
+    events: {
+        'click .o_pager_limit': '_onEdit',
+    },
+
+    init: function (parent, size, limit) {
+        this.state = {
+            size: size,
+            limit: limit
+        };
+
+
+        // this.options = _.defaults({}, options, {
+        //     can_edit: true, // editable
+        //     single_page_hidden: false, // displayed even if there is a single page
+        //     validate: function() {
+        //         return $.Deferred().resolve();
+        //     },
+        //
+        // });
+
+
+        this._super(parent);
+    },
+
+    start: function () {
+        this.$size = this.$('.o_pager_size');
+        this.$limit = this.$('.o_pager_limit');
+        this.$info = this.$('.gantt_pager_info');
+
+        this._render();
+        return this._super();
+    },
+
+    refresh: function (size, limit) {
+
+        this.state.size = size;
+        this.state.limit = limit;
+        this._render()
+    },
+
+
+    //--------------------------------------------------------------------------
+    // Public
+    //--------------------------------------------------------------------------
+
+    disable: function () {
+        this.disabled = true;
+    },
+
+    enable: function () {
+        this.disabled = false;
+    },
+
+
+    updateState: function (state, options) {
+        _.extend(this.state, state);
+        this._render();
+        // if (options && options.notifyChange) {
+            this.trigger('pager_changed', _.clone(this.state));
+        // }
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _edit: function () {
+        // if (this.options.can_edit) {
+            var self = this;
+            var $input = $('<input>', {class: 'o_input', type: 'text', value: this.$limit.html()});
+            $input.css({'width': 45 + "px"});
+            this.$info.css('display','none');
+            this.$limit.html($input);
+            $input.focus();
+
+            // Event handlers
+            $input.click(function(ev) {
+                ev.stopPropagation(); // ignore clicks on the input
+            });
+            $input.blur(function(ev) {
+                self._save($(ev.target)); // save the state when leaving the input
+            });
+            $input.on('keydown', function (ev) {
+                ev.stopPropagation();
+                if (ev.which === $.ui.keyCode.ENTER) {
+                    self._save($(ev.target)); // save on enter
+                } else if (ev.which === $.ui.keyCode.ESCAPE) {
+                    self._render(); // leave on escape
+                }
+            });
+        // }
+    },
+
+    _render: function () {
+        var size = parseInt(this.state.size);
+        var limit = parseInt(this.state.limit);
+
+        this.do_show();
+        this.$info.css('display','inline');
+
+        this.$size.css('color','green');
+
+        if (limit !== 0){
+            if (size > limit) {
+                this.$size.css('color','red');
+            }
+        }
+
+        this.$limit.html(limit);
+        this.$size.html(size);
+
+    },
+
+
+    _save: function ($input) {
+        var self = this;
+        // this.options.validate().then(function() {
+        //     var value = $input.val();
+        //
+        //     if (value) {
+        //
+        //         self.state.limit = value;
+        //         self.trigger('pager_changed', _.clone(self.state));
+        //     }
+        // }).always(function() {
+        //     // Render the pager's new state (removes the input)
+        //     self._render();
+        // });
+
+        var value = $input.val();
+
+        if (value) {
+
+            self.state.limit = value;
+            self.trigger('pager_changed', _.clone(self.state));
+        }
+
+    },
+
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    _onEdit: function (event) {
+        event.stopPropagation();
+        if (!this.disabled) {
+            this._edit();
+        }
+    },
+
+});
+
+return GanttPager;
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_arrow.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_arrow.js
new file mode 100644
index 000000000..aaf193eac
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_arrow.js
@@ -0,0 +1,123 @@
+odoo.define('web_gantt_native.TimeLineArrow', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+var ArrowDraw = require('web_gantt_native.TimeLineArrowDraw');
+
+
+
+
+var GanttTimeLineArrow = Widget.extend({
+    template: "GanttTimeLine.arrow",
+
+    init: function(parent, timeline_width) {
+        // this._super(parent);
+        this._super.apply(this, arguments);
+        this.canvas_width = timeline_width;
+    },
+
+
+
+    start: function(){
+
+
+        var parentw =  this.getParent();
+
+        var data_widget =  parentw.gantt_timeline_data_widget;
+
+        var new_data_widget = _.filter(data_widget,
+
+            function(widget){
+
+            if (widget.items_sorted && widget.record.fold){
+                return false
+            }
+            return widget
+
+        });
+
+
+
+         new_data_widget = _.map(new_data_widget, function(widget , key) {
+
+            var task_start_pxscale = 0;
+            var task_stop_pxscale = 0;
+
+            if (!widget.record.is_group) {
+                var task_start_time = widget.record.task_start.getTime();
+                var task_stop_time = widget.record.task_stop.getTime();
+
+                task_start_pxscale = Math.round((task_start_time - parentw.firstDayScale) / parentw.pxScaleUTC);
+                task_stop_pxscale = Math.round((task_stop_time - parentw.firstDayScale) / parentw.pxScaleUTC);
+            }
+
+
+            return {
+
+                 key: key,
+                 y: 30*key,
+                 record_id: widget.record.id,
+                 group: widget.record.is_group,
+                 task_start_pxscale: task_start_pxscale,
+                 task_stop_pxscale: task_stop_pxscale,
+                 fold: widget.record.fold,
+                 critical_path: widget.record.critical_path,
+                 cp_shows: widget.record.cp_shows,
+                 p_loop: widget.record.p_loop,
+
+             }
+
+         });
+
+        new_data_widget = _.compact(new_data_widget);
+        var canvas_height = 30*new_data_widget.length;
+        var canvas_width = this.canvas_width;
+
+        //var myCanvas = $('<canvas id="canvas" width="'+canvas_width+'" height="'+canvas_height+'" class="task-gantt-timeline-arrow-canvas"></canvas>');
+
+        var GanttDrawLink = $('<div id="gantt_draw_timeline_link" class="task-gantt-timeline-arrow-canvas"></div>');
+        GanttDrawLink.css({'width': canvas_width + "px"});
+        GanttDrawLink.css({'height': canvas_height + "px"});
+
+        var self = this;
+        var el = self.$el;
+
+
+
+
+        var predecessors = parentw.Predecessor;
+
+        _.each(predecessors, function(predecessor , key){
+
+
+            var to = predecessor.task_id[0];
+            var from = predecessor.parent_task_id[0];
+
+            var from_obj = _.findWhere(new_data_widget, {record_id: from});
+            var to_obj = _.findWhere(new_data_widget, {record_id: to});
+
+            if (from_obj == null || to_obj == null){
+
+                return false
+            }
+
+            var GanttTimelineLink = $('<div class="gantt_timeline_link" id="gantt_timeline_link-'+predecessor["id"]+'" ></div>');
+
+
+            _.each(ArrowDraw.drawLink(from_obj, to_obj, predecessor.type), function(line){
+                    GanttTimelineLink.append(line);
+            });
+
+            GanttDrawLink.append(GanttTimelineLink);
+            el.append(GanttDrawLink);
+
+        })
+
+    },
+
+
+});
+
+return GanttTimeLineArrow;
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_arrow_draw.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_arrow_draw.js
new file mode 100644
index 000000000..3e11bfcfa
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_arrow_draw.js
@@ -0,0 +1,596 @@
+odoo.define('web_gantt_native.TimeLineArrowDraw', function (require) {
+    "use strict";
+
+
+    function LinkWrapper (prop) {
+
+        var LinkWrapper = $('<div class="gantt_timeline_link_wrapper" class="gantt_timeline_link_wrapper_'+prop.dir+'"></div>');
+            LinkWrapper.css({'top': prop.top + "px"});
+            LinkWrapper.css({'left': prop.left + "px"});
+            LinkWrapper.css({'width': prop.width + "px"});
+            LinkWrapper.css({'height': prop.height + "px"});
+
+            if (prop["align_center"]){
+                LinkWrapper.css({'text-align': "center"});
+                prop.left = prop.left-2;
+            }
+
+            if (prop["align"]){
+                 LinkWrapper.css({'text-align': "left"});
+            }
+
+            if ( !prop["align_center"]  && !prop.align && prop.critical_path){
+
+                    LinkWrapper.css({'box-shadow': "0 0 2px 1px #b4aaaa6e"});
+            }
+
+            LinkWrapper.css({'left': prop.left + "px"});
+            return LinkWrapper
+
+    }
+
+    function LinkCircle (path) {
+
+        var cycleL = $('<i class="fa fa-circle" style="font-size: 8px;"></i>');
+        cycleL.css({'vertical-align': 4 +"px"});
+
+
+
+        if (path.critical_path){
+            cycleL.css({'color': '#f36952'});
+        }else{
+            cycleL.css({'color': path.color});
+        }
+
+
+        return cycleL;
+    }
+
+    function LinkLine (prop, type ) {
+
+        var Px = $('<div class="gantt_timeline_link_'+prop.dir+'"></div>');
+
+        Px.css({'background-color': prop.color});
+        Px.css({'width': prop.width + "px"});
+        Px.css({'height': prop.height + "px"});
+
+            // if (prop.critical_path){
+            //     Px.css({'box-shadow': "0 0 2px 1px #f30b0b6e"});
+            // }
+        if (prop.mark) {
+            var P_type = $('<div class="gantt_timeline_link_type"></div>');
+
+            if (prop.p_loop){
+                P_type.addClass("fa fa-undo");
+                P_type.css({'color': '#f39a27'});
+
+            }
+            else{
+                // P_type.text(prop.type);
+                P_type.css({'color': prop.color});
+            }
+
+            Px.append(P_type);
+        }
+
+        return Px
+    }
+
+    function LinkArrow (path) {
+
+        var caret = $('<i class="fa fa-caret-'+path.dir+'" style="font-size: 12px;"></i>');
+        caret.css({'vertical-align': 1 +"px"});
+
+        if (path.critical_path){
+            caret.css({'color': '#f36952'});
+        }else{
+            caret.css({'color': path.color});
+        }
+
+        return caret
+    }
+
+    function LinkStartPoint (prop) {
+
+        var path = {"top": 0, "left": 0, "width": 0, "height": 0, "color": prop.color, "type": prop.type, "dir": 0,
+        "align_center" : 1};
+
+        path.critical_path = prop.critical_path;
+        path.width = 8;
+        path.height = 16;
+        path.dir = "S1";
+        path.top = prop.from_obj_top + path.width/2 + 2;
+
+        if (prop.type === "FF" || prop.type === "FS") {
+            path.left = prop.from_obj_left + prop.margin_stop+2;
+        }
+
+        if (prop.type === "SS" || prop.type === "SF") {
+            path.left = prop.from_obj_left - prop.margin_start;
+        }
+
+        return path;
+
+    }
+
+    function LinkEndPoint(prop) {
+
+        var path = {"top": 0, "left": 0, "width": 0, "height": 0, "color": prop.color, "type": prop.type, "dir": 0,
+        "align_center" : 0, "dirY": prop.directionY, "critical_path": prop.critical_path };
+
+
+        if (prop.type === "FF" || prop.type === "SF") {
+
+            path.left = prop.to_obj_left + prop.margin_stop + 7;
+            path.width = 10;
+            path.height = 16;
+            path.align = 1;
+            path.dir = "left";
+
+            if (prop.directionY === "up") {
+                path.top = prop.to_obj_top+prop.margin_arrow_down;
+            }
+            if (prop.directionY === "down") {
+                path.top = prop.to_obj_top+prop.margin_arrow_top;
+            }
+
+        }
+
+
+        if (prop.type === "SS" || prop.type === "FS") {
+
+            path.top = prop.to_obj_top;
+            path.left = prop.to_obj_left - prop.margin_start -7;
+            path.width = 10;
+            path.height = 16;
+            path.dir = "right";
+            path.align = 1;
+
+            if (prop.directionY === "up") {
+                   path.top = prop.to_obj_top+prop.margin_arrow_down;
+            }
+            if (prop.directionY === "down") {
+                   path.top = prop.to_obj_top+prop.margin_arrow_top;
+            }
+        }
+
+
+
+
+        return path;
+
+    }
+
+    function CalcStep(prop, from, to) {
+
+        var step = undefined;
+
+        if (to.top < from.top){
+            //go up
+            if (to.left - from.left > 10){
+                //go right
+                if (prop.type === "SS")  {
+                    step = ["up", "right"];
+                }
+
+                if (prop.type === "SF")  {
+                    step = ["up", "right", "up", "left"];
+                }
+
+                if (prop.type === "FS") {
+                    step = ["up", "right"];
+                }
+
+
+            }
+
+            else{
+                //go left
+
+                if (prop.type === "SS")  {
+                    step = ["up", "left", "up", "right"];
+                }
+
+                if (prop.type === "SF")  {
+                    step = ["up", "left"];
+                }
+
+                if (prop.type === "FS") {
+                    step = ["up", "left","up", "right"];
+                }
+
+
+            }
+
+
+             if (to.left > from.left ) {
+
+
+                 if (prop.type === "FF") {
+                     step = ["up", "right", "up", "left"];
+                 }
+             }else{
+
+                 if (prop.type === "FF") {
+                     step = ["up", "left"];
+                 }
+             }
+
+            // if (to.left === from.left){
+            //     step = ["up"];
+            // }
+        }
+
+        if (to.top > from.top ){
+            //go down
+            if (to.left > from.left){
+                //go right
+
+                if (prop.type === "SS")  {
+                    step = ["down", "right"];
+                }
+
+                if (prop.type === "SF")  {
+                    step = ["down", "right", "down", "left"];
+                }
+
+
+                if (prop.type === "FS") {
+                    step = ["down", "right"];
+                }
+                if (prop.type === "FF") {
+                    step = ["down", "right", "down", "left"];
+                }
+            }
+
+            else{
+                //go left
+
+                if (prop.type === "SS")  {
+                    step = ["down", "left", "down", "right"];
+                }
+
+                if (prop.type === "SF")  {
+                    step = ["down", "left"];
+                }
+
+                if (prop.type === "FS") {
+                    step = ["down", "left","down", "right"];
+                }
+                if (prop.type === "FF") {
+                    step = ["down", "left"];
+                }
+
+            }
+        }
+
+        return step;
+
+    }
+
+    function CalcPath(prop, from, to, dir, step, mark) {
+
+         var path = {"top": 0, "left": 0, "width": 0, "height": 0, "color": prop.color, "type": prop.type, "dir": 0,
+        "align_center" : 0, "mark" : mark};
+
+         path.critical_path = prop.critical_path;
+         path.p_loop = prop.p_loop;
+
+
+         if (path.critical_path){
+             path.color = '#f36952';
+             // prop.color = '#9a0b02';
+         }
+
+         // var margin_to_top = 10;
+        var k_lft = 4;
+
+        if (dir === "up"){
+
+            if (to) {
+
+                if (step === 0) {
+                    path.top = to.top + 7;
+                    path.left = from.left + 3;
+                    path.height = (from.top - path.top) + 4;
+                } else{
+
+                    path.top = to.top+7;
+                    path.left = to.left - 7;
+                    if (prop.type === "FF" || prop.type === "SF"){
+                        path.left = to.left + 10;
+                    }
+
+                    path.height = (from.top - path.top) + 2;
+                }
+
+                path.width = prop.line_size;
+
+            } else{
+
+                path.top = from.top - 10;
+                path.left = from.left + 3;
+                path.width = prop.line_size;
+                path.height = 20;
+
+            }
+        }
+
+        if (dir === "down"){
+
+            if (to) {
+
+                if (step === 0) {
+                    path.top = from.top+10;
+                    path.left = from.left + 3;
+
+                    path.height = (to.top - path.top) + 7;
+                } else{
+                    path.top = from.top;
+                    path.left = to.left - 7;
+                    if (prop.type === "FF" || prop.type === "SF"){
+                        path.left = to.left + 10;
+                    }
+
+                    path.height = (to.top - path.top) + 7;
+                }
+
+                path.width =  prop.line_size;
+
+
+            } else{
+                path.top = from.top+10;
+                path.left = from.left+ 3;
+                path.width = prop.line_size;
+                path.height =  10;
+            }
+
+
+
+
+        }
+
+
+        if (dir === "right"){
+
+            if (to) {
+                path.top = from.top;
+                if (prop.directionY === "down") {
+                    path.top = from.top + from.height;
+                }
+
+
+                path.left = from.left;
+
+
+                if (step === 0){
+                    path.width = (to.left - from.left);
+                } else{
+                    path.width = (to.left - from.left) + 10;
+                }
+
+                if (path.width < 0) {
+                    path.width = 0
+                }
+
+
+                path.height = prop.line_size;
+
+
+            }
+
+        }
+
+
+        if (dir === "left"){
+
+
+            if (to) {
+
+                path.top = from.top;
+                if (prop.directionY === "down") {
+                    path.top = from.top + from.height;
+                }
+
+
+                path.left = to.left - 7;
+                if (prop.type === "FF" || prop.type === "SF"){
+                    path.left = to.left + 10;
+                }
+                if (step === 0){
+                    path.left = to.left;
+                }
+
+
+                path.width = (from.left - path.left) + 2;
+                path.height = prop.line_size;
+
+            }
+            else{
+                path.top = from.top+5;
+                path.left =  from.left + k_lft;
+                path.width = prop.line_size;
+                path.height =  10;
+            }
+
+
+
+
+        }
+
+        return path;
+
+    }
+
+
+    function drawLink (from_obj, to_obj, type) {
+
+        //FS
+        var prop = {
+            "from_obj_left": 0,
+
+            "to_obj_left": 0,
+
+            "to_obj_top": 0,
+            "from_obj_top": 0,
+
+            "link_dif": 0,
+            "color": 0,
+            "directionX" : 0,
+            "directionY" : 0,
+            "type": type
+        };
+
+        if (type === "FS") {
+            prop.from_obj_left = from_obj.task_stop_pxscale;
+            prop.to_obj_left = to_obj.task_start_pxscale;
+
+            prop.to_obj_top = to_obj.y;
+            prop.from_obj_top = from_obj.y;
+
+            prop.link_dif = 55;
+            prop.color = '#7a7a7a';
+
+        }
+
+        //SS
+        if (type === "SS") {
+            prop.from_obj_left = from_obj.task_start_pxscale;
+            prop.to_obj_left = to_obj.task_start_pxscale;
+
+            prop.to_obj_top = to_obj.y;
+            prop.from_obj_top = from_obj.y;
+
+            prop.link_dif = 20;
+
+            prop.color = '#63cbe9';
+        }
+
+        //FF
+        if (type === "FF") {
+            prop.from_obj_left = from_obj.task_stop_pxscale;
+            prop.to_obj_left = to_obj.task_stop_pxscale;
+
+            prop.to_obj_top = to_obj.y;
+            prop.from_obj_top = from_obj.y;
+
+            prop.link_dif = 20;
+
+            prop.color = '#4cd565';
+        }
+
+        //SF
+        if (type === "SF") {
+            prop.from_obj_left = from_obj.task_start_pxscale;
+            prop.to_obj_left = to_obj.task_stop_pxscale;
+
+            prop.to_obj_top = to_obj.y;
+            prop.from_obj_top = from_obj.y;
+
+            prop.link_dif = 20;
+
+            prop.color = '#d08d73';
+        }
+
+        //directionX
+        prop.directionX = "right"; //X = RIGHT
+        if ((prop.to_obj_left - prop.from_obj_left) <= prop.link_dif) { //X = LEFT
+            prop.directionX = "left";
+        }
+
+        //directionY
+        prop.directionY = "up"; //Y = UP
+        if (prop.to_obj_top > prop.from_obj_top) { //Y = DOWN
+            prop.directionY = "down";
+        }
+
+        //Critical path
+        prop.critical_path = undefined;
+        if (from_obj.critical_path && to_obj.critical_path && from_obj.cp_shows){
+
+            prop.critical_path = 1
+        }
+
+        prop.p_loop = undefined;
+        // if (from_obj.p_loop || to_obj.p_loop){
+        //
+        //     prop.p_loop = 1
+        // }
+        if (to_obj.p_loop){
+
+            prop.p_loop = 1
+        }
+
+
+        var LinkWrapperR = [];
+
+        prop["line_size"] = 2;
+        prop["margin_stop"] = 5;
+        prop["margin_start"] = 12;
+        prop["circle_width"] = 8;
+        prop["circle_height"] = 16;
+        prop["margin_arrow_down"] = 5;
+        prop["margin_arrow_top"] = 5;
+
+
+        var s1 = LinkStartPoint(prop);
+        var LinkWrapperS1 = LinkWrapper(s1);
+        var S1_cicrcle = LinkCircle(s1);
+        LinkWrapperS1.append(S1_cicrcle);
+        LinkWrapperR.push(LinkWrapperS1);
+
+        var e1 = LinkEndPoint(prop);
+        var LinkWrapperE1 = LinkWrapper(e1);
+        var E1_arrow = LinkArrow(e1);
+
+        LinkWrapperE1.append(E1_arrow);
+        LinkWrapperR.push(LinkWrapperE1);
+
+        var steps = CalcStep(prop, s1, e1 );
+
+        var paths = [];
+
+        if (steps){
+
+            var steps_i = steps.length;
+
+            if (steps_i === 4){
+
+                paths.push(CalcPath(prop, s1, undefined, steps[0], 0));
+                paths.push(CalcPath(prop, paths[0], e1, steps[1], 1, true));
+                paths.push(CalcPath(prop, paths[1], e1, steps[2], 2));
+                paths.push(CalcPath(prop, paths[2], e1, steps[3], 0));
+            }
+
+            if (steps_i === 3){
+                paths.push(CalcPath(prop, s1, undefined, steps[0], 0));
+                paths.push(CalcPath(prop, paths[0], e1, steps[1], 1, true));
+                paths.push(CalcPath(prop, paths[1], e1, steps[2], 0));
+            }
+
+            if (steps_i === 1){
+                paths.push(CalcPath(prop, s1, e1, steps[0], 0, true));
+            }
+
+            if (steps_i === 2){
+                paths.push(CalcPath(prop, s1, e1, steps[0], 0,true));
+                paths.push(CalcPath(prop, paths[0], e1, steps[1], 0));
+            }
+
+            _.each(paths, function(path) {
+
+                LinkWrapperR.push(LinkWrapper(path).append(LinkLine(path)));
+
+            })
+
+        }
+
+
+        return LinkWrapperR
+
+    }
+
+
+    return {drawLink: drawLink };
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_docs.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_docs.js
new file mode 100644
index 000000000..8204a6534
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_docs.js
@@ -0,0 +1,223 @@
+odoo.define('web_gantt_native.Docs', function (require) {
+"use strict";
+
+
+var Widget = require('web.Widget');
+
+
+
+var GanttTimeLineDocs = Widget.extend({
+    template: "GanttTimeLine.docs",
+
+    init: function(parent) {
+        this._super.apply(this, arguments);
+    },
+
+
+    start: function(){
+
+        var parentg =  this.getParent();
+
+        var data_widgets =  parentg.gantt_timeline_data_widget;
+
+        _.each(data_widgets, function(widget) {
+
+            if (!widget.record.is_group) {
+                
+                var el = undefined;
+                var find_el = undefined;
+                var doc_el = $('<i class="fa fa-paperclip" aria-hidden="false"></i>');
+                var doc_bar = undefined;
+
+                var doc_count = widget.record.doc_count;
+
+                if (doc_count && doc_count.length){
+
+                    if (_.has(widget.bar_widget, "done_slider") && widget.bar_widget.done_slider) {
+
+                        el = widget.bar_widget.done_slider[0];
+                        find_el = $(el).find(".task-gantt-done-info");
+
+
+                        doc_bar = $('<div class="task-gantt-docs task-gantt-docs-slider">');
+                        doc_bar.append(doc_el);
+
+                        if (find_el && find_el.length){
+                            $(find_el).append(doc_bar);
+                        }else{
+                            $(el).append(doc_bar);
+
+                        }
+
+                    } else if (_.has(widget.bar_widget, "deadline_bar") && widget.bar_widget.deadline_bar) {
+
+                        el = widget.bar_widget.deadline_bar[0];
+                        var width = parseInt($(el).css('width'));
+
+                        doc_bar = $('<div class="task-gantt-docs task-gantt-docs-slider">');
+                        doc_bar.append(doc_el);
+
+                        doc_bar.css({"left": width+10 + "px" });
+                        doc_bar.css({"position": "absolute" });
+                        $(el).append(doc_bar);
+
+                    }
+                    else {
+
+                        doc_bar = $('<div class="task-gantt-docs task-gantt-docs-bar">');
+                        doc_bar.append(doc_el);
+
+                        el = widget.$el;
+                        find_el = $(el).find(".task-gantt-bar-plan-info-end");
+                        $(find_el).before(doc_bar);
+                    }
+
+                }
+
+                // var row_id = widget.record.id;
+                // var rowdata = widget.$el;
+                //
+                //  //console.log(widget.$el)
+                //
+                // if (_.has(widget.bar_widget, "done_slider") && widget.bar_widget.done_slider) {
+                //
+                //     var el = widget.bar_widget.done_slider[0];
+                //
+                //
+                //     var fel = $(el).find(".task-gantt-done-info");
+                //     var _bar = $('<div class="task-gantt-docs task-gantt-docs-slider"></div>');
+                //     var doc_bar = $('<i class="fa fa-paperclip" aria-hidden="false"></i>');
+                //     _bar.append(doc_bar);
+                //
+                //     if (fel.length){
+                //          $(fel).append(_bar);
+                //     }else{
+                //         $(el).append(_bar);
+                //
+                //     }
+                //
+                // } else if (_.has(widget.bar_widget, "deadline_bar") && widget.bar_widget.deadline_bar) {
+                //
+                //     var d_el = widget.bar_widget.deadline_bar[0];
+                //
+                //     var width = parseInt($(d_el).css('width'));
+                //
+                //     var d_bar = $('<div class="task-gantt-docs task-gantt-docs-slider"></div>');
+                //     //
+                //     d_bar.css({"left": width+10 + "px" });
+                //     d_bar.css({"position": "absolute" });
+                //
+                //
+                //     var d_doc_bar = $('<i class="fa fa-paperclip" aria-hidden="false"></i>');
+                //     d_bar.append(d_doc_bar);
+                //
+                //     $(d_el).append(d_bar);
+                //
+                //
+                //
+                // }
+                // else{
+                //
+                //     var row_el = widget.$el;
+                //
+                //     var p_el = $(row_el).find(".task-gantt-bar-plan-info-end"); //.task-gantt-bar-plan-info-end //task-gantt-bar-plan
+                //
+                //     var p_bar = $('<div class="task-gantt-docs task-gantt-docs-bar"></div>');
+                //
+                //     var p_doc_bar = $('<i class="fa fa-paperclip" aria-hidden="false"></i>');
+                //     p_bar.append(p_doc_bar);
+                //
+                //     // p_el.before(p_bar);
+                //
+                //
+                //
+                //     var domain = [
+                //         ['res_model', '=', "project.task"],
+                //         ['res_id', '=',  widget.record_id],
+                //         ['type', 'in', ['binary', 'url']]
+                //     ];
+                //     var fields = ['name', 'url', 'type',
+                //         'create_uid', 'create_date', 'write_uid', 'write_date'];
+                //
+                //     parentg._rpc({
+                //         model: 'ir.attachment',
+                //         method: 'search_read',
+                //         context: parentg.state.contexts,
+                //         domain: domain,
+                //         fields: fields,
+                //     }).then(function (result) {
+                //         if (result.length){
+                //             p_el.before(p_bar);
+                //         }
+                //
+                // });
+                //
+                //
+                // }
+
+
+
+                    // <i class="fa fa-paperclip" aria-hidden="true"></i>
+
+                // if (widget.record.subtask_count > 0) {
+
+
+
+                    // var start_time = false;
+                    // if (widget.record.summary_date_start){
+                    //     start_time = widget.record.summary_date_start.getTime();
+                    // }
+                    //
+                    // var stop_time = false;
+                    // if (widget.record.summary_date_end){
+                    //     stop_time = widget.record.summary_date_end.getTime();
+                    // }
+                    //
+                    // var start_pxscale = Math.round((start_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+                    // var stop_pxscale = Math.round((stop_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+                    //
+                    // var bar_left = start_pxscale;
+                    // var bar_width = stop_pxscale-start_pxscale;
+                    //
+                    // var summary_bar = $('<div class="task-gantt-bar-summary"></div>');
+                    //
+                    // summary_bar.addClass("task-gantt-bar-summary-"+row_id);
+                    //
+                    // summary_bar.css({"left": bar_left + "px"});
+                    // summary_bar.css({"width": bar_width + "px"});
+                    //
+                    // var row_data = _.find(parentg.gantt_timeline_data_widget, function (o) { return o.record_id === row_id; })
+                    // var rowdata = row_data.el;
+                    //
+                    // var bar_summary_start = $('<div class="task-gantt-summary task-gantt-summary-start"></div>');
+                    // var bar_summary_end = $('<div class="task-gantt-summary task-gantt-summary-end"></div>');
+                    //
+                    // summary_bar.append(bar_summary_start);
+                    // summary_bar.append(bar_summary_end);
+                    //
+                    // var bar_summary_width = $('<div class="task-gantt-summary-width"></div>');
+                    // bar_summary_width.css({"width": bar_width + "px"});
+                    //
+                    // summary_bar.append(bar_summary_width);
+                    //
+                    // $(rowdata).append(summary_bar);
+
+                // }
+
+
+            }
+
+            return true;
+        })
+
+
+    }
+
+
+});
+
+return {
+    DocsWidget: GanttTimeLineDocs
+}
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_first.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_first.js
new file mode 100644
index 000000000..98eec9bfb
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_first.js
@@ -0,0 +1,230 @@
+odoo.define('web_gantt_native.BarFirst', function (require) {
+"use strict";
+
+
+var Widget = require('web.Widget');
+var time = require('web.time');
+
+
+
+
+var GanttTimeLineFirst = Widget.extend({
+    template: "GanttTimeLine.first",
+
+    init: function(parent) {
+        this._super.apply(this, arguments);
+    },
+
+
+    start: function(){
+
+        var parentg =  this.getParent();
+
+        var data_widgets =  parentg.gantt_timeline_data_widget;
+
+
+
+
+        _.each(data_widgets, function(widget) {
+
+            if (parentg.ItemsSorted && widget.record.is_group) {
+
+                var row_id = widget.record.group_id[0];
+
+                // var barfirst_datas =  parentg.BarFirst_Data;
+                var link_first_result = _.where(parentg.BarFirst_Data, {data_row_id: row_id});
+
+                if (link_first_result.length > 0){
+
+                    var link_first_data = link_first_result[0];
+
+                    var start_time = false;
+                    if (link_first_data.date_start){
+                        start_time = link_first_data.date_start.getTime();
+                    }
+
+                    var stop_time = false;
+                    if (link_first_data.date_end){
+                        stop_time = link_first_data.date_end.getTime();
+                    }
+
+
+                    if (start_time && stop_time){
+
+                        var start_pxscale = Math.round((start_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+                        var stop_pxscale = Math.round((stop_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+
+                        var bar_left = start_pxscale;
+                        var bar_width = stop_pxscale-start_pxscale;
+
+                        var first_bar = $('<div class="task-gantt-bar-first"></div>');
+                        first_bar.addClass("task-gantt-bar-first-"+row_id);
+
+                        first_bar.css({"left": bar_left + "px"});
+                        first_bar.css({"width": bar_width + "px"});
+
+                        // var rowdata = '#task-gantt-timeline-group-row-'+row_id;
+                        var rowdata = widget.$el;
+
+                        var first_bar_start = $('<div class="task-gantt-first task-gantt-first-start"></div>');
+                        var first_bar_end = $('<div class="task-gantt-first task-gantt-first-end"></div>');
+
+                        var height_m = parseInt(widget.record.task_count);
+
+                        if (height_m){
+                            first_bar_start.css({"height": (1+height_m)*30 + "px"});
+                            first_bar_end.css({"height": (1+height_m)*30 + "px"});
+                        }
+
+
+
+                        first_bar.append(first_bar_start);
+                        first_bar.append(first_bar_end);
+
+
+
+                        $(rowdata).append(first_bar);
+
+                    }
+
+
+                }
+
+
+
+                // if (widget.record.subtask_count > 0) {
+                //
+                //     var start_time = false;
+                //     if (widget.record.summary_date_start){
+                //         start_time = widget.record.summary_date_start.getTime();
+                //     }
+                //
+                //     var stop_time = false;
+                //     if (widget.record.summary_date_end){
+                //         stop_time = widget.record.summary_date_end.getTime();
+                //     }
+                //
+                //     var start_pxscale = Math.round((start_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+                //     var stop_pxscale = Math.round((stop_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+                //
+                //     var bar_left = start_pxscale;
+                //     var bar_width = stop_pxscale-start_pxscale;
+                //
+                //     var summary_bar = $('<div class="task-gantt-bar-summary"></div>');
+                //
+                //     summary_bar.addClass("task-gantt-bar-summary-"+row_id);
+                //
+                //     summary_bar.css({"left": bar_left + "px"});
+                //     summary_bar.css({"width": bar_width + "px"});
+                //
+                //     var rowdata = '#task-gantt-timeline-row-'+row_id;
+                //
+                //
+                //     var bar_summary_start = $('<div class="task-gantt-summary task-gantt-summary-start"></div>');
+                //     var bar_summary_end = $('<div class="task-gantt-summary task-gantt-summary-end"></div>');
+                //
+                //     summary_bar.append(bar_summary_start);
+                //     summary_bar.append(bar_summary_end);
+                //
+                //     var bar_summary_width = $('<div class="task-gantt-summary-width"></div>');
+                //     bar_summary_width.css({"width": bar_width + "px"});
+                //
+                //     summary_bar.append(bar_summary_width);
+                //
+                //     $(rowdata).append(summary_bar);
+                //
+                // }
+
+
+            }
+
+            return true;
+        })
+
+
+    }
+
+
+});
+
+function get_data_barfirst (parentg) {
+
+        // var ghosts = parentg.Ghost;
+        // var ghost_id = parentg.fields_view.arch.attrs.ghost_id;
+        // var ghost_ids_name = parentg.fields_view.arch.attrs.ghost_name;
+        // var ghost_ids_date_start = parentg.fields_view.arch.attrs.ghost_date_start;
+        // var ghost_ids_date_end = parentg.fields_view.arch.attrs.ghost_date_end;
+        // var ghost_ids_durations = parentg.fields_view.arch.attrs.ghost_durations;
+
+        // var barfirsts = parentg.BarFirst;
+    var barfirsts = parentg.gantt.data.BarFirst;
+
+        var barfirst_id = "id";
+        var barfirst_name = "name";
+        var barfirst_date_start = "date_start";
+        var barfirst_date_end = "date_end";
+
+        var data_barfirst = _.map(barfirsts, function(barfirst) {
+
+                var data_row_id = barfirst[barfirst_id];
+
+                var date_start = barfirst[barfirst_date_start];
+                if (date_start){
+                    date_start = time.auto_str_to_date(date_start);
+                }
+
+                var date_end = barfirst[barfirst_date_end];
+                if (date_end){
+                    date_end = time.auto_str_to_date(date_end);
+                }
+
+
+                return {
+                    data_row_id: data_row_id,
+                    name : barfirst[barfirst_name],
+                    date_start : date_start,
+                    date_end : date_end,
+
+            }
+        });
+
+        // try {
+        //     var data_min = _.min(data_ghosts, function (ghost) {
+        //         return ghost.date_start;
+        //     });
+        // }
+        // catch (err) {}
+        //
+        //
+        // try {
+        //     var data_max = _.max(data_ghosts, function (ghost) {
+        //         return ghost.date_end;
+        //     });
+        // }
+        // catch (err) {}
+        //
+        //
+        //
+        // try {
+        //     var start_time = data_min["date_start"].getTime();
+        //     parentg.GtimeStopA = parentg.GtimeStopA.concat(start_time);
+        // } catch (err) {}
+        //
+        // try {
+        //     var stop_time = data_max["date_end"].getTime();
+        //     parentg.GtimeStartA = parentg.GtimeStartA.concat(stop_time);
+        // } catch (err) {}
+
+
+        return data_barfirst;
+
+
+}
+
+
+return {
+    get_data_barfirst: get_data_barfirst,
+    BarFirstWidget: GanttTimeLineFirst
+}
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_summary.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_summary.js
new file mode 100644
index 000000000..29e357e7d
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_bar_summary.js
@@ -0,0 +1,96 @@
+odoo.define('web_gantt_native.Summary', function (require) {
+"use strict";
+
+
+var Widget = require('web.Widget');
+
+
+
+var GanttTimeLineSummary = Widget.extend({
+    template: "GanttTimeLine.summary",
+
+    init: function(parent) {
+        this._super.apply(this, arguments);
+    },
+
+
+    start: function(){
+
+        var parentg =  this.getParent();
+
+        var data_widgets =  parentg.gantt_timeline_data_widget;
+
+        _.each(data_widgets, function(widget) {
+
+            if (!widget.record.is_group) {
+
+                var row_id = widget.record.id;
+
+                // if (widget.record.subtask_count > 0 || widget.record.isParent) {
+
+                if (widget.record.isParent) {
+
+                    var start_time = false;
+                    if (widget.record.summary_date_start){
+                        start_time = widget.record.summary_date_start.getTime();
+                    }
+
+                    var stop_time = false;
+                    if (widget.record.summary_date_end){
+                        stop_time = widget.record.summary_date_end.getTime();
+                    }
+
+                    if (start_time && stop_time){
+
+                        var start_pxscale = Math.round((start_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+                        var stop_pxscale = Math.round((stop_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+
+                        var bar_left = start_pxscale;
+                        var bar_width = stop_pxscale-start_pxscale;
+
+                        var summary_bar = $('<div class="task-gantt-bar-summary"></div>');
+
+                        summary_bar.addClass("task-gantt-bar-summary-"+row_id);
+
+                        summary_bar.css({"left": bar_left + "px"});
+                        summary_bar.css({"width": bar_width + "px"});
+
+                        var row_data = _.find(parentg.gantt_timeline_data_widget, function (o) { return o.record_id === row_id; })
+                        var rowdata = row_data.el;
+
+                        var bar_summary_start = $('<div class="task-gantt-summary task-gantt-summary-start"></div>');
+                        var bar_summary_end = $('<div class="task-gantt-summary task-gantt-summary-end"></div>');
+
+                        summary_bar.append(bar_summary_start);
+                        summary_bar.append(bar_summary_end);
+
+                        var bar_summary_width = $('<div class="task-gantt-summary-width"></div>');
+                        bar_summary_width.css({"width": bar_width + "px"});
+
+                        summary_bar.append(bar_summary_width);
+
+                        $(rowdata).append(summary_bar);
+
+                    }
+
+
+
+                }
+
+
+            }
+
+            return true;
+        })
+
+
+    }
+
+
+});
+
+return {
+    SummaryWidget: GanttTimeLineSummary
+}
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_data.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_data.js
new file mode 100644
index 000000000..7279368f1
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_data.js
@@ -0,0 +1,1207 @@
+odoo.define('web_gantt_native.TimeLineData', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+var Dialog = require('web.Dialog');
+
+var Widget = require('web.Widget');
+
+var time = require('web.time');
+var _t = core._t;
+
+
+var GanttToolTip = require('web_gantt_native.ToolTip');
+var GanttToolHint = require('web_gantt_native.ToolHint');
+var GanttHeaderHint = require('web_gantt_native.HeaderHint');
+
+var NativeGanttData = require('web_gantt_native.NativeGanttData');
+
+
+var GanttTimeLineData = Widget.extend({
+    template: "GanttTimeLine.data",
+
+    events: {
+
+        'mouseover  .task-gantt-bar-plan'    :'HandleTipOver',
+        'mouseout   .task-gantt-bar-plan'    :'HandleTipOut',
+    },
+
+
+    init: function(parent, timeScale, timeType, record, options) {
+        this._super(parent);
+        this.parent = parent;
+        this.record = record;
+        this.record_id = this.record['id'];
+
+        this.BarRecord = undefined;
+        this.BarClickDiffX = undefined;
+        this.BarClickX = undefined;
+        this.BarClickDown = false;
+
+        this.items_sorted = options.items_sorted;
+        this.tree_view = options.tree_view;
+
+    },
+
+
+
+
+    get_position_x: function(gantt_date_start, gantt_date_stop, any_date){
+
+        var task_start_time = gantt_date_start.getTime();
+        var task_stop_time = gantt_date_stop.getTime();
+
+        var task_start_pxscale = Math.round((task_start_time-this.parent.firstDayScale) / this.parent.pxScaleUTC);
+        var task_stop_pxscale = Math.round((task_stop_time-this.parent.firstDayScale) / this.parent.pxScaleUTC);
+
+        var bar_left = task_start_pxscale;
+        var bar_width = task_stop_pxscale-task_start_pxscale;
+
+        var any_status = false;
+
+        if (any_date) {
+
+            var any_date_time = any_date.getTime();
+            var any_date_pxscale = Math.round((any_date_time-this.parent.firstDayScale) / this.parent.pxScaleUTC);
+
+            var bar_any_left = false;
+            var bar_any_width = false;
+
+
+            if (any_date_pxscale >= task_stop_pxscale){
+
+                bar_any_left = bar_width;
+                bar_any_width = any_date_pxscale-task_stop_pxscale;
+                any_status = 'after_stop';
+
+            }
+
+            if (any_date_pxscale < task_stop_pxscale){
+
+                bar_any_left = bar_width - (task_stop_pxscale - any_date_pxscale);
+                bar_any_width = task_stop_pxscale-any_date_pxscale;
+                any_status = 'before_stop'
+
+            }
+
+            if (any_date_pxscale <= task_start_pxscale){
+
+                bar_any_left = bar_width - (task_stop_pxscale - any_date_pxscale);
+                bar_any_width = task_start_pxscale-any_date_pxscale;
+                any_status = 'before_start'
+
+            }
+
+        }
+
+        return {
+            bar_left: bar_left,
+            bar_width: bar_width,
+            bar_any_left : bar_any_left,
+            bar_any_width : bar_any_width,
+            any_status: any_status
+        };
+
+    },
+
+    deadline_slider_gen: function (get_possition, not_render, id, gantt_bar) {
+
+        // bar_any_left : bar_any_left,
+        // bar_any_width : bar_any_width,
+        // any_status: any_status
+        bar_deadline_slider = false;
+
+        if (!not_render) {
+
+            var bar_deadline_left = get_possition.bar_any_left;
+            var bar_deadline_width = get_possition.bar_any_width;
+            var bar_deadline_status = get_possition.any_status;
+
+            //Can Render Deadline
+            if (bar_deadline_left && bar_deadline_width) {
+
+
+                //Deadline Ssider
+                var bar_deadline_slider = $('<div class="task-gantt-deadline-slider"></div>');
+                var bar_deadline_slider_left = bar_deadline_left + bar_deadline_width;
+
+                if (bar_deadline_status === 'before_stop' || bar_deadline_status === 'before_start') {
+                    bar_deadline_slider_left = bar_deadline_left
+                }
+
+                bar_deadline_slider.css({"left": bar_deadline_slider_left + "px"});
+
+                // var deadline_left = this.lag_any(moment(), this.record.date_deadline, " late", " left", false);
+                // if (deadline_left) {
+                //
+                //     var bar_dl = $('<div class="task-gantt-done-info"/>');
+                //     var bar_dl_text = $('<a/>');
+                //     bar_dl_text.text(deadline_left);
+                //     bar_dl.append(bar_dl_text);
+                //     bar_deadline_slider.append(bar_dl);
+                // }
+            }
+        }
+
+        this.DragDeadLine(id, gantt_bar, bar_deadline_slider);
+
+        return bar_deadline_slider
+    },
+
+
+
+    deadline_bar_gen: function (get_possition, deadline_lag) {
+
+        var deadline_bar = false;
+
+        if (!deadline_lag && this.record.date_deadline) {
+
+            var bar_deadline_left = get_possition.bar_any_left;
+            var bar_deadline_width = get_possition.bar_any_width;
+            var bar_deadline_status = get_possition.any_status;
+
+            //Bar to Today
+
+            var deadline_today = get_possition;
+            var text_margin = 20;
+            if (this.parent.isTODAYline){
+                deadline_today = this.get_position_x(moment().toDate(), moment().toDate(), this.record.date_deadline);
+                text_margin = 5;
+            }
+
+
+            deadline_bar = $('<div class="task-gantt-bar-deadline"></div>');
+
+            var bar_today_left = bar_deadline_left;
+            var bar_today_width = deadline_today.bar_any_width;
+            var bar_today_status = deadline_today.any_status;
+            var gantt_bar_size = get_possition.bar_left + get_possition.bar_width;
+            var lag_calc = 0;
+
+            //deadline color and align
+            deadline_bar.css({"background": "rgba(255, 190, 190, 0.33)"});
+            var text_align = "right";
+
+            if (bar_today_status === 'after_stop') {
+                deadline_bar.css({"background": "rgba(167, 239, 62, 0.33)"});
+                text_align = "left";
+            }
+
+
+
+            //deadline possition
+
+            if (bar_today_status === 'after_stop') {
+                bar_today_left = bar_deadline_left-bar_today_width;
+
+            }
+
+
+            if (bar_today_status === 'after_stop' && bar_deadline_status === "after_stop"){
+                bar_today_left = bar_deadline_left-(bar_today_width-bar_deadline_width);
+            }
+
+
+
+            if ((bar_today_status === "before_start" || bar_today_status === "before_stop")  &&  bar_deadline_status === 'after_stop' ) {
+                bar_today_left = bar_deadline_left + bar_deadline_width;
+            }
+
+
+
+            deadline_bar.css({"left": bar_today_left + "px"});
+            deadline_bar.css({"width": bar_today_width + "px"});
+
+
+
+
+            // var deadline_left = this.lag_any(moment(), this.record.date_deadline, "late ", " left", false);
+            var deadline_left = this.lag_any(moment(), this.record.date_deadline, "-  ", "+ ", true);
+                if (deadline_left) {
+
+                    var bar_dl = $('<div class="task-gantt-bar-deadline-info"/>');
+
+                    bar_dl.css({"text-align": text_align});
+                    bar_dl.css("margin-"+text_align.toString(), lag_calc + text_margin + "px" );
+                    bar_dl.text(deadline_left);
+                    deadline_bar.append(bar_dl);
+
+
+
+                }
+
+        }
+
+        return deadline_bar
+
+    },
+
+    done_bar_gen: function (deadline_lag) {
+
+        var done_append = true;
+        var done_slider = false;
+
+        if (this.parent.fields_view.arch.attrs.state_status) {
+            done_append = false;
+
+            if(this.record.state === this.parent.fields_view.arch.attrs.state_status){
+                done_append = true;
+            }
+        }
+
+        if (done_append){
+
+            var get_upossition_done = this.get_position_x(this.record.task_start, this.record.task_stop, this.record.date_done);
+            var done_status = get_upossition_done.any_status;
+
+            if (done_status){
+
+                done_slider = $('<div class="task-gantt-done-slider fa fa-check-circle-o"></div>');
+
+                var done_left = get_upossition_done.bar_any_left;
+                var done_width = get_upossition_done.bar_any_width;
+                var done_slider_left = done_left+done_width;
+
+                if (done_status === 'before_stop' || done_status === 'before_start'){
+                    done_slider_left = done_left;
+                }
+
+                done_slider.css({"left": done_slider_left + "px"});
+
+
+                    var bar_d = $('<div class="task-gantt-done-info"/>');
+                    var bar_d_text = $('<a/>');
+                    if (deadline_lag){
+                        bar_d_text.text(deadline_lag);
+                     }
+                    bar_d.append(bar_d_text);
+                    done_slider.append(bar_d);
+
+
+            }
+        }
+
+        return done_slider
+
+
+    },
+
+    progress_bar_gen: function (get_possition) {
+
+        var bar_progress = false;
+
+        if (this.record.progress) {
+
+            var progress_value = (get_possition.bar_width / 100) * this.record.progress;
+
+            if (progress_value < 0) {
+
+                progress_value = -progress_value + get_possition.bar_width
+            }
+
+            bar_progress = $('<div class="task-gantt-progress"></div>');
+            bar_progress.css({"width": progress_value + "px"});
+
+        }
+
+        return bar_progress
+
+
+    },
+
+    progress_bar_on_gantt_gen: function (get_possition, gantt_bar) {
+
+        var bar_progress = false;
+
+        if (this.record.progress && !this.record.on_gantt) {
+
+            bar_progress = $('<div class="task-gantt-progress2">' + this.record.progress + '%</div>');
+            bar_progress.css({"left": get_possition.bar_width / 3 + "px"});
+
+            if (gantt_bar.width() > 40){
+                var d_k = 3;
+                if (gantt_bar.width() < 65){
+                    d_k = 10;
+                }
+                bar_progress.css({"left": get_possition.bar_width / d_k + "px"});
+            }
+        }
+
+        return bar_progress
+
+    },
+
+    lag_any: function (first_date, second_date, lag_pos, lag_neg, left_position) {
+
+        var lag_result = false;
+
+        if (first_date && second_date){
+
+            var m_diff = moment(first_date).diff(moment(second_date));
+            var m_duration = moment.duration(m_diff);
+
+            var duration_seconds = parseInt(m_duration.asSeconds());
+
+            if (duration_seconds){
+
+                lag_result = humanizeDuration(duration_seconds*1000,{ units: "d",  maxDecimalPoints: 2 });
+
+                var pos_neg = lag_pos;
+
+                if (duration_seconds < 0){
+                    pos_neg = lag_neg
+                }
+
+                if (left_position){
+                    lag_result = pos_neg+lag_result;
+                }
+                else{
+                    lag_result = lag_result+pos_neg;
+                }
+
+            }
+        }
+
+        return lag_result
+
+    },
+
+
+    start: function(){
+
+        var self = this;
+        var id = this.record_id;
+
+
+        if (!this.record.is_group) {
+
+            //Color
+            var color_gantt = false;
+
+            if (this.record["color_gantt_set"]){
+                color_gantt = this.record["color_gantt"]
+            }
+
+            if (!color_gantt){
+                color_gantt = "rgba(242, 197, 116, 0.6)";
+
+                if (this.record.schedule_mode === "auto") {
+                    color_gantt = "rgba(111, 197, 242, 0.6)";
+                }
+
+                if (this.record.constrain_type !== "asap" && this.record.constrain_type !== undefined && this.record.schedule_mode === "auto") {
+                    color_gantt = "rgba(242, 133, 113, 0.6)";
+                }
+            }
+
+            // var color_gantt parse and replace;
+            var color_rgba = color_gantt.replace(/[^\d.,]/g, '').split(',');
+
+            if (self.tree_view) {
+
+                var isParent = this.record['isParent'];
+                if (isParent) {
+                    color_rgba[3] = 0.2;
+                }
+
+            }else{
+                //  Task have subtask
+                var subtask_count = this.record['subtask_count'];
+                if (subtask_count) {
+                    color_rgba[3] = 0.2;
+                }
+
+            }
+
+            color_gantt = "rgba(" + color_rgba[0] + "," + color_rgba[1] + "," + color_rgba[2] + "," + color_rgba[3] + ")";
+
+            //Gantt Bar
+            var gantt_bar = $('<div class="task-gantt-bar-plan"></div>');
+
+
+
+            //Possition X
+            var get_possition = this.get_position_x(this.record.task_start, this.record.task_stop, this.record.date_deadline);
+
+            gantt_bar.css({"left": get_possition.bar_left + "px"});
+            gantt_bar.css({"width": get_possition.bar_width + "px"});
+
+            // this.bar_left = get_possition.bar_left;
+            // this.bar_width = get_possition.bar_width;
+
+
+            //Hiden Star End bar for change main bar
+            var bar_start = $('<div class="ui-resizable-handle ui-resizable-w task-gantt-bar-plan-start"></div>');
+            var bar_end = $('<div class="ui-resizable-handle ui-resizable-e task-gantt-bar-plan-end"></div>');
+
+
+
+            if (get_possition.bar_width === 0) {
+                bar_start.addClass("task-gantt-bar-plan-start-zero");
+                bar_end.addClass("task-gantt-bar-plan-end-zero");
+            }
+
+            gantt_bar.append(bar_start);
+            gantt_bar.append(bar_end);
+
+
+            // Get deadline_lag if exist
+            var deadline_lag = this.lag_any(this.record.date_deadline, this.record.date_done, "+ ", "- ", true);
+
+            var gantt_bar_widget = {};
+            //Done Bar
+            gantt_bar_widget["done_slider"] = this.done_bar_gen(deadline_lag);
+
+            //Deadline Slider
+            gantt_bar_widget["deadline_slider"] = this.deadline_slider_gen(get_possition, deadline_lag, id, gantt_bar);
+
+            //Deadline bar
+            gantt_bar_widget["deadline_bar"] = this.deadline_bar_gen(get_possition, deadline_lag);
+
+            //Progress bar
+            gantt_bar_widget["progress_bar"] = this.progress_bar_gen(get_possition);
+
+            //Progress bar on gantt
+            gantt_bar_widget["progress_bar_on_gantt"] = this.progress_bar_on_gantt_gen(get_possition, gantt_bar);
+
+
+            //Task Name on Gantt
+            if (this.record.on_gantt) {
+
+                var bar_name = $('<div class="task-gantt-name">'+ this.record.value_name +'</div>');
+                bar_name.css({"width": get_possition.bar_width-5 + "px"});
+                gantt_bar.append(bar_name);
+            }
+
+
+            //Milestone
+            var color_gantt_milestone = false;
+            if (this.record.is_milestone) {
+
+                bar_end.addClass("fa fa-flag fa-1x");
+                color_gantt_milestone  = "rgba(242, 197, 116, 0.1";
+
+                if (this.record.schedule_mode === "auto") {
+                    color_gantt_milestone  = "rgba(111, 197, 242, 0.1)"
+                }
+
+                if (this.record.constrain_type !== "asap" && this.record.schedule_mode === "auto") {
+                    color_gantt_milestone = "rgba(242, 133, 113, 0.1)";
+                }
+            }
+
+
+            // if (self.tree_view) {
+            //
+            //     var isParent = this.record['isParent'];
+            //     if (isParent) {
+            //         gantt_bar.css({"opacity": "0.85"});
+            //     }
+            //
+            // }else{
+            //     //       Task have subtask
+            //     var subtask_count = this.record['subtask_count'];
+            //     if (subtask_count) {
+            //         gantt_bar.css({"opacity": "0.85"});
+            //     }
+            //
+            // }
+
+
+
+
+
+
+
+            //if exist id for data gantt
+            if (id !== undefined) {
+
+                this.$el.prop('id', "task-gantt-timeline-row-" + id + "");
+                this.$el.prop('data-id', id);
+                this.$el.prop('allowRowHover', true);
+                this.$el.prop('record', this.record);
+                this.$el.prop('record_id', id);
+                gantt_bar.prop('record_id', id);
+                gantt_bar.prop('record', this.record);
+
+                gantt_bar.addClass("task-gantt-bar-plan-" + id + "");
+
+            }
+
+            //Critical path
+            var critical_path = this.record['critical_path'];
+            var cp_shows = this.record['cp_shows'];
+            var p_loop = this.record['p_loop'];
+
+            if (p_loop){
+                gantt_bar.addClass("task-gantt-items-p-loop");
+            }
+            else if (critical_path && cp_shows){
+                gantt_bar.addClass("task-gantt-items-critical-path");
+            }
+
+
+            // Gantt Bar Color
+            if (color_gantt_milestone){
+              color_gantt = color_gantt_milestone
+            }
+
+            this.record.color_gantt = color_gantt;
+            gantt_bar.css({"background": color_gantt});
+
+
+
+            //Widget to gantt bar
+
+             this.bar_widget = gantt_bar_widget;
+            _.each(gantt_bar_widget, function (widget, key) {
+                gantt_bar.append(widget);
+            });
+
+
+            //Gantt Bar to EL
+            this.$el.append(gantt_bar);
+
+        }
+        else{
+                var group_id = this.record.group_id[0];
+
+                this.$el.prop('id', "task-gantt-timeline-group-row-" + group_id + "");
+                this.$el.prop('group-data-id', group_id);
+
+        }
+
+
+        //Drag Actions
+
+        //Drag Gantt Bar
+        this.DragGantt(self, id, gantt_bar, this.record);
+        // this.ChangeSizeEnd(self, id, bar_end, gantt_bar, this.record);
+        this.ChangeSizeStart(self, id, gantt_bar, this.record);
+
+
+        var fold = self.record['fold'];
+        // if (self.tree_view) {
+            if (fold) {
+                this.$el.css({'display': 'none'});
+            }
+        // }
+
+   },
+
+
+    DragDeadLine: function(id, gantt_el, element) {
+
+        if (element) {
+            var record = this.record;
+            var self = this;
+            var drag_el = element;
+            var containment_el =  "task-gantt-timeline-row-" + id + "";
+
+            drag_el.draggable({
+
+                 axis: "x",
+                 containment: containment_el,
+                 scroll: false,
+
+                 start: async function (event, ui) {
+
+                     self.BarRecord = record;
+                     //
+                     //Hint Widget Destroy
+                     self.HintDestroy(self.parent);
+
+                     //Tip Widget Destroy
+                     self.TipDestroy(self.parent);
+
+                     //Create Bar Hint
+                     var gantt_line_hint = await new GanttToolHint(self.parent);
+                     gantt_line_hint.appendTo(self.parent.$('.task-gantt-line-hints'));
+
+                     self.parent.hint_move_widget = gantt_line_hint;
+
+                     //Hide
+                     self.HideDeadline("deadline");
+                     self.$el.prop('allowRowHover', false);
+
+                 },
+                 drag: function (event, ui) {
+
+                    //Hint
+                    var bar_info = self.GetGanttBarPlanPxTime();
+                    if (self.parent.hint_move_widget){
+                        self.parent.hint_move_widget.show_hint(drag_el, bar_info, ui, "deadline");
+                    }
+
+
+                 },
+
+                 stop: function (event, ui) {
+
+                        //Bar Save
+                        self.BarSave(self.BarRecord.id, "deadline");
+
+                        //Hint Widget Destroy
+                        self.HintDestroy(self.parent);
+
+                        self.BarRecord = undefined;
+
+                        // drag_el.draggable('disable');
+
+                 }
+
+            }).css("position", "absolute");
+        }
+    },
+
+
+
+
+    ChangeSizeStart: function (self, id, gantt_bar, record) {
+
+        if (id !== undefined) {
+
+            if (record["schedule_mode"] === "manual" || record["schedule_mode"] === undefined) {
+
+
+                var containment_el = "task-gantt-timeline-row-" + id + "";
+
+                gantt_bar.resizable({
+
+
+                    handles: {
+                    'e': '.task-gantt-bar-plan-end',
+                    'w': '.task-gantt-bar-plan-start'
+
+                    },
+
+
+                    // containment: containment_el,
+                    start: async function (event, ui) {
+
+                        self.BarRecord = event.currentTarget.record;
+                        // self.BarClickDiffX = event.target.offsetLeft - event.clientX;
+                        // self.BarClickX = event.clientX;
+                        // self.BarClickDown = true;
+
+
+                        //Hint Widget Destroy
+                        self.HintDestroy(self.parent);
+
+                        //Tip Widget Destroy
+                        self.TipDestroy(self.parent);
+
+                        //Create Bar Hint
+                        var gantt_line_hint = await new GanttToolHint(self.parent);
+                        gantt_line_hint.appendTo(self.parent.$('.task-gantt-line-hints'));
+
+                        self.parent.hint_move_widget = gantt_line_hint;
+
+                        //Hide
+                        self.HideDeadline();
+
+                        self.$el.prop('allowRowHover', false);
+                        // drag_el.css({"position": "relative" });
+                        // drag_el.css({"opacity": 0.8 });
+                        // drag_el.css({"background": "rgb(76, 92, 246)" });
+                        gantt_bar.css({"background": "rgba(98, 196, 51, 0.38)"});
+
+                    },
+                    resize: function (event, ui) {
+
+                                                //Hint
+                        var bar_info = self.GetGanttBarPlanPxTime();
+                        if (self.parent.hint_move_widget){
+                            self.parent.hint_move_widget.show_hint(gantt_bar, bar_info);
+                        }
+
+
+
+                    },
+                    stop: function (event, ui) {
+                            //Bar Save
+                            self.BarSave(self.BarRecord.id, "bar");
+
+                            //Hint Widget Destroy
+                            self.HintDestroy(self.parent);
+
+                            self.BarRecord = undefined;
+                            // gantt_bar.resizable('disable');
+                            // gantt_bar.draggable('disable');
+
+                            // self.$el.prop('allowRowHover', true);
+                            self.ScrollToTop = $('.task-gantt').scrollTop();
+
+                    }
+
+                });
+
+
+            }
+        }
+
+    },
+
+
+
+    ChangeSizeEnd: function (self, id, element, gantt_bar, record) {
+
+        if (id !== undefined) {
+
+            if (record["schedule_mode"] === "manual" || record["schedule_mode"] === undefined) {
+
+                 var drag_el = element;
+                 var containment_el =  "task-gantt-timeline-row-" + id + "";
+
+                 drag_el.draggable({
+
+                     axis: "x",
+                     containment: containment_el,
+                     scroll: false,
+                     zIndex: 1000,
+
+                     start: async function (event, ui) {
+
+                         self.BarRecord = event.currentTarget.parentElement.record;
+                         self.BarClickDiffX = event.target.offsetLeft - event.clientX;
+                         self.BarClickX = event.clientX;
+
+                         //Hint Widget Destroy
+                         self.HintDestroy(self.parent);
+
+                         //Tip Widget Destroy
+                         self.TipDestroy(self.parent);
+
+                         //Create Bar Hint
+                         var gantt_line_hint = await new GanttToolHint(self.parent);
+                         gantt_line_hint.appendTo(self.parent.$('.task-gantt-line-hints'));
+
+                         self.parent.hint_move_widget = gantt_line_hint;
+
+                         //Hide
+                         self.HideDeadline();
+
+                         self.$el.prop('allowRowHover', false);
+                         drag_el.css({"position": "relative"});
+                         drag_el.css({"opacity": 0.8});
+                         drag_el.css({"background": "rgb(76, 92, 246)"});
+                         gantt_bar.css({"background": "rgba(98, 196, 51, 0.38)"});
+
+
+                     },
+                     drag: function (event, ui) {
+
+                        //Hint
+                        var bar_info = self.GetGanttBarPlanPxTime();
+
+                        if (self.parent.hint_move_widget){
+                            self.parent.hint_move_widget.show_hint(gantt_bar, bar_info, ui);
+
+                            var offsetWidth = event.target.offsetParent.offsetWidth;
+                            var DiffForMove = self.BarClickX - event.clientX; //raznica mez nazatijem i tekuchej poziciji mishi
+                            var BarNewPos = offsetWidth  - DiffForMove; //Velichina smechenija bloka.
+                            var NewBarClickDiffX = offsetWidth - event.clientX; //tekucheje rastojanija mezdu nachalom blok i tekuchem pol mishki
+                            var Kdiff =  self.BarClickDiffX - NewBarClickDiffX + 5; //Koeficent corekciji dla poderzanija rastojanije meszu nachalom
+                            //bloka i tekuchem polozenijem mishi. 5 shirina elemnta end (div dragabble)
+
+                            var new_width = BarNewPos+Kdiff+DiffForMove;
+
+                            if (new_width > 0){
+                                 gantt_bar.css({"width": (new_width) + "px"});
+                            }
+
+                        }
+
+
+                     },
+
+
+                     stop: function (event, ui) {
+
+
+                            //Bar Save
+                            self.BarSave(self.BarRecord.id, "bar");
+
+                            //Hint Widget Destroy
+                            self.HintDestroy(self.parent);
+
+                            self.BarRecord = undefined;
+
+                            self.$el.prop('allowRowHover', true);
+
+                            drag_el.css({"position": "absolute" });
+
+                     }
+
+                 }).css("position", "absolute");
+            }
+        }
+    },
+
+
+
+    DragGantt: function(self, id, element, record) {
+
+        if (id !== undefined) {
+
+            if (record["schedule_mode"] === "manual" || record["schedule_mode"] === undefined) {
+
+                 var drag_el = element;
+                 var containment_el =  "task-gantt-timeline-row-" + id + "";
+
+                 drag_el.draggable({
+
+                     axis: "x",
+                     containment: containment_el,
+                     scroll: false,
+
+                     start: async function (event, ui) {
+
+                         self.BarRecord = event.currentTarget.record;
+
+                         //Hint Widget Destroy
+                         self.HintDestroy(self.parent);
+
+                         //Tip Widget Destroy
+                         self.TipDestroy(self.parent);
+
+                         //Create Bar Hint
+                         var gantt_line_hint = await new GanttToolHint(self.parent);
+
+                         gantt_line_hint.appendTo(self.parent.$('.task-gantt-line-hints'));
+
+                         self.parent.hint_move_widget = gantt_line_hint;
+
+                         //Hide
+                         self.HideDeadline();
+
+                         self.$el.prop('allowRowHover', false);
+                         // drag_el.css({"position": "relative" });
+                         // drag_el.css({"opacity": 0.8 });
+                         // drag_el.css({"background": "rgb(76, 92, 246)" });
+                         drag_el.css({"background": "rgba(98, 196, 51, 0.38)"});
+
+                     },
+
+                     drag: function (event, ui) {
+                        //Hint
+                        var bar_info = self.GetGanttBarPlanPxTime();
+
+                        if (self.parent.hint_move_widget){
+                            self.parent.hint_move_widget.show_hint(drag_el, bar_info);
+                        }
+
+
+                     },
+
+                     stop: function (event, ui) {
+                        //Bar Save
+                        self.BarSave(self.BarRecord.id, "bar");
+
+                        //Hint Widget Destroy
+                        self.HintDestroy(self.parent);
+
+                        self.BarRecord = undefined;
+
+                        // drag_el.resizable('disable');
+                        // drag_el.draggable('disable');
+
+                     }
+
+                 }).css("position", "absolute");
+            }
+        }
+    },
+
+
+    HintDestroy: function(parent) {
+
+        if (parent.hint_move_widget){
+
+            parent.hint_move_widget.destroy();
+            parent.hint_move_widget = undefined;
+        }
+    },
+
+    TipDestroy: function(parent) {
+
+        if (parent.tip_move_widget) {
+            parent.tip_move_widget.destroy();
+            parent.tip_move_widget = undefined;
+        }
+    },
+
+
+
+
+    HandleTipOver: function(event) {
+
+        var self = this;
+
+        // var bar_record_id = event.target.record_id ;
+        // var bar_record_id = this.record_id;
+        // var gantt_bar = $(".task-gantt-bar-plan-" + bar_record_id + "");
+
+        if (self.parent.tip_move_widget) {
+            self.parent.tip_move_widget.destroy();
+            self.parent.tip_move_widget = undefined;
+
+        }
+
+        if (!self.parent.hint_move_widget) {
+
+            var gantt_bar = this.$el.children('.task-gantt-bar-plan');
+            // //Create Bar Hint
+            var gantt_line_tip = new GanttToolTip(self.parent, gantt_bar, event);
+            gantt_line_tip.appendTo(self.parent.$('.task-gantt-line-tips'));
+            self.parent.tip_move_widget = gantt_line_tip;
+
+            var record_id = gantt_bar[0].record.id;
+            if (record_id){
+                var rowdata = $('#task-gantt-bar-intersection-'+record_id);
+                rowdata.addClass("task-gantt-bar-intersection-hover");
+            }
+
+
+
+
+         }
+    },
+
+
+    HandleTipOut: function() {
+
+        var self = this;
+
+        if (self.parent.tip_move_widget) {
+
+            var record_id = self.parent.tip_move_widget.record[0].record_id
+            if (record_id){
+                var rowdata = $('#task-gantt-bar-intersection-'+record_id);
+                rowdata.removeClass("task-gantt-bar-intersection-hover");
+            }
+            self.parent.tip_move_widget.destroy();
+            self.parent.tip_move_widget = undefined;
+
+
+        }
+    },
+
+
+
+    HideDeadline: function(type){
+
+        var gantt_bar = this.$el.children('.task-gantt-bar-plan');
+
+        //Deadline
+        var gantt_bardeadline = gantt_bar.children('.task-gantt-bar-deadline');
+        if (gantt_bardeadline) {
+            gantt_bardeadline.hide();
+        }
+
+
+        if (type !== "deadline"){
+
+            //Done Slider
+            var gantt_done_slider = gantt_bar.children('.task-gantt-done-slider');
+            if (gantt_done_slider) {
+                gantt_done_slider.hide();
+            }
+
+
+            //Deadline Slider
+            var bar_deadline_slider = gantt_bar.children('.task-gantt-deadline-slider');
+
+            if (bar_deadline_slider) {
+                bar_deadline_slider.hide();
+            }
+        }
+    },
+
+
+//Save BAR
+
+
+
+
+
+    BarSave: function(r_id, type){
+
+        var self = this ;
+        var data = {};
+
+        var bar_info = this.GetGanttBarPlanPxTime();
+
+        var model_fields_dict = this.parent.model_fields_dict;
+        var parent = this.parent;
+
+        // var match_task_id = _.find(parent.rows_to_gantt, function(item) { return item.id === r_id });
+
+        var $zTree = parent.widget_ztree.$zTree;
+
+        var match_task_id = $zTree.getNodeByParam('id', r_id);
+
+        if (type === "bar"){
+
+            var f_data_start = model_fields_dict["date_start"];
+            var f_date_stop = model_fields_dict["date_stop"];
+
+            data[f_data_start] = time.datetime_to_str(bar_info.task_start);
+            data[f_date_stop] = time.datetime_to_str(bar_info.task_end);
+
+            this.parent.TimeToLeft = $('.task-gantt-timeline').scrollLeft();
+            this.parent.ScrollToTop = $('.task-gantt').scrollTop();
+
+            // Redonly Check
+
+            var check_fieds = [f_data_start, f_date_stop];
+            // var readonly = this.CheckReadonly(check_filed);
+
+            var readonly = NativeGanttData.CheckReadOnly(check_fieds,  self.parent.fields, self.BarRecord);
+
+
+            var check_readonly = _.findWhere(readonly,{readonly: true});
+
+            if (check_readonly){
+                Dialog.alert(this, _.str.sprintf(_t("You are trying to write on a read-only field! : '%s' "),check_readonly["field"]));
+
+                return self.trigger_up('gantt_refresh_after_change');
+            }
+
+            var l10n = _t.database.parameters;
+
+            var formatDate = time.strftime_to_moment_format( l10n.date_format + ' ' + l10n.time_format);
+
+            // var task_start = moment(bar_info.task_start).format(formatDate);
+            // var task_end = moment(bar_info.task_end).format(formatDate);
+
+            var duration = moment.duration(moment(bar_info.task_start).diff(moment(bar_info.task_end)));
+
+            var duration_seconds = duration.asSeconds();
+
+
+            if (match_task_id) {
+                match_task_id.task_start = bar_info.task_start;
+                match_task_id.task_stop = bar_info.task_end;
+                match_task_id.duration = duration_seconds;
+            }
+
+            $zTree.selectNode(match_task_id);
+
+        }
+
+
+        if (type === "deadline"){
+
+
+            var f_date_deadline = model_fields_dict["date_deadline"];
+
+
+            data[f_date_deadline] = time.datetime_to_str(bar_info.deadline_time);
+
+
+            this.parent.TimeToLeft = $('.task-gantt-timeline').scrollLeft();
+            this.parent.ScrollToTop = $('.task-gantt').scrollTop();
+
+            // Redonly Check
+
+            var check_field_deadline = [f_date_deadline];
+            // var readonly_deadline = this.CheckReadonly(check_filed_deadline);
+            var readonly_deadline = NativeGanttData.CheckReadOnly(check_field_deadline,  self.parent.fields, self.BarRecord);
+
+            var check_readonly_deadline = _.findWhere(readonly_deadline,{readonly: true});
+
+
+            if (check_readonly_deadline){
+                Dialog.alert(this, _.str.sprintf(_t("You are trying to write on a read-only field! : '%s' "),check_readonly_deadline["field"]));
+
+                return self.trigger_up('gantt_refresh_after_change');
+            }
+
+
+            if (match_task_id) {
+                match_task_id.date_deadline = bar_info.deadline_time;
+            }
+        }
+
+
+        //Save and refresh after change
+        parent._rpc({
+                model: parent.state.modelName,
+                method: 'write',
+                args: [[r_id], data],
+                context: parent.state.contexts
+            })
+            .then(function(ev) {
+                // self.trigger_up('gantt_refresh_after_change',ev );
+
+                self.trigger_up('warning', {
+                    title: _t('Bar Data Update'),
+                    message: _t('Data updated : ') + ev
+                });
+
+        });
+
+        self.trigger_up('gantt_fast_refresh_after_change');
+
+
+    },
+
+
+
+     GetGanttBarPlanPxTime: function (){
+
+        var gantt_bar = this.$el.children('.task-gantt-bar-plan');
+
+        var tleft = parseInt(gantt_bar.css('left'), 10);
+        var twidth = parseInt(gantt_bar.css('width'), 10);
+
+        var tright = tleft + twidth;
+        var task_start = (tleft*this.parent.pxScaleUTC)+this.parent.firstDayScale;
+        var task_end = (tright*this.parent.pxScaleUTC)+this.parent.firstDayScale;
+
+
+        var new_task_start = new Date(0); // The 0 there is the key, which sets the date to the epoch setUTCSeconds(task_start);
+        new_task_start.setTime(task_start);
+
+        var new_task_end = new Date(0); // The 0 there is the key, which sets the date to the epoch setUTCSeconds(task_start);
+        new_task_end.setTime(task_end);
+
+
+
+        var gantt_bar_deadline = gantt_bar.children('.task-gantt-deadline-slider');
+
+        if (gantt_bar_deadline) {
+
+            var deadline_px1 = parseInt(gantt_bar_deadline.css('left'), 10);
+
+            var deadline_px = deadline_px1 + tleft;
+
+            if (deadline_px1 < 0) {
+
+                deadline_px = tleft + deadline_px1;
+            }
+
+            var deadline_time = (deadline_px*this.parent.pxScaleUTC)+this.parent.firstDayScale;
+
+            var new_deadline_time = new Date(0); // The 0 there is the key, which sets the date to the epoch setUTCSeconds(task_start);
+            new_deadline_time.setTime(deadline_time);
+            new_deadline_time.setUTCHours(0, 0, 0, 0)
+
+        }
+
+
+        return {
+            task_start: new_task_start,
+            task_end:new_task_end,
+            deadline_time : new_deadline_time
+        };
+     }
+
+
+});
+
+return GanttTimeLineData;
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_ghost.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_ghost.js
new file mode 100644
index 000000000..dab2bdad5
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_ghost.js
@@ -0,0 +1,172 @@
+odoo.define('web_gantt_native.Ghost', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+var time = require('web.time');
+
+
+
+function get_data_ghosts (parentg) {
+
+        var ghosts = parentg.gantt.data.Ghost;
+        var ghost_id = parentg.fields_view.arch.attrs.ghost_id;
+        var ghost_ids_name = parentg.fields_view.arch.attrs.ghost_name;
+        var ghost_ids_date_start = parentg.fields_view.arch.attrs.ghost_date_start;
+        var ghost_ids_date_end = parentg.fields_view.arch.attrs.ghost_date_end;
+        var ghost_ids_durations = parentg.fields_view.arch.attrs.ghost_durations;
+
+        var data_ghosts = _.map(ghosts, function(ghost) {
+
+                var data_row_id = ghost[ghost_id][0];
+
+                var durations = ghost[ghost_ids_durations];
+
+                var date_start = time.auto_str_to_date(ghost[ghost_ids_date_start]);
+                if (!date_start){
+                    return
+                }
+                var date_end = time.auto_str_to_date(ghost[ghost_ids_date_end]);
+                if (!date_end){
+
+                    if (durations){
+                        date_end = moment(date_start).add(durations*60, 'minutes')._d;
+                    }
+                    else{
+                        return
+                    }
+                }
+
+                return {
+                    data_row_id: data_row_id,
+                    name : ghost[ghost_ids_name],
+                    date_start : date_start,
+                    date_end : date_end,
+                    durations : ghost[ghost_ids_durations]
+            }
+        });
+
+        try {
+            var data_min = _.min(data_ghosts, function (ghost) {
+                return ghost.date_start;
+            });
+        }
+        catch (err) {}
+
+
+        try {
+            var data_max = _.max(data_ghosts, function (ghost) {
+                return ghost.date_end;
+            });
+        }
+        catch (err) {}
+
+
+
+        try {
+            var start_time = data_min["date_start"].getTime();
+            parentg.GtimeStopA = parentg.GtimeStopA.concat(start_time);
+        } catch (err) {}
+
+        try {
+            var stop_time = data_max["date_end"].getTime();
+            parentg.GtimeStartA = parentg.GtimeStartA.concat(stop_time);
+        } catch (err) {}
+
+
+        return data_ghosts;
+
+
+
+}
+
+
+var GanttTimeLineGhost = Widget.extend({
+    template: "GanttTimeLine.ghost",
+
+    init: function(parent) {
+        this._super.apply(this, arguments);
+    },
+
+
+    start: function(){
+
+        var parentg =  this.getParent();
+
+
+        var data_widgets =  parentg.gantt_timeline_data_widget;
+
+        var data_ghosts = parentg.Ghost_Data;
+
+        _.each(data_widgets, function(widget) {
+
+            if (!widget.record.is_group) {
+
+                var row_id = widget.record.id;
+
+                var link_ghosts = _.where(data_ghosts, {data_row_id: row_id});
+
+                if (link_ghosts.length > 0){
+
+                    var data_min = _.min(link_ghosts, function(ghost){ return ghost.date_start; });
+                    var data_max = _.max(link_ghosts, function(ghost){ return ghost.date_end; });
+
+                    var start_time = data_min["date_start"].getTime();
+                    var stop_time = data_max["date_end"].getTime();
+
+                    var start_pxscale = Math.round((start_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+                    var stop_pxscale = Math.round((stop_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+
+                    var bar_left = start_pxscale;
+                    var bar_width = stop_pxscale-start_pxscale;
+
+                    var ghost_bar = $('<div class="task-gantt-bar-ghosts"></div>');
+
+                    ghost_bar.addClass("task-gantt-bar-ghosts-"+row_id);
+
+                    ghost_bar.css({"left": bar_left + "px"});
+                    ghost_bar.css({"width": bar_width + "px"});
+
+                    // var rowdata = '#task-gantt-timeline-row-'+row_id;
+                    var rowdata = widget.$el;
+
+
+                    _.each(link_ghosts, function(link_ghost){
+
+                        var ghost_bar_x = $('<div class="task-gantt-bar-ghost"></div>');
+                        var ghost_start_time = link_ghost["date_start"].getTime();
+                        var ghost_stop_time = link_ghost["date_end"].getTime();
+
+                        var ghost_start_pxscale = Math.round((ghost_start_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+                        var ghost_stop_pxscale = Math.round((ghost_stop_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+
+                        var ghost_bar_left = ghost_start_pxscale;
+                        var ghost_bar_width = ghost_stop_pxscale-ghost_start_pxscale;
+
+                        ghost_bar_x.css({"left": ghost_bar_left + "px"});
+                        ghost_bar_x.css({"width": ghost_bar_width + "px"});
+
+                        $(rowdata).append(ghost_bar_x);
+                    });
+
+                    $(rowdata).append(ghost_bar);
+
+
+                }
+
+            }
+
+            return true;
+        })
+
+
+    }
+
+
+});
+
+return {
+    get_data_ghosts: get_data_ghosts,
+    GhostWidget: GanttTimeLineGhost
+}
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_head.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_head.js
new file mode 100644
index 000000000..70dba364e
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_head.js
@@ -0,0 +1,175 @@
+odoo.define('web_gantt_native.TimeLineHead', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+var Widget = require('web.Widget');
+
+
+
+
+var GanttTimeLineHead = Widget.extend({
+    template: "GanttTimeLine.head",
+
+    init: function(parent, timeScale, timeType, first_scale, second_scale) {
+        this._super(parent);
+
+        this.timeScale = timeScale;
+        this.timeType = timeType;
+
+        this.first_scale = first_scale;
+        this.second_scale = second_scale;
+        this.parent = parent;
+        this.TODAY = moment();
+
+
+       // this.record_id = this.record['id']
+
+    },
+
+
+
+    start: function(){
+
+
+
+
+
+        var self = this;
+        var el = self.$el;
+
+        var el_scale_secondary = el.find('.task-gantt-scale-secondary');
+
+
+        if (this.timeType === 'year_month') {
+
+            _.each(this.first_scale, function(range_date , rdate){
+
+                _.each(range_date, function(quarter){
+
+                        var div_cell ='';
+
+                        div_cell = $('<span class="task-gantt-bottom-column"></span>');
+                        div_cell.css({ width: self.timeScale + "px" });
+                        div_cell.css({ 'margin-top': -52 + "px" });
+                        el_scale_secondary.append(div_cell);
+                });
+
+            });
+
+        }
+
+
+        if (this.timeType === 'quarter') {
+            _.each(this.first_scale, function(range_date , rdate){
+                _.each(range_date, function(quarter){
+                        var div_cell ='';
+
+                        div_cell = $('<span class="task-gantt-bottom-column"></span>');
+                        div_cell.css({ width: self.timeScale + "px" });
+
+                        div_cell.css({ 'margin-top': -52 + "px" });
+
+                        el_scale_secondary.append(div_cell);
+                });
+            });
+        }
+
+
+        if (this.timeType === 'month_week') {
+            _.each(this.first_scale, function(range_date , rdate){
+                _.each(range_date, function(hour){
+                        var div_cell ='';
+
+                        div_cell = $('<span class="task-gantt-bottom-column"></span>');
+                        div_cell.css({ width: self.timeScale + "px" });
+
+                        div_cell.css({ 'margin-top': -52 + "px" });
+
+                        if (moment(hour).isSame(self.TODAY, 'week')){
+                            div_cell.addClass('task-gantt-today-column');
+                        }
+
+                        el_scale_secondary.append(div_cell);
+                });
+
+            });
+
+        }
+
+
+        if (this.timeType === 'month_day')
+        {
+            _.each(this.second_scale, function(day){
+
+                var div_cell ='';
+
+                div_cell = $('<span class="task-gantt-bottom-column"></span>');
+                div_cell.css({ width: self.timeScale + "px" });
+
+                if (moment(day).isoWeekday() === 6 || moment(day).isoWeekday() === 7){
+                    div_cell.addClass('task-gantt-weekend-column');
+                }
+                self.parent.isTODAYline = false;
+                if (moment(day).isSame(self.TODAY, 'day')){
+                    div_cell.addClass('task-gantt-today-column');
+                    self.parent.isTODAYline = true;
+                }
+
+                 div_cell.css({ 'margin-top': -52 + "px" });
+
+                return  el_scale_secondary.append(div_cell);
+
+            });
+
+
+        }
+
+
+        if (this.timeType === 'day_1hour' ||
+            this.timeType === 'day_2hour' ||
+            this.timeType === 'day_4hour' ||
+            this.timeType === 'day_8hour' ) {
+
+
+
+            _.each(this.first_scale, function(range_date , rdate){
+
+                _.each(range_date, function(hour){
+
+                        var div_cell ='';
+
+                       // var hours_string =  moment(hour).format("HH:mm");
+                        div_cell = $('<span class="task-gantt-bottom-column"></span>');
+                        // div_cell = $('<span class="task-gantt-bottom-column">'+hours_string+'</span>');
+                        div_cell.css({ width: self.timeScale + "px" });
+
+                        if (moment(hour).isoWeekday() === 6 || moment(hour).isoWeekday() === 7){
+                            div_cell.addClass('task-gantt-weekend-column');
+                        }
+
+                        if (moment(hour).isSame(self.TODAY, 'day')){
+                            div_cell.addClass('task-gantt-today-column');
+                        }
+
+                        div_cell.css({ 'margin-top': -52 + "px" });
+                        el_scale_secondary.append(div_cell);
+
+                });
+
+
+                }
+            );
+
+        }
+
+
+
+    },
+
+
+});
+
+return GanttTimeLineHead;
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_header.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_header.js
new file mode 100644
index 000000000..ebdde105d
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_header.js
@@ -0,0 +1,295 @@
+odoo.define('web_gantt_native.TimeLineHeader', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+var Widget = require('web.Widget');
+var GanttHeaderHint = require('web_gantt_native.HeaderHint');
+
+
+
+var GanttTimeLineHeader = Widget.extend({
+    // template: "TimelineGantt.header",
+
+    events: {
+        'mouseover  .task-gantt-bottom-column'    :'HandleTipOver',
+        'mouseout   .task-gantt-bottom-column'    :'HandleTipOut',
+    },
+
+    init: function(parent, timeScale, timeType, first_scale, second_scale, template, add_to) {
+        this._super(parent);
+
+        this.timeScale = timeScale;
+        this.timeType = timeType;
+
+        this.first_scale = first_scale;
+        this.second_scale = second_scale;
+
+        this.TODAY = moment();
+
+        this.template = template;
+        this.add_to = add_to;
+    },
+
+
+    HandleTipOver: function(ev) {
+        var self = this;
+        if (ev.target['data-id']){
+
+            if (self.__parentedParent.header_hint_widget) {
+                self.__parentedParent.header_hint_widget.do_show();
+            }
+            self.__parentedParent.header_hint_widget.show_hint(ev.target, ev.pageX, ev.pageY )
+        }
+    },
+
+
+    HandleTipOut: function(ev) {
+        var self = this;
+        if (self.__parentedParent.header_hint_widget) {
+            self.__parentedParent.header_hint_widget.do_hide();
+        }
+    },
+
+
+    start: function(){
+
+        var self = this;
+        var el = self.$el;
+        let renderer = self.__parentedParent
+
+        var gutterOffset = self.__parentedParent.local_storage.getItem("gantt_offset") || self.__parentedParent.gutterOffset;
+
+        var el_gantt_items = el.find('.timeline-gantt-items'+self.add_to);
+
+        el_gantt_items.css("width", gutterOffset);
+
+
+        var el_scale_primary = el.find('.timeline-gantt-scale-primary');
+        var el_scale_secondary = el.find('.timeline-gantt-scale-secondary');
+
+        var tip_el = self.__parentedParent.$('.task-gantt-line-tips')
+        var gantt_header_hint = new GanttHeaderHint(self.__parentedParent);
+        gantt_header_hint.appendTo(tip_el);
+        self.__parentedParent.header_hint_widget = gantt_header_hint;
+
+
+        if (this.timeType === 'day_1hour' ||
+            this.timeType === 'day_2hour' ||
+            this.timeType === 'day_4hour' ||
+            this.timeType === 'day_8hour' ) {
+
+            _.each(this.first_scale, function(range_date , rdate){
+
+                var dm =  moment(rdate).format("Do MMM dd - YY");
+                var monthScale = self.timeScale*range_date.length;
+
+                var div_cell = $('<span class="task-gantt-top-column"></span>');
+                    div_cell.css({ width: monthScale + "px" });
+                    div_cell.append($('<span class="task-gantt-scale-month-text">'+dm+'</span>'));
+
+                    el_scale_primary.append(div_cell);
+
+
+                _.each(range_date, function(hour){
+
+                    var div_cell ='';
+
+                    var hours_string =  moment(hour).format("HH:mm");
+
+                    div_cell = $('<span class="task-gantt-bottom-column">'+hours_string+'</span>');
+                    div_cell.css({ width: self.timeScale + "px" });
+
+                    if (moment(hour).isoWeekday() === 6 || moment(hour).isoWeekday() === 7){
+                        div_cell.addClass('task-gantt-weekend-column');
+                    }
+
+                    if (moment(hour).isSame(self.TODAY, 'day')){
+                        div_cell.addClass('task-gantt-today-column');
+                    }
+
+                    el_scale_secondary.append(div_cell);
+
+                });
+            });
+        }
+
+
+
+        if (this.timeType == 'month_day')
+        {
+            _.each(this.second_scale, function(day){
+
+                var div_cell ='';
+
+                div_cell = $('<span class="task-gantt-bottom-column">'+moment(day).date()+'</span>');
+                div_cell.css({ width: self.timeScale + "px" });
+
+                if (moment(day).isoWeekday() === 6 || moment(day).isoWeekday() === 7){
+                    div_cell.addClass('task-gantt-weekend-column');
+                }
+
+                if (moment(day).isSame(self.TODAY, 'day')){
+                    div_cell.addClass('task-gantt-today-column');
+                }
+
+                var day_s = moment(day).format('Do MMM dd (YY)');
+                div_cell.prop('data-id',day_s);
+
+                return  el_scale_secondary.append(div_cell);
+
+            });
+
+            _.each(this.first_scale, function(month){
+
+
+                     var monthScale = self.timeScale*month.days;
+
+                     var div_cell = $('<span class="task-gantt-top-column"></span>');
+                     div_cell.css({ width: monthScale + "px" });
+                     div_cell.append($('<span class="task-gantt-scale-month-text">' + month.year + ' - ' + month.month + '</span>'));
+
+
+                     return el_scale_primary.append(div_cell);
+
+            });
+
+        }
+
+
+        if (this.timeType == 'month_week') {
+
+
+            _.each(this.first_scale, function(range_date , rdate){
+
+                var dm =  moment(rdate,"YYYY").format("YYYY");
+
+                var monthScale = self.timeScale*range_date.length;
+
+                var div_cell = $('<span class="task-gantt-top-column"></span>');
+                    div_cell.css({ width: monthScale + "px" });
+                    div_cell.append($('<span class="task-gantt-scale-month-text">'+dm+'</span>'));
+
+                    el_scale_primary.append(div_cell);
+
+
+                _.each(range_date, function(week_num){
+
+                        var div_cell ='';
+
+                        var week_string =  moment(week_num).format("W");
+
+                        let marker = "iW"
+                        if (renderer.week_type === "week"){
+                            marker = "W"
+                        }
+
+                        div_cell = $('<span class="task-gantt-bottom-column">'+week_string+'</span>');
+                        div_cell.css({ width: self.timeScale + "px" });
+
+                        var week_s = moment(week_num).startOf(renderer.week_type).format('Do MMM dd (YY)');
+                        var week_e = moment(week_num).endOf(renderer.week_type).format('Do MMM dd (YY)');
+
+
+                        div_cell.prop('data-id',marker+": "+week_string+": "+week_s+" - "+week_e);
+
+                        if (moment(week_num).isSame(self.TODAY, 'week')){
+                            div_cell.addClass('task-gantt-today-column');
+                        }
+
+                        el_scale_secondary.append(div_cell);
+
+
+                });
+
+            });
+
+        }
+
+
+        if (this.timeType == 'quarter') {
+
+
+            _.each(this.first_scale, function(range_date , rdate){
+
+
+                var dm =  moment(rdate,"YYYY").format("YYYY");
+
+                var monthScale = self.timeScale*range_date.length;
+
+
+
+                var div_cell = $('<span class="task-gantt-top-column"></span>');
+                    div_cell.css({ width: monthScale + "px" });
+                    div_cell.append($('<span class="task-gantt-scale-month-text">'+dm+'</span>'));
+
+                    el_scale_primary.append(div_cell);
+
+
+                _.each(range_date, function(quarter){
+
+                        var div_cell ='';
+
+                       var week_string =  moment(quarter).format("Q");
+
+                        div_cell = $('<span class="task-gantt-bottom-column">'+week_string+'</span>');
+                        div_cell.css({ width: self.timeScale + "px" });
+
+                        el_scale_secondary.append(div_cell);
+                });
+
+            });
+
+
+        }
+
+
+
+        if (this.timeType == 'year_month') {
+
+
+            _.each(this.first_scale, function(range_date , rdate){
+
+
+               var dm =  moment(rdate,"YYYY").format("YYYY");
+
+                var monthScale = self.timeScale*range_date.length;
+
+
+
+                var div_cell = $('<span class="task-gantt-top-column"></span>');
+                    div_cell.css({ width: monthScale + "px" });
+                    div_cell.append($('<span class="task-gantt-scale-month-text">'+dm+'</span>'));
+
+                    el_scale_primary.append(div_cell);
+
+
+                _.each(range_date, function(quarter){
+
+                        var div_cell ='';
+
+                       var week_string =  moment(quarter).format("MMM");
+
+                        div_cell = $('<span class="task-gantt-bottom-column">'+week_string+'</span>');
+                        div_cell.css({ width: self.timeScale + "px" });
+
+                        el_scale_secondary.append(div_cell);
+                });
+
+            });
+
+        }
+
+
+
+
+
+    }
+
+
+
+});
+
+return GanttTimeLineHeader;
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_header_hint.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_header_hint.js
new file mode 100644
index 000000000..c2ba986cd
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_header_hint.js
@@ -0,0 +1,57 @@
+odoo.define('web_gantt_native.HeaderHint', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+var Widget = require('web.Widget');
+var time = require('web.time');
+
+var _t = core._t;
+
+
+
+var GanttHeaderHint = Widget.extend({
+    template: "GanttHeaderHint",
+
+
+    init: function(parent) {
+
+        this._super(parent);
+
+    },
+
+    start: function() {
+
+        var self = this;
+
+        self.$el.append('<div class="task-gantt-line-hint-names"></div>');
+        $('<div class="task-gantt-line-hint-name"></div>').appendTo(self.$el.children(".task-gantt-line-hint-names"));
+
+        self.$el.append('<div class="task-gantt-line-hint-values"></div>');
+        $('<div class=hint-start-value class="task-gantt-line-hint-value"></div>').appendTo(self.$el.children(".task-gantt-line-hint-values"));
+
+    },
+
+
+    renderElement: function () {
+        this._super();
+
+    },
+
+    show_hint : function(target, ex, ey) {
+
+        var self = this;
+
+        var o_left = ex;
+        var o_top = ey;
+
+        this.$el.find('div.hint-start-value').text(target['data-id']);
+        this.$el.offset({ top: o_top+30, left: o_left});
+
+    }
+
+});
+
+return GanttHeaderHint;
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_info.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_info.js
new file mode 100644
index 000000000..ccd17d7f8
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_info.js
@@ -0,0 +1,111 @@
+odoo.define('web_gantt_native.Info', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+
+var GanttTimeLineInfo = Widget.extend({
+    // template: "GanttTimeLine.info",
+
+    init: function(parent) {
+        this._super.apply(this, arguments);
+    },
+
+    gen_element: function(e_text, e_pos){
+
+
+            var e_class = 'task-gantt-bar-plan-info-' + e_pos;
+            var bar_e = $('<div class='+e_class+'/>');
+            var bar_e_text = $('<a/>');
+            bar_e_text.text(e_text);
+            bar_e.append(bar_e_text);
+
+            return bar_e
+
+
+    },
+
+
+    start: function(){
+
+        var self = this;
+        var el = self.$el;
+
+        var parentg =  this.getParent();
+
+        var data_widgets =  parentg.gantt_timeline_data_widget;
+
+        var task_info = parentg.Task_Info;
+
+        _.each(data_widgets, function(widget) {
+
+            if (!widget.record.is_group) {
+
+
+                    var el = widget.$el;
+
+                    var row_id = widget.record.id;
+                    var cp_detail = widget.record.cp_detail;
+                    var rowdata = '.task-gantt-bar-plan-' + row_id;
+                    var row_el = el.find(rowdata);
+
+
+                    var info_data = {};
+
+                    var task_info_to = _.where(task_info, {task_id: row_id});
+
+                    _.each(task_info_to, function(info){
+
+                        if (info["show"] || cp_detail) {
+
+                            _.each(info, function (info, key) {
+
+                                if (info_data[key]) {
+
+                                    if (info) {
+                                        info_data[key] = info_data[key] + ', ' + info
+                                    }
+                                } else {
+                                    info_data[key] = info
+
+                                }
+
+                            });
+                        }
+
+
+                    });
+
+
+                    //Record for text
+
+                    var info_list = {};
+
+                    info_list["start"] = info_data["start"] || '';
+                    info_list["left-up"] = info_data["left_up"] || '';
+                    info_list["left-down"] = info_data["left_down"] || '';
+                    info_list["end"] = info_data["end"] || '';
+                    info_list["right-up"] = info_data["right_up"] || '';
+                    info_list["right-down"] = info_data["right_down"] || '';
+
+                    _.each(info_list, function( val, key ) {
+
+                        row_el.append(self.gen_element(val, key));
+
+                    })
+
+            }
+
+            return true;
+        })
+
+
+    }
+
+
+});
+
+return {
+    InfoWidget: GanttTimeLineInfo
+}
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_intersection.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_intersection.js
new file mode 100644
index 000000000..bcbdcf74e
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_intersection.js
@@ -0,0 +1,123 @@
+
+
+odoo.define('web_gantt_native.InterSection', function (require) {
+    "use strict";
+
+    var Widget = require('web.Widget');
+    var time = require('web.time');
+
+
+
+    var GanttTimeLineInterSection = Widget.extend({
+        template: "GanttTimeLine.intersection",
+
+        init: function(parent) {
+            this._super.apply(this, arguments);
+
+        },
+
+
+        get_position_x: function(gantt_date_start, gantt_date_stop, parent){
+
+            var task_start_time = gantt_date_start.getTime();
+            var task_stop_time = gantt_date_stop.getTime();
+
+            var task_start_pxscale = Math.round((task_start_time-parent.firstDayScale) / parent.pxScaleUTC);
+            var task_stop_pxscale = Math.round((task_stop_time-parent.firstDayScale) / parent.pxScaleUTC);
+
+            var bar_left = task_start_pxscale;
+            var bar_width = task_stop_pxscale-task_start_pxscale;
+
+            return {
+                bar_left: bar_left,
+                bar_width: bar_width,
+            };
+
+        },
+
+        start: function(){
+            // var self = this;
+
+            let parentg =  this.getParent();
+
+            if (parentg.industry_show) {
+
+                let  get_position_x= this.get_position_x
+
+                let $zTree = parentg.widget_ztree.$zTree;
+                // let nodes = $zTree.getNodes();
+
+                let data_widgets =  parentg.gantt_timeline_data_widget;
+
+
+                _.each(data_widgets, function(widget) {
+                    if (widget.record.is_group) {
+                        let el = widget.$el
+                        let node =  $zTree.getNodeByParam("zt_id", widget.record.zt_id, null);
+
+                        let before_left = false
+                        let before_top = 0
+
+                        let childNodes = $zTree.transformToArray(node);
+
+                        let sorted_childNodes = _.sortBy(childNodes, 'task_start');
+
+                        _.each(sorted_childNodes, function (child) {
+
+                            if (child["id"] !== undefined) {
+
+                                let id = child["id"]
+                                //Gantt Bar
+                                var gantt_bar = $('<div class="task-gantt-bar-intersection"></div>');
+                                gantt_bar.prop('id', "task-gantt-bar-intersection-" + id);
+
+                                //Possition X
+                                var get_possition = get_position_x(child.task_start, child.task_stop, parentg);
+
+                                var bar_name = $('<div class="task-gantt-name">'+ child.value_name +'</div>');
+                                bar_name.css({"width": get_possition.bar_width-5 + "px"});
+                                gantt_bar.append(bar_name);
+
+
+                                if (before_left && before_left > get_possition.bar_left){
+
+                                    if (before_top === 0){
+                                        before_top = 16
+                                    }
+                                    else{
+                                        before_top = 0
+                                    }
+                                }
+
+                                before_left = get_possition.bar_left +  get_possition.bar_width
+
+                                gantt_bar.css({"top": before_top + "px"});
+                                gantt_bar.css({"left": get_possition.bar_left + "px"});
+                                gantt_bar.css({"width": get_possition.bar_width + "px"});
+
+                                gantt_bar.css({"background": "rgba(242, 133, 113, 0.6)"});
+
+                                el.append(gantt_bar);
+
+                            }
+                        })
+                    }
+                })
+            }
+        }
+    });
+
+    return {
+        InterSectionWidget: GanttTimeLineInterSection
+    }
+
+});
+
+
+
+
+
+
+
+
+
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_res_bar.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_res_bar.js
new file mode 100644
index 000000000..78b5cd94d
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_res_bar.js
@@ -0,0 +1,272 @@
+
+
+odoo.define('web_gantt_native.ResBar', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+var time = require('web.time');
+
+
+//     function secondsToTime(secs)
+// {
+//
+//
+//     var pad = function(num, size) { return ('000' + num).slice(size * -1); },
+//     time = parseFloat(secs).toFixed(3),
+//     hours = Math.floor(time / 60 / 60),
+//     minutes = Math.floor(time / 60) % 60,
+//     seconds = Math.floor(time - minutes * 60),
+//     milliseconds = time.slice(-3);
+//
+//         var obj = {
+//         "h": pad(hours, 2),
+//         "m": pad(minutes, 2),
+//         "s":  pad(seconds, 2)
+//     };
+//     return obj;
+//
+// }
+
+
+
+var GanttTimeLineResBar = Widget.extend({
+    template: "GanttTimeLine.resbar",
+
+    init: function(parent) {
+        this._super.apply(this, arguments);
+    },
+
+
+    start: function(){
+
+        var parentg =  this.getParent();
+
+        var data_widgets =  parentg.gantt_timeline_data_widget;
+        var task_load_data = parentg.Task_Load_Data;
+
+
+
+        if (task_load_data){
+
+            var gantt_attrs = parentg.arch.attrs;
+            var load_id = gantt_attrs["load_id"];
+            var load_id_from = gantt_attrs["load_id_from"];
+            var load_bar_record_row  =  gantt_attrs["load_bar_record_row"];
+            var load_data_id = gantt_attrs["load_data_id"];
+
+            // var subtask_project_id  =  gantt_attrs["subtask_project_id"];
+
+            // S1
+             var data_load_s1 = _.map(task_load_data, function (res_data) {
+
+                    var active_id = res_data[load_id] ? res_data[load_id][0] : -1;
+                    var active_id_from = res_data[load_id_from] ? res_data[load_id_from][0] : -1;
+
+                    return {
+                        data_from: res_data["data_from"],
+                        data_to : res_data["data_to"],
+                        active_id : active_id,
+                        active_id_from: active_id_from
+                }
+             });
+
+            var data_load_s2 = _.groupBy(data_load_s1, 'active_id' );
+
+            _.each(data_widgets, function(widget) {
+
+                    if (!widget.record.is_group) {
+
+                        var row_id = widget.record["id"];
+                        if (load_bar_record_row){
+                             row_id = widget.record[load_bar_record_row];
+                        }
+
+
+                        var color_gantt = widget.record["color_gantt"];
+
+
+                        var data_load = data_load_s2[row_id];
+
+
+                        // if (data_load) {
+                        // gantt_bar.css({"background": color_gantt.replace(/[^,]+(?=\))/, '0.2')});
+                        // }
+                        var rowdata = widget.$el;
+                        var active_id_from_data = widget.record["load_data_id"] ? widget.record["load_data_id"][0] : -1;
+
+                        if (load_data_id === "id") {
+                            active_id_from_data = widget.record["id"];
+                        }
+
+                        _.each(data_load, function(link_load){
+
+                                if (active_id_from_data === link_load.active_id_from){
+
+
+                                        var dt_start = time.auto_str_to_date(link_load.data_from);
+                                        var time_start = dt_start.getTime();
+
+                                        var dt_to = time.auto_str_to_date(link_load.data_to);
+                                        var time_to = dt_to.getTime();
+
+
+                                        var load_start_pxscale = Math.round((time_start-parentg.firstDayScale) / parentg.pxScaleUTC);
+                                        var load_stop_pxscale = Math.round((time_to-parentg.firstDayScale) / parentg.pxScaleUTC);
+
+                                        var load_bar_left = load_start_pxscale;
+                                        var load_bar_width = load_stop_pxscale-load_start_pxscale;
+
+                                        var load_bar_x = $('<div class="task-gantt-bar-load-task"></div>');
+
+                                        load_bar_x.css({"left": load_bar_left + "px"});
+                                        load_bar_x.css({"width": load_bar_width + "px"});
+
+                                        var gantt_bar = $(rowdata).find(".task-gantt-bar-plan");
+
+                                        gantt_bar.css({"background": color_gantt.replace(/[^,]+(?=\))/, '0.4')});
+                                        load_bar_x.css({"background": color_gantt});
+
+                                        $(rowdata).append(load_bar_x);
+
+                                 }
+
+
+
+                        });
+
+
+                    }
+
+
+
+
+
+
+            });
+
+
+
+                // var data_load = self.task_load_data[id];
+                //
+                // if (data_load) {
+                //     gantt_bar.css({"background": color_gantt.replace(/[^,]+(?=\))/, '0.2')});
+                // }
+                //
+                //  _.each(data_load, function(link_load){
+                //
+                //
+                //         var dt_start = time.auto_str_to_date(link_load.data_from);
+                //         var time_start = dt_start.getTime();
+                //
+                //         var dt_to = time.auto_str_to_date(link_load.data_to);
+                //         var time_to = dt_to.getTime();
+                //
+                //
+                //         var load_start_pxscale = Math.round((time_start-self.parent.firstDayScale) / self.parent.pxScaleUTC);
+                //         var load_stop_pxscale = Math.round((time_to-self.parent.firstDayScale) / self.parent.pxScaleUTC);
+                //
+                //         var load_bar_left = load_start_pxscale;
+                //         var load_bar_width = load_stop_pxscale-load_start_pxscale;
+                //
+                //         var load_bar_x = $('<div class="task-gantt-bar-load-task"></div>');
+                //
+                //         load_bar_x.css({"left": load_bar_left + "px"});
+                //         load_bar_x.css({"width": load_bar_width + "px"});
+                //
+                //         load_bar_x.css({"background": color_gantt});
+                //
+                //         self.$el.append(load_bar_x);
+                //
+                //
+                // });
+
+
+            //  _.each(data_widgets, function(widget) {
+            //
+            //     if (widget.record.is_group) {
+            //
+            //         var row_id = widget.record["group_id"] ? widget.record["group_id"][0] : -1;
+            //         var data_load_w = _.where(data_load_s3, {user_id: row_id});
+            //
+            //         // Get Load Data
+            //         if (typeof data_load_w !== 'undefined' && data_load_w.length > 0 ){
+            //
+            //             var data_group = data_load_w[0]["data_group"];
+            //
+            //             var gp_load =  _.map(data_group , function (data_load_value, key) {
+            //
+            //
+            //                 var duration =  _.reduce(data_load_value,
+            //                 function (memoizer, value) {
+            //                     return memoizer + value.duration;
+            //                 }, 0);
+            //
+            //                 var r_obj = [];
+            //                 r_obj["date"] = key;
+            //                 r_obj["duration"] = duration;
+            //
+            //                 return r_obj
+            //             });
+            //         }
+            //
+            //         var rowdata = widget.$el;
+            //
+            //         // Render Load Data
+            //         _.each(gp_load, function(link_load){
+            //
+            //             var date_point = time.auto_str_to_date(link_load.date);
+            //             var start_time = date_point.getTime();
+            //
+            //             var left_point = Math.round((start_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+            //
+            //             var load_bar_x = $('<div class="task-gantt-bar-load"></div>');
+            //
+            //             // var duration_seconds = humanizeDuration(parseInt(link_load.duration, 10)*1000, {round: true });
+            //
+            //             var duration_ = secondsToTime(link_load.duration);
+            //
+            //             var load_duration = $('<div class="task-gantt-load-duration">'+duration_.h+'</div>');
+            //             load_bar_x.append(load_duration);
+            //
+            //
+            //             if (duration_.m !== "00") {
+            //                 var load_duration_m = $('<div class="task-gantt-load-duration-m">' + duration_.m + '</div>');
+            //                 load_bar_x.append(load_duration_m);
+            //             }
+            //
+            //
+            //             load_bar_x.css({"left": left_point + "px"});
+            //             load_bar_x.css({"width": parentg.timeScale + "px"});
+            //
+            //             $(rowdata).append(load_bar_x);
+            //         });
+            //
+            //
+            //     }
+            //
+            // });
+
+
+
+        }
+
+    }
+
+});
+
+return {
+    ResBarWidget: GanttTimeLineResBar
+
+
+}
+
+});
+
+
+
+
+
+
+
+
+
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_res_level.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_res_level.js
new file mode 100644
index 000000000..8e372c574
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_res_level.js
@@ -0,0 +1,186 @@
+odoo.define('web_gantt_native.ResLevel', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+var time = require('web.time');
+
+
+function secondsToTime(secs)
+{
+
+    var pad = function(num, size) { return ('000' + num).slice(size * -1); },
+    time = parseFloat(secs).toFixed(3),
+    hours = Math.floor(time / 60 / 60),
+    minutes = Math.floor(time / 60) % 60,
+    seconds = Math.floor(time - minutes * 60),
+    milliseconds = time.slice(-3);
+
+        var obj = {
+        "h": pad(hours, 2),
+        "m": pad(minutes, 2),
+        "s":  pad(seconds, 2)
+    };
+    return obj;
+
+}
+
+
+var GanttTimeLineResLevel = Widget.extend({
+    template: "GanttTimeLine.reslevel",
+
+    init: function(parent) {
+        this._super.apply(this, arguments);
+    },
+
+
+    start: function(){
+
+        var parentg =  this.getParent();
+
+        var data_widgets =  parentg.gantt_timeline_data_widget;
+        var data_load = parentg.Task_Load_Data;
+
+
+
+        if (data_load){
+
+            // S1
+             var data_load_s1 = _.map(data_load, function (res_data) {
+                    return {
+                        data_aggr: res_data["data_aggr"],
+                        duration : res_data["duration"],
+                        load_id : res_data["resource_id"] ? res_data["resource_id"][0] : -1
+                }
+             });
+
+             // S2
+             var data_load_s2 = _.groupBy(data_load_s1, 'load_id' );
+
+             // S3
+             var data_load_s3 = _.map(data_load_s2, function (value, key) {
+
+                 var data_group = _.groupBy(value, 'data_aggr' );
+                 return {
+                        load_id : parseInt(key) || -1,
+                        data_group: data_group
+                 }
+             });
+
+
+             _.each(data_widgets, function(widget) {
+
+                if (widget.record.is_group) {
+
+                    var row_id = widget.record["group_id"] ? widget.record["group_id"][0] : -1;
+                    var data_load_w = _.where(data_load_s3, {load_id: row_id});
+
+                    // Get Load Data
+                    if (typeof data_load_w !== 'undefined' && data_load_w.length > 0 ){
+
+                        var data_group = data_load_w[0]["data_group"];
+
+                        var gp_load =  _.map(data_group , function (data_load_value, key) {
+
+
+                            var duration =  _.reduce(data_load_value,
+                            function (memoizer, value) {
+                                return memoizer + value.duration;
+                            }, 0);
+
+                            var r_obj = [];
+                            r_obj["date"] = key;
+                            r_obj["duration"] = duration;
+
+                            return r_obj
+                        });
+                    }
+
+                    var rowdata = widget.$el;
+
+                    // Render Load Data
+                    _.each(gp_load, function(link_load){
+
+                        var date_point = time.auto_str_to_date(link_load.date);
+                        var start_time = date_point.getTime();
+
+                        var left_point = Math.round((start_time-parentg.firstDayScale) / parentg.pxScaleUTC);
+
+                        var load_bar_x = $('<div class="task-gantt-bar-load"></div>');
+
+                        // var duration_seconds = humanizeDuration(parseInt(link_load.duration, 10)*1000, {round: true });
+
+                        var duration_ = secondsToTime(link_load.duration);
+
+
+
+                        var bar_W = 20;
+                        var one_line = false;
+                        if (parentg.timeType === "day_1hour"){
+                            bar_W =  2 * bar_W * 24;
+                            one_line = true
+                        }
+                        else if (parentg.timeType === "day_2hour"){
+                            bar_W =  2 *  bar_W * 12;
+                            one_line = true
+                        }else if (parentg.timeType === "day_4hour"){
+                            bar_W =  2 *  bar_W * 6;
+                            one_line = true
+                        }else if (parentg.timeType === "day_8hour"){
+                            bar_W =  2 *  bar_W * 3;
+                            one_line = true
+                        }
+
+
+
+                        if (one_line){
+
+                            bar_W = bar_W - 10;
+                            left_point = left_point + 5;
+
+                            var _m = '';
+                            if (duration_.m !== "00") {
+                                _m = ' : '+duration_.m;
+
+                            }
+                            var bar_one_line = $('<div class="task-gantt-load-duration_l">'+duration_.h+''+_m+'</div>');
+
+                            bar_one_line.css({"font-size": '1.0em'});
+                            load_bar_x.css({"background": 'rgba(223, 224, 222, 0.3)'});
+
+
+                            load_bar_x.append(bar_one_line)
+
+
+
+                        }else{
+                            load_bar_x.append($('<div class="task-gantt-load-duration">'+duration_.h+'</div>'));
+                            if (duration_.m !== "00") {
+                                load_bar_x.append($('<div class="task-gantt-load-duration-m">' + duration_.m + '</div>'));
+
+                            }
+                        }
+
+
+                        load_bar_x.css({"left": left_point + "px"});
+                        load_bar_x.css({"width": bar_W + "px"});
+
+                        $(rowdata).append(load_bar_x);
+                    });
+
+                }
+
+            });
+
+        }
+
+    }
+
+});
+
+return {
+    ResLevelWidget: GanttTimeLineResLevel
+
+
+}
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_timeline_scroll.js b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_scroll.js
new file mode 100644
index 000000000..ca01a13a7
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_timeline_scroll.js
@@ -0,0 +1,177 @@
+odoo.define('web_gantt_native.TimeLineScroll', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+var Widget = require('web.Widget');
+var time = require('web.time');
+
+
+var _t = core._t;
+
+
+
+var GanttTimeLineScroll = Widget.extend({
+    template: "TimelineGantt.scroll",
+
+    init: function(parent, timeScale, timeType, first_scale, second_scale) {
+        this._super(parent);
+
+        this.timeScale = timeScale;
+        this.timeType = timeType;
+
+        this.first_scale = first_scale;
+        this.second_scale = second_scale;
+
+        this.TODAY = moment();
+
+       // this.record_id = this.record['id']
+
+    },
+
+
+    scrollOffset: function (gantt_data_offset){
+
+
+        var scale_width = $('.timeline-gantt-scroll-scale').width()-50;
+
+        if (scale_width) {
+
+            var x1 = $('.task-gantt-timeline').width();
+            var x2 = $('.task-gantt-timeline-data').width();
+            var  scroll_width = x2 - x1;
+
+            var scale = scroll_width/(scale_width);
+
+            var offset_left = (gantt_data_offset) / scale;
+
+            if (offset_left > scale_width){
+                offset_left = scale_width
+            }
+
+            if (offset_left <= 0){
+                offset_left = 0
+            }
+
+
+            // $(".timeline-gantt-scroll-slider").offset({ left: offset_left  });
+
+            $(".timeline-gantt-scroll-slider").css({left:offset_left});
+            //$(".timeline-gantt-scroll-slider").position({ left: offset_left  });
+
+        }
+
+
+
+
+    },
+
+
+    updateCounterStatus: function ($event_counter, scale_width ,scroll_width) {
+
+        var self = this.__parentedParent;
+
+        // var offset = $event_counter.offset();
+        // var offset_left = offset.left;
+
+        var offset_left = $event_counter[0].offsetLeft;
+
+        var scale = scroll_width/(scale_width-50);
+        var scale_x = offset_left * scale;
+
+
+        $('.timeline-gantt-head').animate( { scrollLeft: scale_x }, 0);
+        $('.task-gantt-timeline').animate( { scrollLeft: scale_x }, 0);
+
+
+        //Test
+        self.TimeToLeft = scale_x;
+
+
+    },
+
+
+
+    start: function(){
+
+        var self = this;
+        var el = self.$el;
+        //
+        // var gutterOffset = self.__parentedParent.gutterOffsetSession || self.__parentedParent.gutterOffset;
+        //
+        //
+        //
+        // var menu = $('.o_sub_menu_content');
+        //
+        // if (menu){
+        //     gutterOffset = gutterOffset + menu[0].offsetWidth;
+        // }
+
+        // var div_cell = $('<div class="timeline-gantt-scroll-slider"></div>');
+
+        var div_cell = $('<div class="timeline-gantt-scroll-slider"></div>');
+
+        var scale_width = 0;
+        var scroll_width = 0;
+
+        div_cell.draggable({
+            axis: "x",
+            containment: ".timeline-gantt-scroll-scale",
+            scroll: false,
+
+            start: function () {
+
+                var timeline = $('.task-gantt-timeline');
+
+                scale_width = $('.timeline-gantt-scroll-scale').width();
+                var x1 = timeline.width();
+                var x2 = $('.task-gantt-timeline-data').width();
+                scroll_width = x2 - x1;
+
+                var x13 = timeline.scrollLeft();
+
+            },
+
+            drag: function() {
+
+                self.updateCounterStatus( div_cell, scale_width, scroll_width);
+            },
+
+        });
+
+        var parent = this.__parentedParent;
+
+
+        var scroll_start_dt = new Date(0);
+        scroll_start_dt.setTime(parent.firstDayDate);
+
+        var scroll_end_dt = new Date(0);
+        scroll_end_dt.setTime(parent.lastDayDate);
+
+        var l10n = _t.database.parameters;
+        var formatDate = time.strftime_to_moment_format( l10n.date_format + ' ' + l10n.time_format);
+
+        var scroll_start_str = moment(scroll_start_dt).format(formatDate);
+        var scroll_end_str = moment(scroll_end_dt).format(formatDate);
+
+        var bar_start = $('<div class="timeline-gantt-scroll-scale-start"></div>');
+        var bar_end = $('<div class="timeline-gantt-scroll-scale-end"></div>');
+
+        $('<div class="timeline-gantt-scroll-scale-start-date">'+scroll_start_str+'</div>').appendTo(bar_start);
+        $('<div class="timeline-gantt-scroll-scale-end-date">'+scroll_end_str+'</div>').appendTo(bar_end);
+
+        el.append(bar_start);
+        el.append(bar_end);
+
+        el.append(div_cell);
+
+        return this._super.apply(arguments);
+
+    }
+
+
+});
+
+return GanttTimeLineScroll;
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_tool_field.js b/odex25_project/web_gantt_native/static/src/js/gantt_tool_field.js
new file mode 100644
index 000000000..774421208
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_tool_field.js
@@ -0,0 +1,653 @@
+odoo.define('web_gantt_native.ToolField', function (require) {
+"use strict";
+
+
+    var time = require('web.time');
+    var field_utils = require('web.field_utils');
+
+    // var formats = require('web.formats');
+
+
+
+
+    function getFields(parent, group_bys) {
+
+        // this.fields_keys = _.keys(this.fields_view.fields);
+
+        var gantt_fields_0 = [
+            "id",
+            "display_name"
+        ];
+
+        var gantt_fields_1 = [
+
+            "name",
+            "date_start",
+            "date_stop",
+            "progress",
+            "user_id",
+
+            "task_time",
+
+            "project_id",
+            "date_deadline",
+            "progress",
+
+            "on_gantt",
+
+            "date_done",
+            "state",
+
+            "subtask_project_id",
+            "load_data_id",
+
+            "parent_id",
+
+            "default_seq",
+
+            "sorting_seq",
+            "sorting_level",
+            "subtask_count",
+
+            "is_milestone",
+            "schedule_mode",
+            "constrain_type",
+            "constrain_date",
+            "duration",
+            "plan_duration",
+
+            "summary_date_start",
+            "summary_date_end",
+
+            "plan_action",
+
+            "color_gantt_set",
+            "color_gantt",
+            "duration_scale",
+
+            "fold",
+
+            "critical_path",
+            "cp_shows",
+            "cp_detail",
+
+            "p_loop",
+
+            "doc_count"
+
+
+        ];
+
+        var model_fields_dict = [];
+        var model_fields = _.compact(_.map(gantt_fields_1, function(key) {
+
+            var key_field = parent.fields_view.arch.attrs[key] || '';
+            model_fields_dict[key] = key_field;
+            return key_field
+        }));
+
+
+        model_fields = _.uniq(model_fields.concat(group_bys, gantt_fields_0));
+
+
+        return {
+            model_fields : model_fields,
+            gantt_fields : gantt_fields_1,
+            model_fields_dict : model_fields_dict
+        }
+
+    }
+
+
+
+    function flatRows (row_datas, ItemsSorted) {
+
+        var rows_to_gantt = [];
+        var self = this;
+        //var sefl = undefined;
+        self.ItemsSorted = ItemsSorted;
+
+        //recursive tree to flat task.
+        var generate_flat_gantt = function(value, parent_value) {
+
+            var zt_id = false;
+            var zt_pId = "root_";
+
+
+            if (parent_value && !self.ItemsSorted){
+
+                zt_pId = parent_value.zt_id
+            }
+
+
+            if (value.is_group) {
+
+                value.zt_id =zt_pId+value.group_info[0]+"_"+value.group_info[1];
+
+                rows_to_gantt.push({
+
+                    id: value.id,
+                    is_group: value.is_group,
+                    group_id: value.group_info,
+                    // level: value.level,
+                    value_name: value.task_name,
+                    group_field: value.group_field,
+                    task_count: value.task_count,
+                    fold: value.fold,
+
+                    zt_pId: zt_pId,
+                    zt_id:  value.zt_id,
+                });
+
+            }
+            else {
+
+                //Some browser crash
+                var assign_to = undefined;
+                try {
+                     assign_to = value.assign_to[1];
+                } catch (err) {}
+
+
+                if (self.ItemsSorted){
+
+                    zt_pId = parent_value.zt_id;
+
+                    if ( value.parent_id ){
+
+                        zt_pId = value.parent_id[0]
+
+                    }
+
+                }
+
+
+                // zt_pId = 0;
+                // if ( value.parent_id ){
+                //
+                //     zt_pId = value.parent_id[0]
+                // }
+
+
+                rows_to_gantt.push({
+
+                    zt_id:  value.id,
+                    zt_pId : zt_pId,
+
+                    is_group: value.is_group,
+                    // group_field: value.group_field,
+
+                    id: value.id,
+                    group_id: value.group_info,
+                    // level: value.level,
+                    value_name: value.task_name,
+
+                    assign_to: assign_to,
+
+                    task_start: value.task_start,
+                    task_stop: value.task_stop,tree_seq: value.tree_seq,
+
+                    default_seq: value.default_seq,
+
+                    sorting_level : value.sorting_level,
+                    sorting_seq: value.sorting_seq,
+
+                    project_id : value.project_id,
+
+                    date_deadline: value.date_deadline,
+                    progress: value.progress,
+
+                    is_milestone: value.is_milestone,
+                    on_gantt: value.on_gantt,
+
+                    schedule_mode: value.schedule_mode,
+                    constrain_type: value.constrain_type,
+                    constrain_date: value.constrain_date,
+                    duration: value.duration,
+                    plan_duration: value.plan_duration,
+
+
+                    plan_action: value.plan_action,
+
+                    color_gantt:  value.color_gantt,
+                    color_gantt_set: value.color_gantt_set,
+
+                    duration_scale: value.duration_scale,
+
+                    summary_date_start: value.summary_date_start,
+                    summary_date_end: value.summary_date_end,
+
+                    subtask_project_id: value.subtask_project_id,
+                    load_data_id: value.load_data_id,
+
+                    parent_id: value.parent_id,
+                    subtask_count: value.subtask_count,
+
+                    date_done: value.date_done,
+                    state: value.state,
+
+                    fold: value.fold,
+
+                    critical_path: value.critical_path,
+                    cp_shows: value.cp_shows,
+                    cp_detail: value.cp_detail,
+
+                    p_loop: value.p_loop,
+                    doc_count: value.doc_count,
+
+                });
+
+            }
+
+            _.map(value.child_task, function(sub_task) {
+                generate_flat_gantt(sub_task, value);
+            });
+        };
+
+
+        //Generate Flat Gant to rows_to_gantt
+        _.map(row_datas, function(result) {
+           return generate_flat_gantt(result);
+        });
+
+        return rows_to_gantt;
+
+
+    }
+
+
+    function groupRows (tasks, group_bys, self_parent, ItemsSorted) {
+
+        var parent = self_parent;
+        var GtimeStopA  = [];
+        var GtimeStartA = [];
+
+        var model_fields_dict = parent.model_fields_dict;
+        var gantt_attrs = parent.gantt_attrs;
+        var second_sort = parent.second_sort;
+        var main_group = parent.main_group;
+
+       //prevent more that 1 group by
+        //   if (group_bys.length > 0) {
+        //       group_bys = [group_bys[0]];
+        //   }
+
+
+        // if there is no group by, simulate it
+        if (group_bys.length === 0) {
+            group_bys = ["_pseudo_group_by"];
+            _.each(tasks, function(el) {
+                el._pseudo_group_by = "Plain Gantt View";
+            });
+            this.fields._pseudo_group_by = {type: "string"};
+        }
+
+
+        //Sort
+        var sort_fld = "sequence";
+
+
+        if (second_sort){
+
+                sort_fld = model_fields_dict["default_seq"];
+                if (sort_fld) {
+                    tasks = _.sortBy(tasks, function (o) {
+                    return o[sort_fld];
+                    });
+                }
+        }
+
+
+        if (!second_sort){
+
+            if (ItemsSorted){
+
+                sort_fld = model_fields_dict["sorting_seq"];
+                if (sort_fld) {
+                    tasks = _.sortBy(tasks, function (o) {
+                    return o[sort_fld];
+                    });
+                }
+
+            }
+
+        }
+
+
+        // get the groups
+        var split_groups = function(tasks, group_bys) {
+
+            if (group_bys.length === 0)
+                return tasks;
+            var sp_groups = [];
+            _.each(tasks, function(task) {
+                var group_name = task[_.first(group_bys)];
+                var group = _.find(sp_groups, function(group) { return _.isEqual(group.name, group_name); });
+                if (group === undefined) {
+                    group = {name:group_name, tasks: [], __is_group: true};
+                   sp_groups.push(group);
+                }
+                group.tasks.push(task);
+            });
+            _.each(sp_groups, function(group) {
+                group.tasks = split_groups(group.tasks, _.rest(group_bys));
+            });
+            return sp_groups;
+        };
+
+        var groups = split_groups(tasks, group_bys);
+
+
+        //Sort by sequenses group if detect.
+        if (second_sort) {
+
+            var s_field = gantt_attrs["second_seq_field"];
+            groups = _.map(groups, function(result) {
+
+                var s_id = result["name"][0];
+                var sort_element = _.findWhere(second_sort, {id: s_id});
+
+                if (sort_element) {
+                    result["sort_seq"] = sort_element[s_field];
+                }else{
+                    result["sort_seq"] = -1;
+                }
+
+            return result
+
+            });
+
+
+            groups = _.sortBy(groups, function (o) {
+                return o["sort_seq"];
+            });
+
+        }
+
+        if (main_group) {
+
+            groups = _.map(groups, function(result) {
+
+                var s_id = result["name"][0];
+                var main_element = _.findWhere(main_group, {id: s_id});
+
+                if (main_element) {
+                    result["g_data"] = main_element;
+                }else{
+                    result["g_data"] = false;
+                }
+
+            return result
+
+            });
+        }
+
+
+
+
+        var assign_to = [];
+        // genrate task
+        var generate_task_info = function(task, plevel) {
+
+            var level = plevel || 0;
+            if (task.__is_group) {
+                assign_to = task.user_id;
+                var task_infos = _.compact(_.map(task.tasks, function(sub_task) {
+                    return generate_task_info(sub_task, level + 1);
+                }));
+                if (task_infos.length === 0)
+                    return;
+
+                //before
+                // format_value (value, descriptor, value_if_empty)
+                // var group_name = formats.format_value(task.name, parent.fields[group_bys[level]]);
+
+
+                //last//
+                // var field = parent.fields[group_bys[level]];
+                // var group_name = field_utils.format[field.type](task.name, field);
+
+                var group_name = undefined;
+
+                var field = parent.fields[group_bys[level]];
+
+                if (field && field.type === "datetime"){
+                    var value_format = time.auto_str_to_date(task.name);
+                    value_format = moment(value_format);
+                    group_name = field_utils.format[field.type](value_format, field, {timezone: false} );
+                }
+                else{
+                    group_name = field_utils.format[field.type](task.name, field);
+                }
+
+                // Group by check is fold
+                var fold = false;
+                if (task.hasOwnProperty("g_data"))
+                {
+                    fold = task.g_data["fold"]
+                }
+
+
+
+                var task_count = task_infos.length;
+                return {
+                    is_group: task.__is_group,
+                    group_info: task.name,
+                    group_field: group_bys[level],
+                    child_task:task_infos,
+                    task_name:group_name,
+                    level:level,
+                    task_count: task_count,
+                    fold: fold
+                };
+            } else {
+
+                var today = new Date();
+                var task_name = task.__name;
+
+
+                assign_to = task[model_fields_dict["user_id"]];
+
+                var mp_level = task[model_fields_dict["mp_level"]];
+
+                var default_seq = task[model_fields_dict["default_seq"]];
+
+                var sorting_level = task[model_fields_dict["sorting_level"]];
+                var sorting_seq = task[model_fields_dict["sorting_seq"]];
+
+                var subtask_project_id = task[model_fields_dict["subtask_project_id"]];
+                var load_data_id = task[model_fields_dict["load_data_id"]];
+
+                var parent_id = task[model_fields_dict["parent_id"]];
+                var subtask_count = task[model_fields_dict["subtask_count"]];
+
+
+                var task_start = time.auto_str_to_date(task[model_fields_dict["date_start"]]);
+                if (!task_start){
+                    task_start = today
+                }
+
+                var task_stop = time.auto_str_to_date(task[model_fields_dict["date_stop"]]);
+                if (!task_stop) {
+                    task_stop = task_start
+                }
+
+                var date_deadline = time.auto_str_to_date(task[model_fields_dict["date_deadline"]]);
+                if (!date_deadline){
+                    date_deadline = false
+                }
+
+                var progress = task[model_fields_dict["progress"]];
+                var is_milestone = task[model_fields_dict["is_milestone"]];
+                var on_gantt = task[model_fields_dict["on_gantt"]];
+
+                var project_id = undefined;
+                try {
+                     project_id = task[model_fields_dict["project_id"]][0];
+                } catch (err) {}
+
+
+                var date_done = time.auto_str_to_date(task[model_fields_dict["date_done"]]);
+                if (!date_done){
+                    date_done = false
+                }
+
+
+                var constrain_date = time.auto_str_to_date(task[model_fields_dict["constrain_date"]]);
+                if (!constrain_date){
+                    constrain_date = false
+                }
+
+                var duration = task[model_fields_dict["duration"]];
+                var plan_duration = task[model_fields_dict["plan_duration"]];
+
+
+                var plan_action = task[model_fields_dict["plan_action"]];
+
+                var color_gantt_set = task[model_fields_dict["color_gantt_set"]];
+                var color_gantt = task[model_fields_dict["color_gantt"]];
+
+                var duration_scale = task[model_fields_dict["duration_scale"]];
+
+
+                var summary_date_start = time.auto_str_to_date(task[model_fields_dict["summary_date_start"]]);
+                if (!summary_date_start){
+                    summary_date_start = false
+                }
+
+                var summary_date_end = time.auto_str_to_date(task[model_fields_dict["summary_date_end"]]);
+                if (!summary_date_end){
+                    summary_date_end = false
+                }
+
+
+                var schedule_mode = task[model_fields_dict["schedule_mode"]];
+                var constrain_type = task[model_fields_dict["constrain_type"]];
+
+                var state = task[model_fields_dict["state"]];
+
+                var fold = task[model_fields_dict["fold"]];
+
+                var critical_path = task[model_fields_dict["critical_path"]];
+                var cp_shows = task[model_fields_dict["cp_shows"]];
+                var cp_detail = task[model_fields_dict["cp_detail"]];
+
+                var p_loop = task[model_fields_dict["p_loop"]];
+                var doc_count = task[model_fields_dict["doc_count"]];
+
+
+
+
+                try {
+                     GtimeStopA.push(task_stop.getTime());
+                } catch (err) {}
+
+                try {
+                     GtimeStartA.push(task_start.getTime());
+                } catch (err) {}
+
+                try {
+                     GtimeStopA.push(date_done.getTime());
+                     GtimeStartA.push(date_done.getTime());
+                } catch (err) {}
+
+                try {
+                    GtimeStopA.push(date_deadline.getTime());
+                    GtimeStartA.push(date_deadline.getTime());
+                } catch (err) {}
+
+
+
+                return {
+                    id:task.id,
+                    task_name: task_name,
+                    task_start: task_start,
+                    task_stop: task_stop,
+                    level:level,
+                    assign_to:assign_to,
+
+                    mp_level : mp_level,
+
+                    default_seq : default_seq,
+
+                    sorting_level : sorting_level,
+                    sorting_seq : sorting_seq,
+
+                    project_id: project_id,
+
+                    date_deadline: date_deadline,
+
+                    progress: progress,
+
+                    is_milestone: is_milestone,
+
+                    constrain_date: constrain_date,
+                    schedule_mode: schedule_mode,
+                    constrain_type: constrain_type,
+
+                    duration: duration,
+                    plan_duration: plan_duration,
+
+
+                    plan_action: plan_action,
+
+                    color_gantt_set: color_gantt_set,
+                    color_gantt:  color_gantt,
+
+                    duration_scale: duration_scale,
+
+                    summary_date_start: summary_date_start,
+                    summary_date_end: summary_date_end,
+
+                    on_gantt: on_gantt,
+
+                    subtask_project_id: subtask_project_id,
+                    load_data_id: load_data_id,
+
+                    parent_id: parent_id,
+                    subtask_count: subtask_count,
+
+                    date_done: date_done,
+                    state: state,
+
+                    fold:fold,
+
+                    critical_path:critical_path,
+                    cp_shows: cp_shows,
+                    cp_detail: cp_detail,
+
+                    p_loop: p_loop,
+
+                    doc_count: doc_count,
+
+                    is_group: false,
+                    // group_field: group_bys[level],
+
+
+                };
+            }
+        };
+
+        //generate projects info from groupby
+        var projects = _.map(groups, function(result) {
+           return generate_task_info(result, 0);
+        });
+
+
+        return {
+            projects : projects,
+            timestop : GtimeStopA,
+            timestart : GtimeStartA
+
+        }
+
+
+    }
+
+    return {
+        flatRows: flatRows,
+        groupRows: groupRows,
+        getFields : getFields
+    }
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_tool_hint.js b/odex25_project/web_gantt_native/static/src/js/gantt_tool_hint.js
new file mode 100644
index 000000000..228cfcca2
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_tool_hint.js
@@ -0,0 +1,105 @@
+odoo.define('web_gantt_native.ToolHint', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+var Widget = require('web.Widget');
+var time = require('web.time');
+
+
+
+
+var _t = core._t;
+
+
+
+var GanttToolHint = Widget.extend({
+    template: "GanttToolHint",
+
+
+    init: function(parent) {
+
+        this._super(parent);
+
+    },
+
+    start: function() {
+
+        var self = this;
+
+        this.$el.append('<div class="task-gantt-line-hint-names"></div>');
+
+        $('<div class="task-gantt-line-hint-name">Start date:</div>').appendTo(this.$el.children(".task-gantt-line-hint-names"));
+        $('<div class="task-gantt-line-hint-name">End date:</div>').appendTo(this.$el.children(".task-gantt-line-hint-names"));
+        $('<div class="task-gantt-line-hint-name">Duration:</div>').appendTo(this.$el.children(".task-gantt-line-hint-names"));
+        $('<div class="task-gantt-line-hint-name">Deadline:</div>').appendTo(this.$el.children(".task-gantt-line-hint-names"));
+
+        this.$el.append('<div class="task-gantt-line-hint-values"></div>');
+
+        $('<div class=hint-start-value class="task-gantt-line-hint-value"></div>').appendTo(this.$el.children(".task-gantt-line-hint-values"));
+        $('<div class=hint-end-value class="task-gantt-line-hint-value"></div>').appendTo(this.$el.children(".task-gantt-line-hint-values"));
+        $('<div class=hint-duration-value class="task-gantt-line-hint-value"></div>').appendTo(this.$el.children(".task-gantt-line-hint-values"));
+        $('<div class=hint-deadline-value class="task-gantt-line-hint-value"></div>').appendTo(this.$el.children(".task-gantt-line-hint-values"));
+
+
+    },
+
+
+    renderElement: function () {
+        this._super();
+
+    },
+
+    show_hint : function(gantt_bar, start_end, ui, type) {
+
+            // var task_start = start_end.task_start;
+            // task_start = time.auto_date_to_str(task_start, 'datetime');
+            // var task_end = start_end.task_end;
+            // task_end = time.auto_date_to_str(task_end, 'datetime');
+
+
+            var l10n = _t.database.parameters;
+
+            var formatDate = time.strftime_to_moment_format( l10n.date_format + ' ' + l10n.time_format);
+
+
+            var task_start = moment(start_end.task_start).format(formatDate);
+            var task_end = moment(start_end.task_end).format(formatDate);
+
+            var duration = moment.duration(moment(start_end.task_start).diff(moment(start_end.task_end)));
+
+            var duration_seconds = humanizeDuration(parseInt(duration.asSeconds(), 10)*1000, {round: true });
+
+
+
+            var o_left = gantt_bar.offset().left;
+            var o_top = gantt_bar.offset().top;
+
+            if (ui){
+                o_left = ui.offset.left;
+                o_top = ui.offset.top;
+
+            }
+
+            this.$el.find('div.hint-start-value').text(task_start);
+            this.$el.find('div.hint-end-value').text(task_end);
+            this.$el.find('div.hint-duration-value').text(duration_seconds);
+
+
+            if (type === "deadline"){
+
+
+                    var formatDateOnly = time.strftime_to_moment_format( l10n.date_format);
+                    var deadline_time = moment(start_end.deadline_time).format(formatDateOnly);
+                    this.$el.find('div.hint-deadline-value').text(deadline_time);
+
+            }
+
+            this.$el.offset({ top: o_top-55, left: o_left});
+    }
+
+});
+
+return GanttToolHint;
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/gantt_tool_tip.js b/odex25_project/web_gantt_native/static/src/js/gantt_tool_tip.js
new file mode 100644
index 000000000..24f9ec861
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/gantt_tool_tip.js
@@ -0,0 +1,240 @@
+odoo.define('web_gantt_native.ToolTip', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+var Widget = require('web.Widget');
+var time = require('web.time');
+var _t = core._t;
+
+
+
+var GanttToolTip = Widget.extend({
+    template: "GanttToolTip",
+
+   /// this.chart.tooltip.show(this.resizerOffsetX, this);
+
+    init: function(parent, ganttbar, event) {
+
+        this._super(parent);
+        this.record = ganttbar;
+        this.event = event;
+
+    },
+
+    start: function() {
+
+
+        var self = this;
+
+        this.$el.append('<div class="task-gantt-line-tip-names"></div>');
+
+        var record = self.record[0];
+
+        if (record) {
+
+            var record_data = record.record;
+
+            var name = record_data['value_name'];
+
+            // var task_start = record_data['task_start'].toUTCString()
+            //
+            // var ttt = record_data.task_start;
+
+            // var formatDate = "DD.MM.YYYY HH:mm:ss"; // the string that represents desired format.
+            var l10n = _t.database.parameters;
+
+            var formatDate = time.strftime_to_moment_format( l10n.date_format + ' ' + l10n.time_format);
+
+
+            // var task_start = time.auto_date_to_str(record_data.task_start, 'datetime');
+
+
+            var task_start = moment(record_data["task_start"]).format(formatDate);
+            var task_stop = moment(record_data["task_stop"]).format(formatDate);
+
+            var date_deadline = false;
+            if (record_data["date_deadline"]) {
+
+                date_deadline = moment(record_data["date_deadline"]).format(formatDate);
+            }
+
+
+            // var task_stop = record_data['task_stop'];
+            // task_stop = time.auto_date_to_str(task_stop, 'datetime');
+
+            // var date_deadline = record_data['date_deadline'];
+            // date_deadline = time.auto_date_to_str(date_deadline, 'datetime');
+
+            var progress = '';
+            var progress_name = 'progress';
+            if (record_data['progress']){
+                progress = record_data['progress'];
+
+                var progress_field = self.__parentedParent.model_fields_dict['progress'];
+                if (progress_field){
+                    progress_name = self.__parentedParent.fields[progress_field].string;
+
+                }
+                self.__parentedParent.fields[''];
+                // progress_name
+                //self.model_fields_dict = getFields["model_fields_dict"];
+
+            }
+
+            var date_done = false;
+            if (record_data["date_done"]) {
+
+                date_done = moment(record_data["date_done"]).format(formatDate);
+
+            }
+
+            var duration = false;
+            if (record_data["duration"]) {
+                var total = parseInt(record_data["duration"], 10);
+
+                if (record_data['duration_scale']) {
+                    duration = humanizeDuration(total*1000,{ units: record_data['duration_scale'].split(","), round: true });
+                }
+                else{
+                    duration = humanizeDuration(total*1000, {round: true });
+
+                }
+
+            }
+
+            var plan_duration = false;
+            if (record_data["plan_duration"]) {
+                var plan_total = parseInt(record_data["plan_duration"], 10);
+
+                if (record_data['duration_scale']) {
+                    plan_duration = humanizeDuration(plan_total*1000,{ units: record_data['duration_scale'].split(","), round: true});
+                }
+                else{
+                    plan_duration = humanizeDuration(plan_total*1000, {round: true });
+                }
+
+            }
+
+
+
+
+
+            var constrain_type = false;
+            if (record_data['constrain_type']){
+
+
+                var type = [];
+                type["asap"] = 'As Soon As Possible';
+                type["alap"] = 'As Late As Possible';
+                type["fnet"] = 'Finish No Earlier Than';
+                type["fnlt"] = 'Finish No Later Than';
+                type["mso"] = 'Must Start On';
+                type["mfo"] = 'Must Finish On';
+                type["snet"] = 'Start No Earlier Than';
+                type["snlt"] = 'Start No Later Than';
+
+                constrain_type = type[record_data['constrain_type']];
+
+
+            }
+
+            var constrain_date = "none";
+            if (record_data["constrain_date"]) {
+
+                constrain_date = moment(record_data["constrain_date"]).format(formatDate);
+
+            }
+
+
+
+
+
+            $('<div class="task-gantt-line-tip-name">Name:</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+            $('<div class="task-gantt-line-tip-name">Start date:</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+            $('<div class="task-gantt-line-tip-name">End date:</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+            $('<div class="task-gantt-line-tip-name">Deadline:</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+            $('<div class="task-gantt-line-tip-name">'+progress_name+'</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+
+            if (date_done) {
+                 $('<div class="task-gantt-line-tip-name">Done date:</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+            }
+
+            if (plan_duration) {
+                 $('<div class="task-gantt-line-tip-name">Plan Duration:</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+            }
+
+            if (duration) {
+                 $('<div class="task-gantt-line-tip-name">Duration:</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+            }
+
+            if (constrain_type) {
+                 $('<div class="task-gantt-line-tip-name">Constraint:</div>').appendTo(this.$el.children(".task-gantt-line-tip-names"));
+            }
+
+            this.$el.append('<div class="task-gantt-line-tip-values"></div>');
+
+
+
+
+            $('<div class="task-gantt-line-tip-value">' + name + '</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+            $('<div class="task-gantt-line-tip-value">' + task_start + '</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+            $('<div class="task-gantt-line-tip-value">' + task_stop + '</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+            $('<div class="task-gantt-line-tip-value">' + date_deadline + '</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+            $('<div class="task-gantt-line-tip-value">' + progress + '%</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+
+            if (date_done) {
+                $('<div class="task-gantt-line-tip-value">' + date_done + '</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+            }
+            if (plan_duration) {
+                $('<div class="task-gantt-line-tip-value">' + plan_duration + '</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+            }
+
+            if (duration) {
+                $('<div class="task-gantt-line-tip-value">' + duration + '</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+            }
+
+            if (constrain_type) {
+                $('<div class="task-gantt-line-tip-value">' + constrain_type + ': ' + constrain_date + '</div>').appendTo(this.$el.children(".task-gantt-line-tip-values"));
+            }
+
+
+        }
+
+        if (self.record.offset()) {
+
+            var o_left = this.event.pageX;
+            var o_top = self.record.offset().top;
+
+            var o_right = $(window).width() - (self.record.offset().left + self.record.outerWidth());
+
+            var tip_lenght = this.$el.children(".task-gantt-line-tip-names").children().length;
+            var top_new = o_top - (15*tip_lenght); // if added tip plus 15 every tip
+
+            if (o_top < 325){
+                top_new = o_top + 20;
+            }
+
+            if (o_right < 200){
+                o_left = o_left - 200;
+            }
+
+            this.$el.offset({top: top_new , left: o_left});
+        }
+
+    },
+
+
+    renderElement: function () {
+        this._super();
+        this.$el.data('record', this);
+
+    },
+
+
+
+});
+
+return GanttToolTip;
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/native_gantt_controller.js b/odex25_project/web_gantt_native/static/src/js/native_gantt_controller.js
new file mode 100644
index 000000000..68b239dc8
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/native_gantt_controller.js
@@ -0,0 +1,650 @@
+odoo.define('web_gantt_native.NativeGanttController', function (require) {
+"use strict";
+
+var AbstractController = require('web.AbstractController');
+var core = require('web.core');
+var config = require('web.config');
+var Dialog = require('web.Dialog');
+var dialogs = require('web.view_dialogs');
+var time = require('web.time');
+
+var GanttPager = require('web_gantt_native.Pager');
+
+
+
+var _t = core._t;
+var QWeb = core.qweb;
+
+
+var NativeGanttController = AbstractController.extend({
+
+    custom_events: _.extend({}, AbstractController.prototype.custom_events, {
+        gantt_refresh_after_change: '_onGanttRefresh',
+        gantt_fast_refresh_after_change: '_refresh_after_change',
+        gantt_add_hover: '_add_hover',
+        gantt_remove_hover: '_remove_hover',
+
+        // gantt_drop_item: '_drop_item',
+
+        'sort_item': function (event) {
+            this.sort_item(event.target);
+        },
+
+    }),
+    events: _.extend({}, AbstractController.prototype.events, {
+
+        'mouseover  .task-gantt-info, .task-gantt-timeline-row'     :'HandleHoverOver',
+        'mouseout   .task-gantt-info, .task-gantt-timeline-row'     :'HandleHoverOut',
+
+     }),
+
+
+
+    init: function (parent, model, renderer, params) {
+        this._super.apply(this, arguments);
+        this.set('title', params.title);
+        this.context = params.context;
+        this.initialState = params.initialState;
+
+    },
+
+
+    _onOpenRecord: function (event) {
+        event.stopPropagation();
+        // var record = this.model.get(event.data.id, {raw: true});
+        this.trigger_up('switch_view', {
+            view_type: 'form',
+            res_id: event.data.res_id,
+            mode: event.data.mode || 'readonly',
+            model: event.data.model
+        });
+    },
+
+
+    _onGanttRefresh: function (event) {
+        var self = this;
+        this.model._do_load().then(function (ev) {
+                self.reload();
+            });
+
+    },
+
+
+    _refresh_after_change: function () {
+        this.renderer.fast_update = true;
+        var def = this._update(this.initialState, { shouldUpdateSearchComponents: false });
+        return Promise.all([def]);
+
+    },
+
+    _update: async function (state, params) {
+        var self = this;
+    //Get Zoom Event from time scale type
+        var def = undefined;
+        if (this.renderer.timeType === 'month_day'){
+            await self.ZoomDaysClick();
+        }
+        if (this.renderer.timeType === 'day_1hour'){
+            await self.Zoom1hClick();
+        }
+        if (this.renderer.timeType === 'day_2hour'){
+            await self.Zoom2hClick();
+        }
+        if (this.renderer.timeType === 'day_4hour'){
+            await self.Zoom4hClick();
+        }
+        if (this.renderer.timeType === 'day_8hour'){
+            await self.Zoom8hClick();
+        }
+        if (this.renderer.timeType === 'year_month'){
+            await self.ZoomMonthClick();
+        }
+        if (this.renderer.timeType === 'month_week'){
+            await self.ZoomWeeksClick();
+        }
+        if (this.renderer.timeType === 'quarter'){
+            await self.ZoomQuarterClick();
+        }
+
+
+
+        //Update
+
+        //Get Getter offset from session
+
+        $('.task-gantt-list').width(this.renderer.local_storage.getItem("gantt_offset") || this.renderer.gutterOffset);
+        $('.timeline-gantt-items').width(this.renderer.local_storage.getItem("gantt_offset") || this.renderer.gutterOffset);
+
+        $('.task-gantt-items').width(this.renderer.local_storage.getItem("items_offset") || this.renderer.itemsOffset);
+        //Hover selected rows after refresh page
+        var rowdata = '#task-gantt-timeline-row-'+this.renderer.hover_id;
+        var rowitem = '#task-gantt-item-'+this.renderer.hover_id;
+
+        $(rowdata).addClass("task-gantt-timeline-row-hover");
+        $(rowitem).addClass("task-gantt-item-hover");
+
+
+        // Goto Vertial and Horizontal Scroll
+        if (this.renderer.TimeToLeft) {
+            var task_left = this.renderer.TimeToLeft;
+            $('.task-gantt-timeline').animate({
+                scrollLeft: task_left
+                }, 0, function() {
+            // Animation complete.
+            });
+            $('.timeline-gantt-head').animate({
+                scrollLeft: task_left
+                }, 0, function() {
+            // Animation complete.
+            });
+
+
+            this.renderer.gantt_timeline_scroll_widget.scrollOffset(task_left);
+
+        }
+
+
+        if (this.renderer.ScrollToTop) {
+           var panel_top = this.renderer.ScrollToTop;
+            $('.task-gantt').animate({
+                scrollTop: panel_top
+                }, 0, function() {
+            // Animation complete.
+          });
+        }
+
+        if (this.pager){
+            this.pager.refresh(this.renderer.state.pager.records, this.renderer.state.pager.limit);
+        }
+
+        // sync sync promise :
+        // await this._super(...arguments);
+        // await this.update({ shouldUpdateSearchComponents: false }, { reload: false });
+        // return Promise.all([def, this._super.apply(this, arguments)]);
+        // return this._super.apply(this, arguments);
+    },
+
+
+    renderPager: function ($node, options) {
+
+        var self = this;
+        var data = [];
+
+        data["size"] = this.renderer.state.pager.records;
+        data["limit"] = this.renderer.state.pager.limit;
+
+        this.pager = new GanttPager(this, data.size, data.limit, options);
+
+        this.pager.on('pager_changed', this, function (newState) {
+            self.pager.disable();
+            self.renderer.state.pager.limit = parseInt(newState.limit);
+            self.reload().then(self.pager.enable.bind(self.pager));
+        });
+
+        this.pager.appendTo($node);
+
+    },
+
+
+    renderButtons: function ($node) {
+
+        var context = {measures: _.pairs(_.omit(this.measures, '__count__'))};
+        this.$buttons = $(QWeb.render('APSGanttView.buttons', context));
+        this.$buttons.click(this.on_button_click.bind(this));
+
+        this.renderPager(this.$buttons)
+
+    },
+
+    on_button_click: function (event) {
+
+        this.renderer.fast_update = true;
+        let $target = $(event.target);
+
+        if ($target.hasClass('task-gantt-today')) { return this.ClickToday(); }
+        if ($target.hasClass('task-gantt-zoom-1h')) {  this.renderer.timeType = 'day_1hour';}
+        if ($target.hasClass('task-gantt-zoom-2h')) { this.renderer.timeType = 'day_2hour'; }
+        if ($target.hasClass('task-gantt-zoom-4h')) {  this.renderer.timeType = 'day_4hour'; }
+        if ($target.hasClass('task-gantt-zoom-8h')) { this.renderer.timeType = 'day_8hour'; }
+        if ($target.hasClass('task-gantt-zoom-days')) { this.renderer.timeType = 'month_day'; }
+        if ($target.hasClass('task-gantt-zoom-month')) { this.renderer.timeType = 'year_month'; }
+        if ($target.hasClass('task-gantt-zoom-weeks')) { this.renderer.timeType = 'month_week' }
+        if ($target.hasClass('task-gantt-zoom-quarter')) { this.renderer.timeType = 'quarter' }
+
+        return this._refresh_after_change();
+    },
+
+
+
+    ModificateAfterRender: function () {
+
+        // Goto Horizontal Scroll and slider possition
+        if (this.renderer.TimeToLeft) {
+            var task_left = this.renderer.TimeToLeft;
+            $('.task-gantt-timeline').animate({
+                scrollLeft: task_left
+            }, 0, function () {
+                // Animation complete.
+            });
+            $('.timeline-gantt-head').animate({
+                scrollLeft: task_left
+            }, 0, function () {
+                // Animation complete.
+            });
+
+            this.renderer.gantt_timeline_scroll_widget.scrollOffset(task_left);
+        }
+    },
+
+
+
+
+
+    //Zoom Out - Zoom In
+
+    Zoom1hClick: async function() {
+        await this.ZoomHoursClick(1, 'day_1hour' );
+        // this.timeType = 'day_1hour';
+    },
+    Zoom2hClick: async function() {
+        await this.ZoomHoursClick(2, 'day_2hour');
+        // this.timeType = 'day_2hour';
+    },
+    Zoom4hClick: async function() {
+        await this.ZoomHoursClick(4, 'day_4hour');
+        // this.timeType = 'day_4hour';
+    },
+    Zoom8hClick: async function() {
+        await this.ZoomHoursClick(8, 'day_8hour');
+        // this.timeType = 'day_8hour';
+    },
+
+
+
+    ZoomHoursClick: async function (div_hour, timeType) {
+
+        this.renderer.firstDayDate = moment(this.renderer.GtimeStart).clone().startOf('month'); //Start month
+        this.renderer.lastDayDate = moment(this.renderer.GtimeStop).clone().endOf('month'); //End
+
+        this.renderer.timeScaleUTC = this.renderer.lastDayDate.valueOf() - this.renderer.firstDayDate.valueOf(); // raznica vremeni
+        this.renderer.firstDayScale = this.renderer.firstDayDate.valueOf();
+
+        var iter = moment(this.renderer.firstDayDate).twix(this.renderer.lastDayDate).iterate(div_hour, 'hours');
+
+        var hour2Range = [];
+        while (iter.hasNext()) {
+
+            hour2Range.push(iter.next().toDate())
+
+        }
+
+
+        var daysGroup = _(hour2Range).groupBy(function (day) {
+            return moment(day).format("YYYY MM DD");
+
+        });
+
+        this.renderer.timeType = timeType;
+        this.renderer.timeScale = 40; //px
+
+        var iter_k = moment(this.renderer.firstDayDate).twix(this.renderer.lastDayDate).iterate(1, 'hours');
+
+        var K_scale = 0;
+        while (iter_k.hasNext()) {
+            iter_k.next();
+            K_scale = K_scale + 1;
+        }
+
+        K_scale = K_scale / div_hour;
+        // var K_scale = hour2Range.length;
+        //
+        // var first_tzm_m = this.renderer.firstDayDate.format("ZZ");
+        // var second_tzm_m = this.renderer.lastDayDate.format("ZZ");
+        // var diff_tzm_h = ( first_tzm_m - second_tzm_m)/100;
+        //
+        // K_scale = K_scale - (diff_tzm_h / div_hour);
+
+
+        this.renderer.timeline_width = this.renderer.timeScale * K_scale; // min otrzok 60 - eto 4 4asa. v sutkah 6 otrezkov
+        // this.renderer.timeline_width = this.renderer.timeScale*1092.5; // min otrzok 60 - eto 4 4asa. v sutkah 6 otrezkov
+
+        this.renderer.pxScaleUTC = Math.round(this.renderer.timeScaleUTC / this.renderer.timeline_width); // skolko vremeni v odnom px
+
+        await this.renderer.AddItemList();
+
+        await this.renderer.AddItemsData();
+
+        await this.renderer.AddTimeLineHead(this.renderer.timeScale, this.renderer.timeType, daysGroup, false);
+        await this.renderer.AddTimeLineData(this.renderer.timeScale, this.renderer.timeType, this.renderer.rows_to_gantt);
+
+        await this.renderer.AddTimeLineArrow(this.renderer.timeline_width);
+        await this.renderer.AddTimeLineGhost();
+
+        await this.renderer.AddTimeLineSummary();
+        await this.renderer.AddTimeLineFirst();
+
+        await this.renderer.DivResize();
+        await this.renderer.ModeActive();
+
+        this.ModificateAfterRender()
+
+    },
+
+
+    ZoomDaysClick: async function () {
+
+        this.renderer.firstDayDate = moment(this.renderer.GtimeStart).clone().startOf('month'); //Start month
+        this.renderer.lastDayDate = moment(this.renderer.GtimeStop).clone().endOf('month'); //End
+        this.renderer.timeScaleUTC = this.renderer.lastDayDate.valueOf() - this.renderer.firstDayDate.valueOf(); //raznica vremeni
+        this.renderer.firstDayScale = this.renderer.firstDayDate.valueOf();
+
+        var currentLocaleData = moment.localeData();
+
+        //Get Days Range
+        var iter = moment(this.renderer.firstDayDate).twix(this.renderer.lastDayDate).iterate("days");
+
+        var dayRange = [];
+        while (iter.hasNext()) {
+            dayRange.push(iter.next().toDate())
+        }
+
+        //Get Year - Month range
+        var iter_first = moment(this.renderer.firstDayDate).twix(this.renderer.lastDayDate).iterate("month");
+
+        var monthRange = [];
+        while (iter_first.hasNext()) {
+
+            var mt_month = iter_first.next();
+            var month = [];
+
+            month['year'] = mt_month.year();
+            month['month'] = currentLocaleData.months(mt_month);
+            month['days'] = mt_month.daysInMonth();
+
+            monthRange.push(month)
+        }
+
+        this.renderer.timeScale = 24; //px
+
+        this.renderer.timeType = 'month_day';
+        this.renderer.timeline_width = this.renderer.timeScale * dayRange.length;
+        this.renderer.pxScaleUTC = Math.round(this.renderer.timeScaleUTC / this.renderer.timeline_width); // skolko vremeni v odnom px
+
+        await this.renderer.AddItemList();
+
+
+        await this.renderer.AddItemsData();
+
+        await this.renderer.AddTimeLineHead(this.renderer.timeScale, this.renderer.timeType, monthRange, dayRange);
+        await this.renderer.AddTimeLineData(this.renderer.timeScale, this.renderer.timeType, this.renderer.rows_to_gantt);
+
+        await this.renderer.AddTimeLineArrow(this.renderer.timeline_width);
+        await this.renderer.AddTimeLineGhost();
+
+        await this.renderer.AddTimeLineSummary();
+        await this.renderer.AddTimeLineFirst();
+
+        await this.renderer.DivResize();
+        await this.renderer.ModeActive();
+
+
+        this.ModificateAfterRender()
+
+    },
+
+    ZoomMonthClick: async function () {
+
+        this.renderer.firstDayDate = moment(this.renderer.GtimeStart).clone().startOf('month'); //Start month
+        this.renderer.lastDayDate = moment(this.renderer.GtimeStop).clone().endOf('month'); //End
+        this.renderer.timeScaleUTC = this.renderer.lastDayDate.valueOf() - this.renderer.firstDayDate.valueOf(); // raznica vremeni
+        this.renderer.firstDayScale = this.renderer.firstDayDate.valueOf();
+
+        var iter = moment(this.renderer.firstDayDate).twix(this.renderer.lastDayDate).iterate('month');
+
+        var month2Range = [];
+        while (iter.hasNext()) {
+
+            month2Range.push(iter.next().toDate())
+
+        }
+
+        var monthGroup = _(month2Range).groupBy(function (month) {
+            return moment(month).format("YYYY");
+
+        });
+
+
+        this.renderer.timeScale = 30;//px
+        this.renderer.timeType = 'year_month';
+
+        this.renderer.timeline_width = this.renderer.timeScale * month2Range.length; // min otrzok 60 - eto 4 4asa. v sutkah 6 otrezkov
+        this.renderer.pxScaleUTC = Math.round(this.renderer.timeScaleUTC / this.renderer.timeline_width); // skolko vremeni v odnom px
+
+        await this.renderer.AddItemList();
+
+        await this.renderer.AddItemsData();
+
+        await this.renderer.AddTimeLineHead(this.renderer.timeScale, this.renderer.timeType, monthGroup, false);
+        await this.renderer.AddTimeLineData(this.renderer.timeScale, this.renderer.timeType, this.renderer.rows_to_gantt);
+
+        await this.renderer.AddTimeLineArrow(this.renderer.timeline_width);
+        await this.renderer.AddTimeLineGhost();
+
+        await this.renderer.AddTimeLineSummary();
+        await this.renderer.AddTimeLineFirst();
+
+        await this.renderer.DivResize();
+        await this.renderer.ModeActive();
+
+        this.ModificateAfterRender()
+
+    },
+
+
+    ZoomWeeksClick: async function () {
+        //
+        let firstDayDate = moment(this.renderer.GtimeStart).clone().startOf(this.renderer.week_type).add(-3, 'weeks'); //Start month
+        let lastDayDate = moment(this.renderer.GtimeStop).clone().endOf(this.renderer.week_type).add(3, 'weeks'); //End
+
+        var iter = moment(firstDayDate).twix(lastDayDate).iterate('Week');
+
+        var week2Range = [];
+        while (iter.hasNext()) {
+            week2Range.push(iter.next().toDate())
+        }
+
+        this.renderer.firstDayDate = moment(week2Range[0]).startOf(this.renderer.week_type)
+        this.renderer.lastDayDate = moment(week2Range[week2Range.length-1])
+
+        this.renderer.timeScaleUTC = this.renderer.lastDayDate.valueOf() - this.renderer.firstDayDate.valueOf(); // raznica vremeni
+        this.renderer.firstDayScale = this.renderer.firstDayDate.valueOf();
+
+
+        var weeksGroup = _(week2Range).groupBy(function (week) {
+            return moment(week).format("YYYY");
+        });
+
+
+        this.renderer.timeScale = 30;//px
+        this.renderer.timeType = 'month_week';
+
+        this.renderer.timeline_width = this.renderer.timeScale * week2Range.length; // min otrzok 60 - eto 4 4asa. v sutkah 6 otrezkov
+        this.renderer.pxScaleUTC = Math.round(this.renderer.timeScaleUTC / this.renderer.timeline_width); // skolko vremeni v odnom px
+
+        await this.renderer.AddItemList();
+
+        await this.renderer.AddItemsData();
+
+        await this.renderer.AddTimeLineHead(this.renderer.timeScale, this.renderer.timeType, weeksGroup, false);
+        await this.renderer.AddTimeLineData(this.renderer.timeScale, this.renderer.timeType, this.renderer.rows_to_gantt);
+
+        await this.renderer.AddTimeLineArrow(this.renderer.timeline_width);
+        await this.renderer.AddTimeLineGhost();
+
+        await this.renderer.AddTimeLineSummary();
+        await this.renderer.AddTimeLineFirst();
+
+        await this.renderer.DivResize();
+        await this.renderer.ModeActive();
+
+        this.ModificateAfterRender()
+
+    },
+
+
+    ZoomQuarterClick: async function () {
+
+
+        this.renderer.firstDayDate = moment(this.renderer.GtimeStart).clone().startOf('Quarter'); //Start month
+        this.renderer.lastDayDate = moment(this.renderer.GtimeStop).clone().endOf('Quarter'); //End
+        this.renderer.timeScaleUTC = this.renderer.lastDayDate.valueOf() - this.renderer.firstDayDate.valueOf(); // raznica vremeni
+        this.renderer.firstDayScale = this.renderer.firstDayDate.valueOf();
+
+
+        var iter = moment(this.renderer.firstDayDate).twix(this.renderer.lastDayDate).iterate('Quarter');
+
+        var quarter2Range = [];
+        while (iter.hasNext()) {
+            quarter2Range.push(iter.next().toDate())
+        }
+
+        var quarterGroup = _(quarter2Range).groupBy(function (quarter) {
+            return moment(quarter).format("YYYY");
+        });
+
+
+        this.renderer.timeScale = 80;//px
+        this.renderer.timeType = 'quarter';
+
+        this.renderer.timeline_width = this.renderer.timeScale * quarter2Range.length; // min otrzok 60 - eto 4 4asa. v sutkah 6 otrezkov
+        this.renderer.pxScaleUTC = Math.round(this.renderer.timeScaleUTC / this.renderer.timeline_width); // skolko vremeni v odnom px
+
+        await this.renderer.AddItemList();
+
+        await this.renderer.AddItemsData();
+
+        await this.renderer.AddTimeLineHead(this.renderer.timeScale, this.renderer.timeType, quarterGroup, false);
+        await this.renderer.AddTimeLineData(this.renderer.timeScale, this.renderer.timeType, this.renderer.rows_to_gantt);
+
+        await this.renderer.AddTimeLineArrow(this.renderer.timeline_width);
+        await this.renderer.AddTimeLineGhost();
+
+        await this.renderer.AddTimeLineSummary();
+        await this.renderer.AddTimeLineFirst();
+
+        await this.renderer.DivResize();
+        await this.renderer.ModeActive();
+
+        this.ModificateAfterRender()
+
+
+    },
+
+
+
+//Today Focus of Gantt Line Focus
+    ClickToday: function (event) {
+
+        var today = new Date();
+
+        var toscale = this.TimeToScale(today.getTime());
+
+        this.renderer.TimeToLeft = toscale;
+        this.Focus_Gantt(toscale);
+
+    },
+
+    // Any can focus on BAR
+    Focus_Gantt: function(task_start){
+
+        $('.timeline-gantt-head').animate( { scrollLeft: task_start-500 }, 1000);
+        $('.task-gantt-timeline').animate( { scrollLeft: task_start-500 }, 1000);
+
+        this.renderer.gantt_timeline_scroll_widget.scrollOffset(task_start-500);
+
+    },
+
+    TimeToScale: function(time){
+
+       if (time){
+
+        return Math.round((time-this.renderer.firstDayScale) / this.renderer.pxScaleUTC);
+    }
+
+    },
+
+
+// HandleHover
+    _add_hover:  function(ev) {
+
+        var rowdata = '#task-gantt-timeline-row-'+ev.data['data_id'];
+        $(rowdata).addClass("task-gantt-timeline-row-hover");
+
+        var item_info = '#item-info-'+ev.data['data_id'];
+        $(item_info).addClass("item-info-hover");
+
+
+    },
+
+    _remove_hover:  function(ev) {
+
+        var rowdata = '#task-gantt-timeline-row-'+ev.data['data_id'];
+        $(rowdata).removeClass("task-gantt-timeline-row-hover");
+
+        var item_info = '#item-info-'+ev.data['data_id'];
+        $(item_info).removeClass("item-info-hover");
+
+    },
+
+    HandleHoverOver: function(ev) {
+
+        if (ev.target.allowRowHover)
+        {
+
+            // var rowsort = '#task-gantt-item-sorting-'+ev.target['data-id'];
+            var rowdata = '#task-gantt-timeline-row-'+ev.target['data-id'];
+            // var rowitem = '#task-gantt-item-'+ev.target['data-id'];
+
+            var z_item = '.task-gantt-item-'+ev.target['data-id'];
+
+            // $(rowsort).addClass("task-gantt-sorting-item-hover");
+
+            $(rowdata).addClass("task-gantt-timeline-row-hover");
+            // $(rowitem).addClass("task-gantt-item-hover");
+
+            $(z_item).addClass("task-gantt-item-hover");
+
+            var item_info = '#item-info-'+ev.target['data-id'];
+            $(item_info).addClass("item-info-hover");
+
+
+        }
+
+    },
+
+
+    HandleHoverOut: function(ev) {
+
+
+        var item_info = '#item-info-'+ev.target['data-id'];
+        $(item_info).removeClass("item-info-hover");
+
+        // var rowsort = '#task-gantt-item-sorting-'+ev.target['data-id'];
+        var rowdata = '#task-gantt-timeline-row-'+ev.target['data-id'];
+        // var rowitem = '#task-gantt-item-'+ev.target['data-id'];
+
+        var z_item = '.task-gantt-item-'+ev.target['data-id'];
+
+        // $(rowsort).removeClass("task-gantt-sorting-item-hover");
+        $(rowdata).removeClass("task-gantt-timeline-row-hover");
+        // $(rowitem).removeClass("task-gantt-item-hover");
+
+        $(z_item).removeClass("task-gantt-item-hover");
+
+    }
+
+});
+
+return NativeGanttController;
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/js/native_gantt_data.js b/odex25_project/web_gantt_native/static/src/js/native_gantt_data.js
new file mode 100644
index 000000000..3a21eac90
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/native_gantt_data.js
@@ -0,0 +1,77 @@
+odoo.define('web_gantt_native.NativeGanttData', function (require) {
+    "use strict";
+
+
+
+ function CheckReadOnly(check_fieds, parent_fields, record){
+        // var self = this;
+
+        var readonly_fields = [];
+        _.each(check_fieds, function (field, field_key ) {
+
+            var readonly_status  = false;
+            // var check_field = self.parent.fields[field];
+            // var check_state = self.BarRecord["state"];
+
+            var check_field = parent_fields[field];
+            var check_state = record["state"];
+
+            var states = check_field["states"];
+
+            if (check_state && states ){
+
+                var where_state = [];
+
+                _.each(states, function (state, key) {
+
+                    var param1 = false;
+                    var param2 = false;
+
+                    if (state[0].length === 2){
+
+                        param1 = state[0][0];
+                        param2 = state[0][1];
+                    }
+
+                    if (param1 === 'readonly'){
+                       where_state.push({state : key, param: param2 });
+                    }
+
+                    if (param2 === true){
+                        readonly_status = true
+                    }
+                });
+
+                var check_readonly = _.findWhere(where_state,{state: check_state});
+
+                if (readonly_status){
+                    if (!check_readonly){
+                        readonly_status = false
+                    }
+                }
+                else{
+                    if (!check_readonly){
+                        readonly_status = true
+                    }
+                }
+            }
+            else{
+                readonly_status = check_field.readonly
+            }
+
+         readonly_fields.push({field : field, readonly: readonly_status });
+
+        });
+        return readonly_fields;
+
+    }
+
+
+
+    return {
+        CheckReadOnly : CheckReadOnly,
+
+    }
+
+
+});
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/js/native_gantt_model.js b/odex25_project/web_gantt_native/static/src/js/native_gantt_model.js
new file mode 100644
index 000000000..ce6cb82c7
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/native_gantt_model.js
@@ -0,0 +1,762 @@
+odoo.define('web_gantt_native.NativeGanttModel', function (require) {
+"use strict";
+
+var AbstractModel = require('web.AbstractModel');
+var GanttToolField = require('web_gantt_native.ToolField');
+var GanttTimeLineGhost = require('web_gantt_native.Ghost');
+var GanttTimeLineFirst = require('web_gantt_native.BarFirst');
+var framework = require('web.framework');
+var local_storage = require('web.local_storage');
+
+
+return AbstractModel.extend({
+
+    init: function () {
+        this._super.apply(this, arguments);
+        this.gantt = null;
+
+    },
+
+    get: function () {
+        return _.extend({}, this.gantt);
+    },
+
+    load: function (params) {
+        this.modelName = params.modelName;
+        this.fields_view  = params.fieldsView;
+        //this.params = params;
+        // this.fieldNames = params.fieldNames;
+        // this.fieldsInfo = params.fieldsInfo;
+        this.gantt = {
+            modelName : params.modelName,
+            group_bys : params.groupedBy,
+            domains : params.domain || [],
+            contexts :  params.context || {},
+            fields_view : params.fieldsView,
+            fields : params.fields,
+            pager : [],
+            orderedBy : params.orderedBy
+
+        }
+
+        return this._do_load();
+
+    },
+
+        //---1---//
+    _do_load: function () {
+
+        var domains = this.gantt.domains;
+        var contexts = this.gantt.contexts;
+        var group_bys = this.gantt.group_bys;
+        this.lock_view = local_storage.getItem("lock_view") || 400;
+
+        var self = this;
+
+        self.main_group_id_name = self.fields_view.arch.attrs.main_group_id_name;
+        self.action_menu = self.fields_view.arch.attrs.action_menu;
+
+
+        // self.last_domains = domains;
+        // self.last_contexts = contexts;
+        // self.last_group_bys = group_bys;
+        // self.date_start = null;
+        // self.date_stop = null;
+
+        var n_group_bys = [];
+
+        // select the group by - we can select group by from attribute where XML if not determinate dafault group
+        // for model
+
+        if (this.fields_view.arch.attrs.default_group_by) {
+           n_group_bys = this.fields_view.arch.attrs.default_group_by.split(',');
+        }
+
+        if (group_bys.length) {
+            n_group_bys = group_bys;
+        }
+
+
+
+        var getFields = GanttToolField.getFields(self, n_group_bys);
+        self.model_fields = getFields["model_fields"];
+        self.model_fields_dict = getFields["model_fields_dict"];
+
+        var fields = self.model_fields;
+        // fields.push('display_name');
+
+        // this.fields_view.arch.attrs.default_group_by
+        var export_wizard = false;
+
+        if (self.fields_view.arch.attrs.hasOwnProperty('export_wizard')){
+            export_wizard = self.fields_view.arch.attrs.export_wizard
+        }
+
+
+
+        //Pager
+        var limit_view = 0;
+        if (self.fields_view.arch.attrs.hasOwnProperty('limit_view')){
+            limit_view = parseInt(self.fields_view.arch.attrs.limit_view)
+        }
+
+        if(self.gantt.pager.limit){
+            limit_view = self.gantt.pager.limit
+        }
+
+
+        //Load Level
+        var load_group_id_name = self.fields_view.arch.attrs.load_group_id_name;
+        self.LoadMode = false;
+        if (n_group_bys.length === 1) {
+
+            if (n_group_bys[0] === load_group_id_name || n_group_bys[-1] === load_group_id_name) {
+                self.LoadMode = true;
+            }
+        }
+
+        if (n_group_bys.length > 1 ) {
+
+            if (n_group_bys[n_group_bys.length-1] === load_group_id_name) {
+                self.LoadMode = true;
+            }
+        }
+
+        // Sort allow only if Group by project and domain search by project.
+        // Project get from XML = main_group_id_name = "project_id"
+
+        self.ItemsSorted = false;
+        if (n_group_bys.length === 1){
+
+            if (n_group_bys[0] === self.main_group_id_name){
+                 self.ItemsSorted = true;
+            }
+            if (domains.length > 0){
+                if (domains[0][0] !== self.main_group_id_name){
+                 self.ItemsSorted = false;
+                }
+            }
+
+            if (domains.length > 1){
+                self.ItemsSorted = false;
+            }
+        }
+
+        if (self.fields_view.arch.attrs.no_group_sort_mode){
+            self.ItemsSorted = false;
+        }
+
+        // Tree View only if group by main_group_id_name
+        self.TreeView = false;
+
+        if (n_group_bys.length === 1) {
+
+            if (n_group_bys[0] === self.main_group_id_name || n_group_bys[-1] === self.main_group_id_name) {
+                self.TreeView = true;
+            }
+        }
+
+        if (n_group_bys.length > 1 ) {
+
+            if (n_group_bys[n_group_bys.length-1] === self.main_group_id_name) {
+                self.TreeView = true;
+            }
+        }
+
+
+
+        self.gantt.data = {
+            ItemsSorted : self.ItemsSorted,
+            ExportWizard : export_wizard,
+            TreeView : self.TreeView,
+            Main_Group_Id_Name : self.main_group_id_name,
+            Action_Menu : self.action_menu,
+            model_fields : fields,
+            model_fields_dict : self.model_fields_dict,
+            model_fields_view : self.fields_view,
+            LoadMode : self.LoadMode,
+
+        };
+
+        return this._rpc({
+                model: this.modelName,
+                method: 'search_read',
+                context: this.gantt.contexts,
+                domain: this.gantt.domains,
+                fields: _.uniq(fields),
+                limit: limit_view,
+                orderBy: this.gantt.orderedBy,
+            })
+            .then(function (data) {
+                self.gantt.pager.limit = limit_view;
+                return self.on_data_loaded_count(data, n_group_bys);
+            });
+
+    },
+
+
+
+
+
+
+
+
+    on_data_loaded_count: function(tasks, group_bys) {
+        var self = this;
+
+        return this._rpc({
+                model: this.modelName,
+                method: 'search_count',
+                args: [this.gantt.domains],
+                context: this.gantt.contexts,
+            })
+            .then(function (result) {
+                self.gantt.pager.records = result;
+
+                if (self.gantt.pager.records > self.gantt.pager.limit){
+                    self.gantt.data.ItemsSorted = false
+                }
+
+                return self.on_data_loaded_dummy(tasks, group_bys);
+            });
+
+
+    },
+
+
+
+    on_data_loaded_dummy: function(tasks, group_bys) {
+        var self = this;
+        return self.on_data_loaded_info(tasks, group_bys);
+    },
+
+    //Fist Entry poin load predecessor after. get atributes from XML
+    on_data_loaded_info: function(tasks, group_bys) {
+        var self = this;
+        var ids = _.pluck(tasks, "id");
+
+        var info_model = self.fields_view.arch.attrs.info_model;
+        var info_task_id = "task_id";
+
+        if (info_model) {
+
+            return this._rpc({
+                    model: info_model,
+                    method: 'search_read',
+                    context: this.gantt.contexts,
+                    domain: [[info_task_id, 'in', _.uniq(ids)]],
+                    fields: _.uniq([info_task_id,"start", "end", "left_up","left_down","right_up","right_down","show"])
+                })
+                .then(function (result) {
+
+                    if (result){
+                        result = _.map(result, function(info) {
+
+                        if (info.task_id){
+                            info.task_id = info.task_id[0];
+                            return info;
+                        }
+                        });
+                    }
+
+
+
+                    self.gantt.data.task_info = result;
+                    return self.on_data_loaded_predecessor(tasks, group_bys);
+                });
+            }
+        else{
+            return self.on_data_loaded_predecessor(tasks, group_bys);
+        }
+
+    },
+
+
+
+
+
+    //Fist Entry poin load predecessor after. get atributes from XML
+    on_data_loaded_predecessor: function(tasks, group_bys) {
+        var self = this;
+        var ids = _.pluck(tasks, "id");
+
+        var predecessor_model = self.fields_view.arch.attrs.predecessor_model;
+        var predecessor_task_id = self.fields_view.arch.attrs.predecessor_task_id;
+        var predecessor_parent_task_id = self.fields_view.arch.attrs.predecessor_parent_task_id;
+        var predecessor_type = self.fields_view.arch.attrs.predecessor_type;
+
+        if (predecessor_model) {
+
+            return this._rpc({
+                    model: predecessor_model,
+                    method: 'search_read',
+                    context: this.gantt.contexts,
+                    domain: [[predecessor_task_id, 'in', _.uniq(ids)]],
+                    fields: _.uniq([predecessor_task_id, predecessor_parent_task_id, predecessor_type])
+                })
+                .then(function (result) {
+                    self.gantt.data.predecessor = result;
+                    return self.on_data_loaded_ghost(tasks, group_bys);
+                });
+            }
+        else{
+            return self.on_data_loaded_ghost(tasks, group_bys);
+        }
+
+    },
+
+
+    on_data_loaded_ghost: function(tasks, group_bys) {
+        var self = this;
+        var ids = _.pluck(tasks, "id");
+
+        var ghost_date_field = [];
+        var ghost_model = self.fields_view.arch.attrs.ghost_model;
+
+
+        var ghost_id = self.fields_view.arch.attrs.ghost_id;
+        ghost_date_field.push(ghost_id);
+
+        var ghost_name = self.fields_view.arch.attrs.ghost_name;
+        ghost_date_field.push(ghost_name);
+
+        var ghost_date_start = self.fields_view.arch.attrs.ghost_date_start;
+        if (ghost_date_start){
+            ghost_date_field.push(ghost_date_start) ;
+        }
+
+        var ghost_date_end = self.fields_view.arch.attrs.ghost_date_end;
+        if (ghost_date_end){
+            ghost_date_field.push(ghost_date_end) ;
+        }
+
+        var ghost_durations = self.fields_view.arch.attrs.ghost_durations;
+        ghost_date_field.push(ghost_durations);
+
+        if (ghost_model) {
+            return this._rpc({
+                    model: ghost_model,
+                    method: 'search_read',
+                    context: this.gantt.contexts,
+                    domain: [[ghost_id, 'in', _.uniq(ids)]],
+                    fields: _.uniq(ghost_date_field)
+                })
+                .then(function (result) {
+                    self.gantt.data.Ghost = result;
+                    self.gantt.data.Ghost_Data = GanttTimeLineGhost.get_data_ghosts(self);
+
+                    return self.on_data_loaded_barfirst(tasks, group_bys);
+                });
+
+        }
+        else{
+            return self.on_data_loaded_barfirst(tasks, group_bys);
+        }
+
+    },
+
+
+
+
+
+
+
+    on_data_loaded_barfirst: function(tasks, group_bys) {
+
+        var self = this;
+
+        if (self.ItemsSorted) {
+
+            var barfirst_field = "project_id";
+
+            var barfirst_field_ids = _.pluck(tasks, "project_id");
+
+            var ids = _.pluck(barfirst_field_ids, "0");
+
+            var barfirst_model = "project.project";
+            var barfirst_name = "name";
+            var barfirst_date_start = "date_start";
+            var barfirst_date_end = "date_end";
+
+
+            return this._rpc({
+                    model: barfirst_model,
+                    method: 'search_read',
+                    context: this.gantt.contexts,
+                    domain: [['id', 'in', _.uniq(ids)]],
+                    fields: _.uniq(['id', barfirst_name, barfirst_date_start, barfirst_date_end])
+                })
+                .then(function (result) {
+                    self.gantt.data.BarFirst = result;
+                    self.gantt.data.BarFirst_Data = GanttTimeLineFirst.get_data_barfirst(self);
+
+                    return self.on_data_loaded_name_get(tasks, group_bys);
+                });
+
+        }
+        else{
+            return self.on_data_loaded_name_get(tasks, group_bys);
+        }
+
+    },
+
+
+        //Get name get from model form name field
+    on_data_loaded_name_get: function(tasks, group_bys) {
+        var self = this;
+        var ids = _.pluck(tasks, "id");
+
+        return this._rpc({
+                model: this.modelName,
+                method: 'name_get',
+                args: [ids],
+                context: this.gantt.contexts,
+            })
+            .then(function (names) {
+                var ntasks = _.map(tasks, function(task) {
+                        return _.extend({__name: _.detect(names, function(name) { return name[0] == task.id; })[1]}, task);
+                });
+
+                // return self.gantt_render(ntasks, group_bys);
+                self.gantt.data.ntasks = ntasks;
+                self.gantt.data.group_bys = group_bys;
+                return self.get_second_sort_data(ntasks, group_bys);
+
+            });
+
+
+    },
+
+
+    get_second_sort_data: function(tasks, group_bys) {
+
+            var self = this;
+            self.gantt.data["second_sort"] = undefined;
+            var gantt_attrs = self.fields_view.arch.attrs;
+
+            var link_field = gantt_attrs["second_seq_link_field"];
+
+            if (group_bys.length === 1 && group_bys[0] === link_field) {
+
+                var ids = [];
+                _.map(tasks, function (result) {
+
+                    if (result[link_field]) {
+                        ids.push(result[link_field][0]);
+                    }
+                });
+
+                var s_model =  gantt_attrs["second_seq_model"];
+                var s_field =  gantt_attrs["second_seq_field"];
+
+                return this._rpc({
+                    model: s_model,
+                    method: 'search_read',
+                    context: this.gantt.contexts,
+                    domain: [['id', 'in', _.uniq(ids)]],
+                    fields: _.uniq(['id',s_field])
+                })
+                .then(function (result) {
+                    self.gantt.data["second_sort"] = result;
+                    return self.get_minmax_step(tasks, group_bys);
+                });
+            }
+            else {
+                return self.get_main_group_data(tasks, group_bys);
+            }
+
+
+    },
+
+
+    get_main_group_data: function(tasks, group_bys) {
+
+            var self = this;
+            self.gantt.data["main_group"] = undefined;
+            var gantt_attrs = self.fields_view.arch.attrs;
+
+            var main_id = gantt_attrs["main_group_id_name"];
+            var s_model =  gantt_attrs["main_group_model"];
+            var s_field = ["id", "name","fold"];
+
+            if (group_bys.length === 1 && group_bys[0] === main_id && s_model) {
+
+                var ids = [];
+                _.map(tasks, function (result) {
+
+                    if (result[main_id]) {
+                        ids.push(result[main_id][0]);
+                    }
+                });
+
+                return this._rpc({
+                    model: s_model,
+                    method: 'search_read',
+                    context: this.gantt.contexts,
+                    domain: [['id', 'in', _.uniq(ids)]],
+                    fields: _.uniq(s_field)
+                })
+                .then(function (result) {
+                    self.gantt.data["main_group"] = result;
+                    return self.get_minmax_step(tasks, group_bys);
+                });
+            }
+            else{
+                return self.get_minmax_step(tasks, group_bys);
+            }
+
+
+
+    },
+
+
+    get_minmax_step: function(tasks, group_bys) {
+        var self = this;
+
+        var parent = {};
+
+        parent.fields = self.gantt.fields;
+
+        parent.model_fields_dict = self.gantt.data.model_fields_dict;
+        parent.gantt_attrs = self.gantt.data.model_fields_view.arch.attrs;
+        parent.second_sort = self.gantt.data.second_sort;
+        parent.main_group = self.gantt.data.main_group;
+
+        var groupRows = GanttToolField.groupRows(tasks, group_bys, parent, self.ItemsSorted);
+
+        self.gantt.data["rows_to_gantt"] =  GanttToolField.flatRows(groupRows["projects"], self.ItemsSorted);
+
+        // self.gantt.data["projects"] = groupRows["projects"];
+        //Get Max Min date for data
+        var GtimeStartA = groupRows["timestart"];
+        var GtimeStopA = groupRows["timestop"];
+
+
+        self.gantt.data["GtimeStart"] = Math.min.apply(null, GtimeStartA); // MAX date in date range
+        self.gantt.data["GtimeStop"] = Math.max.apply(null, GtimeStopA); // Min date in date range
+
+        GtimeStopA = [];
+        GtimeStartA = [];
+
+        return self.get_res_task_load(tasks, group_bys);
+
+
+    },
+
+    get_res_task_load: function(tasks, group_bys) {
+        var self = this;
+
+        var gantt_attrs = self.fields_view.arch.attrs;
+
+        var load_model = gantt_attrs["load_bar_model"];
+        var load_id = gantt_attrs["load_id"];
+        var load_id_from = gantt_attrs["load_id_from"];
+        var load_ids_from = gantt_attrs["load_ids_from"];
+
+        var ids = false;
+        if (load_ids_from === "id"){
+
+            ids = _.pluck(tasks, "id");
+
+        }
+        else if(load_ids_from !== "" && load_ids_from !== undefined){
+
+            var gp_load =  _.map(tasks , function (group_value) {
+                if (group_value[load_ids_from] !== false && group_value[load_ids_from] !== undefined && group_value[load_ids_from].length > 0 ){
+                    return group_value[load_ids_from][0]
+                }
+
+                // if (group_value[load_id] !== false && group_value[load_id].length == 1 ){
+                //     return group_value[load_id]
+                // }
+
+            });
+
+            ids = _.compact(gp_load);
+
+        }
+
+
+        if (ids){
+                   var _fields = [load_id, load_id_from, 'data_from', 'data_to', 'data_aggr', 'duration'];
+                   var _domain = [[load_id_from, 'in', _.uniq(ids)]];
+
+                    return this._rpc({
+                            model: load_model,
+                            method: 'search_read',
+                            context: this.gantt.contexts,
+                            domain: _domain,
+                            fields: _fields
+                        })
+                        .then(function (result) {
+                           self.gantt.data["Task_Load_Data"] = result;
+                           return self.get_res_load(tasks, group_bys);
+                        });
+
+       }
+       else{
+          return true
+       }
+
+
+        // var ghost_id = self.fields_view.arch.attrs.ghost_id;
+        // var ghost_model = self.fields_view.arch.attrs.ghost_model;
+        // var ghost_name = self.fields_view.arch.attrs.ghost_name;
+        // var ghost_date_start = self.fields_view.arch.attrs.ghost_date_start;
+        // var ghost_date_end = self.fields_view.arch.attrs.ghost_date_end;
+        // var ghost_durations = self.fields_view.arch.attrs.ghost_durations;
+        //
+        // if (ghost_model) {
+        //     return this._rpc({
+        //             model: ghost_model,
+        //             method: 'search_read',
+        //             context: this.gantt.contexts,
+        //             domain: [[ghost_id, 'in', _.uniq(ids)]],
+        //             fields: _.uniq([ghost_id ,ghost_name, ghost_date_start, ghost_date_end, ghost_durations])
+        //         })
+        //         .then(function (result) {
+        //             self.gantt.data.Ghost = result;
+        //             self.gantt.data.Ghost_Data = GanttTimeLineGhost.get_data_ghosts(self);
+        //
+        //             return self.get_res_load(tasks, group_bys);
+        //         });
+        //
+        // }
+        // else{
+        //     return self.get_res_load(tasks, group_bys);
+        // }
+
+    },
+
+
+
+    get_res_load: function(tasks, group_bys) {
+
+        var self = this;
+
+
+        if (self.LoadMode) {
+
+            // var _contexts = self.gantt.contexts;
+
+            // var _ctx = {
+            //         'group_by': 'data_aggr',
+            //         'lang': _contexts.lang,
+            //         'tz': _contexts.tz,
+            //         'uid': _contexts.uid
+            // };
+            var gantt_attrs = self.fields_view.arch.attrs;
+            var load_model = gantt_attrs["load_bar_model"];
+            var _ctx = self.gantt.contexts;
+
+            var m_GtimeStart = moment(self.gantt.data["GtimeStart"]).format("YYYY-MM-DD");
+            var m_GtimeStop = moment(self.gantt.data["GtimeStop"]).format("YYYY-MM-DD");
+            // var _domain = [['data_aggr', '>=', m_GtimeStart], ['data_aggr', '<=', m_GtimeStop]];
+
+            var data_load_group = _.where(self.gantt.data["rows_to_gantt"], {is_group: true});
+
+            var gp_load =  _.map(data_load_group , function (group_value) {
+                if (group_value.group_id !== false && group_value.group_id.length > 0 ){
+                    return group_value.group_id[0]
+                }
+            });
+
+            var gp_domain_ids = _.compact(gp_load);
+            var _domain = [['resource_id', 'in', _.uniq(gp_domain_ids)],['data_aggr', '>=', m_GtimeStart], ['data_aggr', '<=', m_GtimeStop]];
+            // var _fields = ['task_id', 'data_from', 'data_to', 'user_id', 'data_aggr', 'duration', 'resource_id'];
+            var _fields = ['task_id', 'data_from', 'data_to', 'data_aggr', 'duration', 'resource_id'];
+
+            // project.task.detail.plan
+            // project.task.detail.plan.res.link
+            return this._rpc({
+                model: load_model,
+                method: 'search_read',
+                context: _ctx,
+                domain: _domain,
+                fields: _fields
+            })
+
+            .then(function (result) {
+                self.gantt.data["Load_Data"] = result;
+                return true
+            });
+
+        }
+        else{
+            return true
+        }
+
+
+    },
+
+        // var m_GtimeStart = moment(self.GtimeStart).format("YYYY-MM-DD");
+        // var m_GtimeStop = moment(self.GtimeStop).format("YYYY-MM-DD");
+        //
+        // var _contexts = self.state.contexts;
+        //
+        // // var _domain = [['data_aggr', '>=', m_GtimeStartA], ['data_aggr', '<=', m_GtimeStopA], ['iser_id', 'in', _.uniq(ids)]];
+        // // _.uniq([user_id ,ghost_name, ghost_date_start, ghost_date_end, ghost_durations])
+        //
+        // var _domain = [['data_aggr', '>=', m_GtimeStart], ['data_aggr', '<=', m_GtimeStop]];
+        // var _fields = ['task_id', 'data_from', 'data_to', 'durations', 'user_id', 'data_aggr'];
+        //
+        //
+        // if (self.LoadMode) {
+        //         this._rpc({
+        //
+        //             model: "project.task.detail.plan",
+        //             method: 'search_read',
+        //             context: _contexts,
+        //             domain: _domain,
+        //             fields: _fields
+        //         })
+        //
+        //         .then(function (result) {
+        //             self.state.data.Dloads = result;
+        //         });
+        //
+        // }
+
+            // var tasks = self.state.data.ntasks;
+        // var group_bys = self.state.data.group_bys;
+        //
+        //
+        // var groupRows = GanttToolField.groupRows(tasks, group_bys, parent);
+
+        // //Get all tasks with group
+        // self.projects = groupRows["projects"];
+        //
+        // //Get Max Min date for data
+        // self.GtimeStopA = self.GtimeStopA.concat(groupRows["timestop"]);
+        // self.GtimeStartA = self.GtimeStartA.concat(groupRows["timestart"]);
+        //
+        // //Calc Min - Max
+        // self.GtimeStart = Math.min.apply(null, self.GtimeStartA); // MAX date in date range
+        // self.GtimeStop = Math.max.apply(null, self.GtimeStopA); // Min date in date range
+        //
+        // //Clean
+        // self.GtimeStartA = [];
+        // self.GtimeStopA = [];
+
+
+
+
+
+
+
+    reload: function (handle, params) {
+        if (params.domain) {
+            this.gantt.domains = params.domain;
+        }
+        if (params.context) {
+            this.gantt.contexts = params.context;
+        }
+        if (params.groupBy) {
+            this.gantt.group_bys = params.groupBy;
+        }
+        return this._do_load();
+    },
+
+});
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/js/native_gantt_renderer.js b/odex25_project/web_gantt_native/static/src/js/native_gantt_renderer.js
new file mode 100644
index 000000000..ee3b7d1a6
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/native_gantt_renderer.js
@@ -0,0 +1,578 @@
+odoo.define('web_gantt_native.NativeGanttRenderer', function (require) {
+"use strict";
+
+var AbstractRenderer = require('web.AbstractRenderer');
+var core = require('web.core');
+var field_utils = require('web.field_utils');
+var time = require('web.time');
+
+var GanttToolField =    require('web_gantt_native.ToolField');
+
+
+var GanttTimeLineHead = require('web_gantt_native.TimeLineHead');
+var GanttTimeLineHeader = require('web_gantt_native.TimeLineHeader');
+var GanttTimeLineScroll = require('web_gantt_native.TimeLineScroll');
+
+var GanttTimeLineData = require('web_gantt_native.TimeLineData');
+
+var GanttTimeLineArrow = require('web_gantt_native.TimeLineArrow');
+
+var GanttTimeLineGhost = require('web_gantt_native.Ghost');
+var GanttTimeLineSummary = require('web_gantt_native.Summary');
+var GanttTimeLineFirst = require('web_gantt_native.BarFirst');
+
+var GanttTimeLineInfo = require('web_gantt_native.Info');
+
+var GanttResourcesLevel = require('web_gantt_native.ResLevel');
+var GanttResourcesBar = require('web_gantt_native.ResBar');
+
+var GanttTimeLineInterSection = require('web_gantt_native.InterSection');
+
+var GanttListOptionsItem = require('web_gantt_native.ItemOptions');
+var GanttTimeLineDocs = require('web_gantt_native.Docs');
+
+
+
+var GanttListAction = require('web_gantt_native.ItemAction');
+var GanttItemzTree = require('web_gantt_native.ItemzTree');
+var GanttListInfo = require('web_gantt_native.ItemInfo');
+
+
+
+var session = require('web.session');
+var local_storage = require('web.local_storage');
+
+
+var _t = core._t;
+var _lt = core._lt;
+
+var QWeb = core.qweb;
+
+return AbstractRenderer.extend({
+    className: "o_native_gantt_view",
+    display_name: _lt('Gantt APS'),
+
+
+    /**
+     * @overrie
+     */
+
+    init: function () {
+        this._super.apply(this, arguments);
+
+        var self = this;
+
+        this.chart_id = _.uniqueId();
+        this.gantt_events = [];
+
+        this.type = this.arch.attrs.type || 'native_gantt';
+
+        this.firstDayDate = undefined;
+        this.lastDayDate = undefined;
+
+        this.GtimeStartA = [];
+        this.GtimeStopA = [];
+
+        this.GtimeStart = undefined;
+        this.GtimeStop = undefined;
+
+
+        this.widgets = [];
+
+        this.session = session;
+
+        this.counter = 0;
+        this.widgets = [];
+        this.options = "all";
+        this.fast_update = false;
+
+        this.local_storage = local_storage
+
+        this.gutterOffset = local_storage.getItem("gantt_offset") || 400;
+        this.itemsOffset = local_storage.getItem("items_offset") || 300;
+
+
+        this.gutterOffsetX = 2;
+        this.timeline_width = undefined;
+        this.timeScale = undefined;
+
+        this.timeTypeActive = undefined;
+
+        this.timeType = undefined;
+        this.gantt_timeline_head_widget = undefined;
+        this.gantt_timeline_data_widget = [];
+        this.pxScaleUTC = undefined;
+        this.firstDayScale = undefined;
+        this.rows_to_gantt = undefined;
+        this.timeScaleUTC = undefined;
+
+        this.firstDayDate = undefined;
+        this.lastDayDate = undefined;
+
+
+        this.GtimeStartA = [];
+        this.GtimeStopA = [];
+
+        this.GtimeStart = undefined;
+        this.GtimeStop = undefined;
+
+
+
+        this.BarMovieValue = undefined;
+        this.BarClickDiffX = undefined;
+        this.BarClickX = undefined;
+
+        this.BarRecord= undefined;
+
+        this.BarClickDown = false;
+
+        this.BarWidth = undefined;
+
+        this.TimeToLeft = false;
+
+        this.ItemsSorted = false;
+
+        this.hint_move_widget = undefined;
+        this.tip_move_widget = undefined;
+
+        //week
+        this.header_hint_widget = undefined;
+        this.week_type = local_storage.getItem("gantt_week_type") || "isoweek";
+
+        this.hover_id = undefined;
+
+        this.ScrollToTop = undefined;
+
+
+        this.Predecessor = undefined;
+
+        this.Ghost = undefined;
+        this.Ghost_Data = undefined;
+
+        this.BarFirst = undefined;
+        this.BarFirst_Data = undefined;
+
+
+        this.main_group_id_name = undefined;
+
+        //ui
+        this.list_show = parseInt(local_storage.getItem("gantt_list_show")) || 0;
+        this.industry_show = parseInt(local_storage.getItem("gantt_industry_show")) || 0;
+
+
+        //format date
+        let l10n = _t.database.parameters;
+        this.formatDateTime = time.strftime_to_moment_format( l10n.date_format + ' ' + l10n.time_format);
+        this.formatDate = time.strftime_to_moment_format( l10n.date_format);
+
+
+    },
+    /**
+     * @override
+     */
+    destroy: function () {
+        while (this.gantt_events.length) {
+            gantt.detachEvent(this.gantt_events.pop());
+        }
+        this._super();
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+
+    _render: function () {
+
+        this._renderGantt();
+        return this._super.apply(this, arguments);
+        // return $.when();
+    },
+
+    _renderGantt: function () {
+        var self = this;
+
+        // var parent = {};
+
+        self.Predecessor = self.state.data.predecessor;
+        self.Task_Info = self.state.data.task_info;
+
+        self.Ghost = self.state.data.Ghost ;
+        self.Ghost_Data = self.state.data.Ghost_Data ;
+
+        self.BarFirst = self.state.data.BarFirst;
+        self.BarFirst_Data =  self.state.data.BarFirst_Data;
+
+        self.ExportWizard = self.state.data.ExportWizard;
+        self.Main_Group_Id_Name = self.state.data.Main_Group_Id_Name;
+        self.Action_Menu = self.state.data.Action_Menu;
+
+        self.fields_view = self.state.fields_view;
+        self.ItemsSorted = self.state.data.ItemsSorted;
+        self.fields = self.state.fields;
+        self.model_fields_dict  = self.state.data.model_fields_dict;
+        self.TreeView = self.state.data.TreeView;
+
+        self.LoadMode = self.state.data.LoadMode;
+        self.Load_Data = self.state.data.Load_Data;
+
+        self.Task_Load_Data = self.state.data.Task_Load_Data;
+
+        self.GtimeStart = self.state.data.GtimeStart;
+        self.GtimeStop = self.state.data.GtimeStop;
+
+
+        //set time scale type if is undefined
+        if ( self.timeType === undefined ) {
+            self.timeType = 'month_day';
+        }
+
+
+        //Gantt Conteriner Render.
+        self.$el.html(QWeb.render('GanttContainerView.main', {
+            'title': "My Table",
+            'widget': self,
+            'display_name': self.display_name,
+            'gutterOffset' : self.local_storage.getItem("gantt_offset") || self.gutterOffset
+
+        }));
+
+        //Sorted and grouped to flat list
+        self.rows_to_gantt = self.state.data.rows_to_gantt;
+
+
+        // Start - End month
+        self.firstDayDate = moment(self.GtimeStart).clone().startOf('month'); //Start month
+        self.lastDayDate = moment(self.GtimeStop).clone().endOf('month'); //End month
+        self.timeScaleUTC = self.lastDayDate.valueOf() - self.firstDayDate.valueOf(); // raznica vremeni
+        self.firstDayScale = self.firstDayDate.valueOf();
+
+
+    },
+
+    AddItemList: function (){
+        var self = this;
+
+        var options = { items_sorted: this.ItemsSorted,
+            export_wizard: this.ExportWizard,
+            main_group_id_name: this.Main_Group_Id_Name,
+            tree_view : this.TreeView,
+            action_menu: this.Action_Menu,
+
+        };
+
+        this.widget_ztree = new GanttItemzTree(this, this.rows_to_gantt, options);
+        this.widget_ztree.appendTo(this.$('.task-gantt-items'));
+    },
+
+
+    AddItemsData: function (){
+        var self = this;
+
+
+        //Item Action
+        if (self.widget_item_action){
+            this.widget_item_action.destroy();
+            self.widget_item_action = [];
+        }
+
+        var options = {
+            items_sorted: self.ItemsSorted,
+            export_wizard: self.ExportWizard,
+            main_group_id_name: self.Main_Group_Id_Name,
+            tree_view: self.TreeView,
+            action_menu: self.Action_Menu,
+        };
+
+        self.widget_item_action = new GanttListAction(self, options);
+        self.widget_item_action.appendTo(self.$('.task-gantt-action'));
+
+
+        //Item Info
+        if (self.widget_item_info){
+            this.widget_item_info.destroy();
+            self.widget_item_info = [];
+        }
+
+        self.widget_item_info = new GanttListInfo(self, options);
+        self.widget_item_info.appendTo(self.$('.task-gantt-info'));
+
+
+    },
+
+
+    AddTimeLineArrow: function( timeline_width ) {
+
+        var self = this;
+        if (self.gantt_timeline_arrow_widget){
+            this.gantt_timeline_arrow_widget.destroy();
+            self.gantt_timeline_arrow_widget = [];
+        }
+
+        this.gantt_timeline_arrow_widget = new GanttTimeLineArrow(self, timeline_width );
+        this.gantt_timeline_arrow_widget.appendTo(self.$('.task-gantt-timeline-inner'));
+
+    },
+
+
+    AddTimeLineHead: async function (timeScale, time_type, time_month, time_day) {
+
+        var self = this;
+
+        // GanttTimeLineHead
+        if (this.gantt_timeline_head_widget) {
+            this.gantt_timeline_head_widget.destroy();
+            this.gantt_timeline_head_widget = [];
+        }
+        this.gantt_timeline_head_widget = await new GanttTimeLineHead(self, timeScale, time_type, time_month, time_day);
+        this.gantt_timeline_head_widget.appendTo(self.$('.task-gantt-timeline-inner'));
+
+
+        // GanttTimeLineHeader
+        if (this.gantt_timeline_header_widget) {
+            this.gantt_timeline_header_widget.destroy();
+            this.gantt_timeline_header_widget = [];
+        }
+
+        this.gantt_timeline_header_widget = await new GanttTimeLineHeader(self, timeScale, time_type, time_month, time_day, "TimelineGantt.header", "");
+        this.gantt_timeline_header_widget.appendTo(self.$('.timeline-gantt'));
+
+
+        // // GanttTimeLineHeader layout
+        // if (this.gantt_timeline_header_layout_widget) {
+        //     this.gantt_timeline_header_layout_widget.destroy();
+        //     this.gantt_timeline_header_layout_widget = [];
+        // }
+        //
+        // this.gantt_timeline_header_layout_widget = await new GanttTimeLineHeader(self, timeScale, time_type, time_month, time_day, "TimelineGanttLayout.header", "-layout");
+        // this.gantt_timeline_header_layout_widget.appendTo(self.$('.timeline-gantt-layout'));
+
+
+        // GanttListOptionsItem
+        if (this.gantt_item_options_widget) {
+            this.gantt_item_options_widget.destroy();
+            this.gantt_item_options_widget = [];
+        }
+        this.gantt_item_options_widget = await new GanttListOptionsItem.OptionsItem(self);
+        this.gantt_item_options_widget.appendTo(self.$('.timeline-gantt-options'));
+
+
+        // GanttTimeLineScroll
+        if (this.gantt_timeline_scroll_widget) {
+            this.gantt_timeline_scroll_widget.destroy();
+            this.gantt_timeline_scroll_widget = [];
+        }
+        this.gantt_timeline_scroll_widget = new GanttTimeLineScroll(self, timeScale, time_type, time_month, time_day);
+        this.gantt_timeline_scroll_widget.appendTo(self.$('.timeline-gantt-scroll'));
+
+
+    },
+
+
+     AddTimeLineData: function(timeScale, time_type, rows_to_gantt ) {
+
+        var self = this;
+        if (this.gantt_timeline_data_widget.length > 0){
+            this.gantt_timeline_data_widget = [];
+        }
+
+        var $zTree = self.widget_ztree.$zTree;
+        var options = { items_sorted: self.ItemsSorted, tree_view : self.TreeView};
+        var nodes = $zTree.getNodes();
+
+         _.each(nodes, function (node) {
+             var childNodes = $zTree.transformToArray(node);
+
+             _.each(childNodes, function (child) {
+                 var gantt_time_line_data = new GanttTimeLineData(self, timeScale, time_type, child, options);
+                 gantt_time_line_data.appendTo(self.$('.task-gantt-timeline-data'));
+                 self.gantt_timeline_data_widget.push(gantt_time_line_data);
+
+             })
+         });
+
+     },
+
+
+    AddTimeLineGhost: async function () {
+
+        //Ghost
+        var self = this;
+        if (self.gantt_timeline_ghost_widget) {
+            this.gantt_timeline_ghost_widget.destroy();
+            self.gantt_timeline_ghost_widget = [];
+        }
+
+        this.gantt_timeline_ghost_widget = await new GanttTimeLineGhost.GhostWidget(self);
+
+        this.gantt_timeline_ghost_widget.appendTo(self.$('.task-gantt-timeline-data'));
+
+
+        //Info
+        if (self.gantt_timeline_info_widget) {
+            this.gantt_timeline_info_widget.destroy();
+            self.gantt_timeline_info_widget = [];
+        }
+
+        this.gantt_timeline_info_widget = new GanttTimeLineInfo.InfoWidget(self);
+        this.gantt_timeline_info_widget.appendTo(self.$('.task-gantt-bar-plan'));
+
+        //Resources Level
+        if (self.gantt_timeline_res_level_widget) {
+            this.gantt_timeline_res_level_widget.destroy();
+            self.gantt_timeline_res_level_widget = [];
+        }
+        this.gantt_timeline_res_level_widget = new GanttResourcesLevel.ResLevelWidget(self);
+        this.gantt_timeline_res_level_widget.appendTo(self.$('.task-gantt-timeline-data'));
+
+
+        //Detail Task
+        if (self.gantt_timeline_res_bar_widget) {
+            this.gantt_timeline_res_bar_widget.destroy();
+            self.gantt_timeline_res_bar_widget = [];
+        }
+        this.gantt_timeline_res_bar_widget = new GanttResourcesBar.ResBarWidget(self);
+        this.gantt_timeline_res_bar_widget.appendTo(self.$('.task-gantt-timeline-data'));
+
+
+        //InterSection
+        if (self.gantt_timeline_inter_section_widget) {
+            this.gantt_timeline_inter_section_widget.destroy();
+            self.gantt_timeline_inter_section_widget = [];
+        }
+        this.gantt_timeline_inter_section_widget = new GanttTimeLineInterSection.InterSectionWidget(self);
+        this.gantt_timeline_inter_section_widget.appendTo(self.$('.task-gantt-timeline-data'));
+
+
+        //Docs
+        if (self.gantt_timeline_docs_widget) {
+            this.gantt_timeline_docs_widget.destroy();
+            self.gantt_timeline_docs_widget = [];
+        }
+        this.gantt_timeline_docs_widget = new GanttTimeLineDocs.DocsWidget(self);
+        this.gantt_timeline_docs_widget.appendTo(self.$('.task-gantt-timeline-data'));
+
+
+    },
+
+    AddTimeLineSummary: function() {
+
+        var self = this;
+        if (self.gantt_timeline_summary_widget){
+            self.gantt_timeline_summary_widget.destroy();
+            self.gantt_timeline_summary_widget = [];
+        }
+
+        self.gantt_timeline_summary_widget = new GanttTimeLineSummary.SummaryWidget(self);
+        self.gantt_timeline_summary_widget.appendTo(self.$('.task-gantt-timeline-data'));
+
+    },
+
+    AddTimeLineFirst: function() {
+
+        var self = this;
+        if (self.gantt_timeline_first_widget){
+            this.gantt_timeline_first_widget.destroy();
+            self.gantt_timeline_first_widget = [];
+        }
+
+        this.gantt_timeline_first_widget = new GanttTimeLineFirst.BarFirstWidget(self);
+        this.gantt_timeline_first_widget.appendTo(self.$('.task-gantt-timeline-data'));
+
+    },
+
+
+    DivResize: function () {
+        var self = this;
+
+        var items = self.$(".task-gantt-items")
+        items.width(self.local_storage.getItem("items_offset") || self.itemsOffset);
+        items.resizable({
+            handles: "e",
+            resize: function (event, ui) {
+                self.local_storage.setItem("items_offset", self.$(".task-gantt-items").width());
+            },
+            start: async function (event, ui) {
+                self.$('.task-gantt-items-gutter').addClass("task-gantt-items-gutter-hover")
+            },
+
+            stop: function (event, ui) {
+                self.$('.task-gantt-items-gutter').removeClass("task-gantt-items-gutter-hover")
+            }
+
+        });
+
+        self.$('.task-gantt-list').resizable({
+            handles: "e",
+            resize: function (event, ui) {
+                let pxc = self.$('.task-gantt-list').width();
+                self.$('.timeline-gantt-items').width(pxc);
+                self.local_storage.setItem("gantt_offset", pxc);
+            },
+
+            start: async function (event, ui) {
+
+                self.$('.timeline-gantt-gutter').addClass("task-gantt-gutter-hover")
+                self.$('.task-gantt-gutter').addClass("task-gantt-gutter-hover")
+            },
+
+            stop: function (event, ui) {
+                self.$('.timeline-gantt-gutter').removeClass("task-gantt-gutter-hover")
+                self.$('.task-gantt-gutter').removeClass("task-gantt-gutter-hover")
+
+            }
+
+
+        });
+
+    },
+
+    ModeSelect: function(mode){
+        let result = undefined
+        if (mode === "day_1hour"){
+            result = "1h"
+        } else if (mode === "day_2hour") {
+            result = "2h"
+        } else if (mode === "day_4hour") {
+            result = "4h"
+        } else if (mode === "day_8hour") {
+            result = "8h"
+        } else if (mode === "month_day") {
+            result = "days"
+        } else if (mode === "year_month") {
+            result = "month"
+        } else if (mode === "month_week") {
+            result = "weeks"
+        } else if (mode === "quarter") {
+            result = "quarter"
+        }
+        return result
+
+    },
+
+    ModeActive: function () {
+        let self = this;
+        let timeTypeActive = self.ModeSelect(self.timeTypeActive)
+        let mode = self.ModeSelect(self.timeType)
+
+        self.timeTypeActive = self.timeType
+
+        if (timeTypeActive !== mode && self.__parentedParent.hasOwnProperty('$buttons')){
+
+            let old_element = self.__parentedParent.$buttons.find(".task-gantt-zoom-"+timeTypeActive)
+
+            old_element.removeClass("btn-info");
+            old_element.addClass("btn-default");
+
+            let element = self.__parentedParent.$buttons.find(".task-gantt-zoom-"+mode)
+            element.removeClass("btn-default");
+            element.addClass("btn-info");
+
+        }
+
+    }
+
+
+});
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/js/native_gantt_view.js b/odex25_project/web_gantt_native/static/src/js/native_gantt_view.js
new file mode 100644
index 000000000..761d6de6d
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/js/native_gantt_view.js
@@ -0,0 +1,63 @@
+odoo.define('web_gantt_native.NativeGanttView', function (require) {
+"use strict";
+
+var AbstractView = require('web.AbstractView');
+var core = require('web.core');
+
+var NativeGanttModel = require('web_gantt_native.NativeGanttModel');
+var NativeGanttRenderer = require('web_gantt_native.NativeGanttRenderer');
+var NativeGanttController = require('web_gantt_native.NativeGanttController');
+
+var view_registry = require('web.view_registry');
+
+var _lt = core._lt;
+
+var GanttContainer = AbstractView.extend({
+
+    display_name: _lt('Native Gantt'),
+    icon: 'fa-tasks',
+    viewType: 'ganttaps',
+
+    config: _.extend({}, AbstractView.prototype.config, {
+        Model: NativeGanttModel,
+        Controller: NativeGanttController,
+        Renderer: NativeGanttRenderer,
+    }),
+    // searchMenuTypes: ['filter', 'groupBy', 'timeRange', 'favorite'],
+
+
+    init: function (viewInfo, params) {
+
+        this._super.apply(this, arguments);
+
+
+        this.rendererParams.viewType = this.viewType;
+
+        this.controllerParams.confirmOnDelete = true;
+        this.controllerParams.archiveEnabled = 'active' in this.fields;
+        this.controllerParams.hasButtons = 'action_buttons' in params ? params.action_buttons : true;
+
+        this.loadParams.fieldsInfo = this.fieldsInfo;
+        this.loadParams.fields = viewInfo.fields;
+        this.loadParams.context = params.context || {};
+        this.loadParams.limit = parseInt(this.arch.attrs.limit, 10) || params.limit;
+        this.loadParams.viewType = this.viewType;
+        this.loadParams.parentID = params.parentID;
+        this.recordID = params.recordID;
+
+        this.model = params.model;
+
+        this.loadParams.fieldsView = viewInfo;
+        this.loadParams.fieldsView.arch = this.arch;
+        this.loadParams.mapping = this.arch.attrs;
+
+
+
+    },
+});
+
+view_registry.add('ganttaps', GanttContainer);
+
+return GanttContainer;
+
+});
diff --git a/odex25_project/web_gantt_native/static/src/lib/jquery.ztree.core.js b/odex25_project/web_gantt_native/static/src/lib/jquery.ztree.core.js
new file mode 100644
index 000000000..d409f5e6a
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/lib/jquery.ztree.core.js
@@ -0,0 +1,2006 @@
+/*
+ * JQuery zTree core
+ * v3.5.43
+ * http://treejs.cn/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Date: 2020-04-04
+ */
+
+(function ($) {
+  var settings = {}, roots = {}, caches = {},
+    //default consts of core
+    _consts = {
+      className: {
+        BUTTON: "button",
+        LEVEL: "level",
+        ICO_LOADING: "ico_loading",
+        SWITCH: "switch",
+        NAME: 'node_name'
+      },
+      event: {
+        NODECREATED: "ztree_nodeCreated",
+        CLICK: "ztree_click",
+        EXPAND: "ztree_expand",
+        COLLAPSE: "ztree_collapse",
+        ASYNC_SUCCESS: "ztree_async_success",
+        ASYNC_ERROR: "ztree_async_error",
+        REMOVE: "ztree_remove",
+        SELECTED: "ztree_selected",
+        UNSELECTED: "ztree_unselected"
+      },
+      id: {
+        A: "_a",
+        ICON: "_ico",
+        SPAN: "_span",
+        SWITCH: "_switch",
+        UL: "_ul"
+      },
+      line: {
+        ROOT: "root",
+        ROOTS: "roots",
+        CENTER: "center",
+        BOTTOM: "bottom",
+        NOLINE: "noline",
+        LINE: "line"
+      },
+      folder: {
+        OPEN: "open",
+        CLOSE: "close",
+        DOCU: "docu"
+      },
+      node: {
+        CURSELECTED: "curSelectedNode"
+      }
+    },
+    //default setting of core
+    _setting = {
+      treeId: "",
+      treeObj: null,
+      view: {
+        addDiyDom: null,
+        autoCancelSelected: true,
+        dblClickExpand: true,
+        expandSpeed: "fast",
+        fontCss: {},
+        nodeClasses: {},
+        nameIsHTML: false,
+        selectedMulti: true,
+        showIcon: true,
+        showLine: true,
+        showTitle: true,
+        txtSelectedEnable: false
+      },
+      data: {
+        key: {
+          isParent: "isParent",
+          children: "children",
+          name: "name",
+          title: "",
+          url: "url",
+          icon: "icon"
+        },
+        simpleData: {
+          enable: false,
+          idKey: "id",
+          pIdKey: "pId",
+          rootPId: null
+        },
+        keep: {
+          parent: false,
+          leaf: false
+        }
+      },
+      async: {
+        enable: false,
+        contentType: "application/x-www-form-urlencoded",
+        type: "post",
+        dataType: "text",
+        headers: {},
+        xhrFields: {},
+        url: "",
+        autoParam: [],
+        otherParam: [],
+        dataFilter: null
+      },
+      callback: {
+        beforeAsync: null,
+        beforeClick: null,
+        beforeDblClick: null,
+        beforeRightClick: null,
+        beforeMouseDown: null,
+        beforeMouseUp: null,
+        beforeExpand: null,
+        beforeCollapse: null,
+        beforeRemove: null,
+
+        onAsyncError: null,
+        onAsyncSuccess: null,
+        onNodeCreated: null,
+        onClick: null,
+        onDblClick: null,
+        onRightClick: null,
+        onMouseDown: null,
+        onMouseUp: null,
+        onExpand: null,
+        onCollapse: null,
+        onRemove: null
+      }
+    },
+    //default root of core
+    //zTree use root to save full data
+    _initRoot = function (setting) {
+      var r = data.getRoot(setting);
+      if (!r) {
+        r = {};
+        data.setRoot(setting, r);
+      }
+      data.nodeChildren(setting, r, []);
+      r.expandTriggerFlag = false;
+      r.curSelectedList = [];
+      r.noSelection = true;
+      r.createdNodes = [];
+      r.zId = 0;
+      r._ver = (new Date()).getTime();
+    },
+    //default cache of core
+    _initCache = function (setting) {
+      var c = data.getCache(setting);
+      if (!c) {
+        c = {};
+        data.setCache(setting, c);
+      }
+      c.nodes = [];
+      c.doms = [];
+    },
+    //default bindEvent of core
+    _bindEvent = function (setting) {
+      var o = setting.treeObj,
+        c = consts.event;
+      o.bind(c.NODECREATED, function (event, treeId, node) {
+        tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
+      });
+
+      o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
+        tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
+      });
+
+      o.bind(c.EXPAND, function (event, treeId, node) {
+        tools.apply(setting.callback.onExpand, [event, treeId, node]);
+      });
+
+      o.bind(c.COLLAPSE, function (event, treeId, node) {
+        tools.apply(setting.callback.onCollapse, [event, treeId, node]);
+      });
+
+      o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
+        tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
+      });
+
+      o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
+        tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+      });
+
+      o.bind(c.REMOVE, function (event, treeId, treeNode) {
+        tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
+      });
+
+      o.bind(c.SELECTED, function (event, treeId, node) {
+        tools.apply(setting.callback.onSelected, [treeId, node]);
+      });
+      o.bind(c.UNSELECTED, function (event, treeId, node) {
+        tools.apply(setting.callback.onUnSelected, [treeId, node]);
+      });
+    },
+    _unbindEvent = function (setting) {
+      var o = setting.treeObj,
+        c = consts.event;
+      o.unbind(c.NODECREATED)
+        .unbind(c.CLICK)
+        .unbind(c.EXPAND)
+        .unbind(c.COLLAPSE)
+        .unbind(c.ASYNC_SUCCESS)
+        .unbind(c.ASYNC_ERROR)
+        .unbind(c.REMOVE)
+        .unbind(c.SELECTED)
+        .unbind(c.UNSELECTED);
+    },
+    //default event proxy of core
+    _eventProxy = function (event) {
+      var target = event.target,
+        setting = data.getSetting(event.data.treeId),
+        tId = "", node = null,
+        nodeEventType = "", treeEventType = "",
+        nodeEventCallback = null, treeEventCallback = null,
+        tmp = null;
+
+      if (tools.eqs(event.type, "mousedown")) {
+        treeEventType = "mousedown";
+      } else if (tools.eqs(event.type, "mouseup")) {
+        treeEventType = "mouseup";
+      } else if (tools.eqs(event.type, "contextmenu")) {
+        treeEventType = "contextmenu";
+      } else if (tools.eqs(event.type, "click")) {
+        if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.SWITCH) !== null) {
+          tId = tools.getNodeMainDom(target).id;
+          nodeEventType = "switchNode";
+        } else {
+          tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+          if (tmp) {
+            tId = tools.getNodeMainDom(tmp).id;
+            nodeEventType = "clickNode";
+          }
+        }
+      } else if (tools.eqs(event.type, "dblclick")) {
+        treeEventType = "dblclick";
+        tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+        if (tmp) {
+          tId = tools.getNodeMainDom(tmp).id;
+          nodeEventType = "switchNode";
+        }
+      }
+      if (treeEventType.length > 0 && tId.length == 0) {
+        tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+        if (tmp) {
+          tId = tools.getNodeMainDom(tmp).id;
+        }
+      }
+      // event to node
+      if (tId.length > 0) {
+        node = data.getNodeCache(setting, tId);
+        switch (nodeEventType) {
+          case "switchNode" :
+            var isParent = data.nodeIsParent(setting, node);
+            if (!isParent) {
+              nodeEventType = "";
+            } else if (tools.eqs(event.type, "click")
+              || (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
+              nodeEventCallback = handler.onSwitchNode;
+            } else {
+              nodeEventType = "";
+            }
+            break;
+          case "clickNode" :
+            nodeEventCallback = handler.onClickNode;
+            break;
+        }
+      }
+      // event to zTree
+      switch (treeEventType) {
+        case "mousedown" :
+          treeEventCallback = handler.onZTreeMousedown;
+          break;
+        case "mouseup" :
+          treeEventCallback = handler.onZTreeMouseup;
+          break;
+        case "dblclick" :
+          treeEventCallback = handler.onZTreeDblclick;
+          break;
+        case "contextmenu" :
+          treeEventCallback = handler.onZTreeContextmenu;
+          break;
+      }
+      var proxyResult = {
+        stop: false,
+        node: node,
+        nodeEventType: nodeEventType,
+        nodeEventCallback: nodeEventCallback,
+        treeEventType: treeEventType,
+        treeEventCallback: treeEventCallback
+      };
+      return proxyResult
+    },
+    //default init node of core
+    _initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+      if (!n) return;
+      var r = data.getRoot(setting),
+        children = data.nodeChildren(setting, n);
+      n.level = level;
+      n.tId = setting.treeId + "_" + (++r.zId);
+      n.parentTId = parentNode ? parentNode.tId : null;
+      n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
+      var isParent = data.nodeIsParent(setting, n);
+      if (tools.isArray(children)) {
+        data.nodeIsParent(setting, n, true);
+        n.zAsync = true;
+      } else {
+        isParent = data.nodeIsParent(setting, n, isParent);
+        n.open = (isParent && !setting.async.enable) ? n.open : false;
+        n.zAsync = !isParent;
+      }
+      n.isFirstNode = isFirstNode;
+      n.isLastNode = isLastNode;
+      n.getParentNode = function () {
+        return data.getNodeCache(setting, n.parentTId);
+      };
+      n.getPreNode = function () {
+        return data.getPreNode(setting, n);
+      };
+      n.getNextNode = function () {
+        return data.getNextNode(setting, n);
+      };
+      n.getIndex = function () {
+        return data.getNodeIndex(setting, n);
+      };
+      n.getPath = function () {
+        return data.getNodePath(setting, n);
+      };
+      n.isAjaxing = false;
+      data.fixPIdKeyValue(setting, n);
+    },
+    _init = {
+      bind: [_bindEvent],
+      unbind: [_unbindEvent],
+      caches: [_initCache],
+      nodes: [_initNode],
+      proxys: [_eventProxy],
+      roots: [_initRoot],
+      beforeA: [],
+      afterA: [],
+      innerBeforeA: [],
+      innerAfterA: [],
+      zTreeTools: []
+    },
+    //method of operate data
+    data = {
+      addNodeCache: function (setting, node) {
+        data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
+      },
+      getNodeCacheId: function (tId) {
+        return tId.substring(tId.lastIndexOf("_") + 1);
+      },
+      addAfterA: function (afterA) {
+        _init.afterA.push(afterA);
+      },
+      addBeforeA: function (beforeA) {
+        _init.beforeA.push(beforeA);
+      },
+      addInnerAfterA: function (innerAfterA) {
+        _init.innerAfterA.push(innerAfterA);
+      },
+      addInnerBeforeA: function (innerBeforeA) {
+        _init.innerBeforeA.push(innerBeforeA);
+      },
+      addInitBind: function (bindEvent) {
+        _init.bind.push(bindEvent);
+      },
+      addInitUnBind: function (unbindEvent) {
+        _init.unbind.push(unbindEvent);
+      },
+      addInitCache: function (initCache) {
+        _init.caches.push(initCache);
+      },
+      addInitNode: function (initNode) {
+        _init.nodes.push(initNode);
+      },
+      addInitProxy: function (initProxy, isFirst) {
+        if (!!isFirst) {
+          _init.proxys.splice(0, 0, initProxy);
+        } else {
+          _init.proxys.push(initProxy);
+        }
+      },
+      addInitRoot: function (initRoot) {
+        _init.roots.push(initRoot);
+      },
+      addNodesData: function (setting, parentNode, index, nodes) {
+        var children = data.nodeChildren(setting, parentNode), params;
+        if (!children) {
+          children = data.nodeChildren(setting, parentNode, []);
+          index = -1;
+        } else if (index >= children.length) {
+          index = -1;
+        }
+
+        if (children.length > 0 && index === 0) {
+          children[0].isFirstNode = false;
+          view.setNodeLineIcos(setting, children[0]);
+        } else if (children.length > 0 && index < 0) {
+          children[children.length - 1].isLastNode = false;
+          view.setNodeLineIcos(setting, children[children.length - 1]);
+        }
+        data.nodeIsParent(setting, parentNode, true);
+
+        if (index < 0) {
+          data.nodeChildren(setting, parentNode, children.concat(nodes));
+        } else {
+          params = [index, 0].concat(nodes);
+          children.splice.apply(children, params);
+        }
+      },
+      addSelectedNode: function (setting, node) {
+        var root = data.getRoot(setting);
+        if (!data.isSelectedNode(setting, node)) {
+          root.curSelectedList.push(node);
+        }
+      },
+      addCreatedNode: function (setting, node) {
+        if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+          var root = data.getRoot(setting);
+          root.createdNodes.push(node);
+        }
+      },
+      addZTreeTools: function (zTreeTools) {
+        _init.zTreeTools.push(zTreeTools);
+      },
+      exSetting: function (s) {
+        $.extend(true, _setting, s);
+      },
+      fixPIdKeyValue: function (setting, node) {
+        if (setting.data.simpleData.enable) {
+          node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
+        }
+      },
+      getAfterA: function (setting, node, array) {
+        for (var i = 0, j = _init.afterA.length; i < j; i++) {
+          _init.afterA[i].apply(this, arguments);
+        }
+      },
+      getBeforeA: function (setting, node, array) {
+        for (var i = 0, j = _init.beforeA.length; i < j; i++) {
+          _init.beforeA[i].apply(this, arguments);
+        }
+      },
+      getInnerAfterA: function (setting, node, array) {
+        for (var i = 0, j = _init.innerAfterA.length; i < j; i++) {
+          _init.innerAfterA[i].apply(this, arguments);
+        }
+      },
+      getInnerBeforeA: function (setting, node, array) {
+        for (var i = 0, j = _init.innerBeforeA.length; i < j; i++) {
+          _init.innerBeforeA[i].apply(this, arguments);
+        }
+      },
+      getCache: function (setting) {
+        return caches[setting.treeId];
+      },
+      getNodeIndex: function (setting, node) {
+        if (!node) return null;
+        var p = node.parentTId ? node.getParentNode() : data.getRoot(setting),
+          children = data.nodeChildren(setting, p);
+        for (var i = 0, l = children.length - 1; i <= l; i++) {
+          if (children[i] === node) {
+            return i;
+          }
+        }
+        return -1;
+      },
+      getNextNode: function (setting, node) {
+        if (!node) return null;
+        var p = node.parentTId ? node.getParentNode() : data.getRoot(setting),
+          children = data.nodeChildren(setting, p);
+        for (var i = 0, l = children.length - 1; i <= l; i++) {
+          if (children[i] === node) {
+            return (i == l ? null : children[i + 1]);
+          }
+        }
+        return null;
+      },
+      getNodeByParam: function (setting, nodes, key, value) {
+        if (!nodes || !key) return null;
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          var node = nodes[i];
+          if (node[key] == value) {
+            return nodes[i];
+          }
+          var children = data.nodeChildren(setting, node);
+          var tmp = data.getNodeByParam(setting, children, key, value);
+          if (tmp) return tmp;
+        }
+        return null;
+      },
+      getNodeCache: function (setting, tId) {
+        if (!tId) return null;
+        var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
+        return n ? n : null;
+      },
+      getNodePath: function (setting, node) {
+        if (!node) return null;
+
+        var path;
+        if (node.parentTId) {
+          path = node.getParentNode().getPath();
+        } else {
+          path = [];
+        }
+
+        if (path) {
+          path.push(node);
+        }
+
+        return path;
+      },
+      getNodes: function (setting) {
+        return data.nodeChildren(setting, data.getRoot(setting));
+      },
+      getNodesByParam: function (setting, nodes, key, value) {
+        if (!nodes || !key) return [];
+        var result = [];
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          var node = nodes[i];
+          if (node[key] == value) {
+            result.push(node);
+          }
+          var children = data.nodeChildren(setting, node);
+          result = result.concat(data.getNodesByParam(setting, children, key, value));
+        }
+        return result;
+      },
+      getNodesByParamFuzzy: function (setting, nodes, key, value) {
+        if (!nodes || !key) return [];
+        var result = [];
+        value = value.toLowerCase();
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          var node = nodes[i];
+          if (typeof node[key] == "string" && nodes[i][key].toLowerCase().indexOf(value) > -1) {
+            result.push(node);
+          }
+          var children = data.nodeChildren(setting, node);
+          result = result.concat(data.getNodesByParamFuzzy(setting, children, key, value));
+        }
+        return result;
+      },
+      getNodesByFilter: function (setting, nodes, filter, isSingle, invokeParam) {
+        if (!nodes) return (isSingle ? null : []);
+        var result = isSingle ? null : [];
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          var node = nodes[i];
+          if (tools.apply(filter, [node, invokeParam], false)) {
+            if (isSingle) {
+              return node;
+            }
+            result.push(node);
+          }
+          var children = data.nodeChildren(setting, node);
+          var tmpResult = data.getNodesByFilter(setting, children, filter, isSingle, invokeParam);
+          if (isSingle && !!tmpResult) {
+            return tmpResult;
+          }
+          result = isSingle ? tmpResult : result.concat(tmpResult);
+        }
+        return result;
+      },
+      getPreNode: function (setting, node) {
+        if (!node) return null;
+        var p = node.parentTId ? node.getParentNode() : data.getRoot(setting),
+          children = data.nodeChildren(setting, p);
+        for (var i = 0, l = children.length; i < l; i++) {
+          if (children[i] === node) {
+            return (i == 0 ? null : children[i - 1]);
+          }
+        }
+        return null;
+      },
+      getRoot: function (setting) {
+        return setting ? roots[setting.treeId] : null;
+      },
+      getRoots: function () {
+        return roots;
+      },
+      getSetting: function (treeId) {
+        return settings[treeId];
+      },
+      getSettings: function () {
+        return settings;
+      },
+      getZTreeTools: function (treeId) {
+        var r = this.getRoot(this.getSetting(treeId));
+        return r ? r.treeTools : null;
+      },
+      initCache: function (setting) {
+        for (var i = 0, j = _init.caches.length; i < j; i++) {
+          _init.caches[i].apply(this, arguments);
+        }
+      },
+      initNode: function (setting, level, node, parentNode, preNode, nextNode) {
+        for (var i = 0, j = _init.nodes.length; i < j; i++) {
+          _init.nodes[i].apply(this, arguments);
+        }
+      },
+      initRoot: function (setting) {
+        for (var i = 0, j = _init.roots.length; i < j; i++) {
+          _init.roots[i].apply(this, arguments);
+        }
+      },
+      isSelectedNode: function (setting, node) {
+        var root = data.getRoot(setting);
+        for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
+          if (node === root.curSelectedList[i]) return true;
+        }
+        return false;
+      },
+      nodeChildren: function (setting, node, newChildren) {
+        if (!node) {
+          return null;
+        }
+        var key = setting.data.key.children;
+        if (typeof newChildren !== 'undefined') {
+          node[key] = newChildren;
+        }
+        return node[key];
+      },
+      nodeIsParent: function (setting, node, newIsParent) {
+        if (!node) {
+          return false;
+        }
+        var key = setting.data.key.isParent;
+        if (typeof newIsParent !== 'undefined') {
+          if (typeof newIsParent === "string") {
+            newIsParent = tools.eqs(newIsParent, "true");
+          }
+          newIsParent = !!newIsParent;
+          node[key] = newIsParent;
+        } else if (typeof node[key] == "string"){
+          node[key] = tools.eqs(node[key], "true");
+        } else {
+          node[key] = !!node[key];
+        }
+        return node[key];
+      },
+      nodeName: function (setting, node, newName) {
+        var key = setting.data.key.name;
+        if (typeof newName !== 'undefined') {
+          node[key] = newName;
+        }
+        return "" + node[key];
+      },
+      nodeTitle: function (setting, node) {
+        var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
+        return "" + node[t];
+      },
+      removeNodeCache: function (setting, node) {
+        var children = data.nodeChildren(setting, node);
+        if (children) {
+          for (var i = 0, l = children.length; i < l; i++) {
+            data.removeNodeCache(setting, children[i]);
+          }
+        }
+        data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
+      },
+      removeSelectedNode: function (setting, node) {
+        var root = data.getRoot(setting);
+        for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
+          if (node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
+            root.curSelectedList.splice(i, 1);
+            setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, node]);
+            i--;
+            j--;
+          }
+        }
+      },
+      setCache: function (setting, cache) {
+        caches[setting.treeId] = cache;
+      },
+      setRoot: function (setting, root) {
+        roots[setting.treeId] = root;
+      },
+      setZTreeTools: function (setting, zTreeTools) {
+        for (var i = 0, j = _init.zTreeTools.length; i < j; i++) {
+          _init.zTreeTools[i].apply(this, arguments);
+        }
+      },
+      transformToArrayFormat: function (setting, nodes) {
+        if (!nodes) return [];
+        var r = [];
+        if (tools.isArray(nodes)) {
+          for (var i = 0, l = nodes.length; i < l; i++) {
+            var node = nodes[i];
+            _do(node);
+          }
+        } else {
+          _do(nodes);
+        }
+        return r;
+
+        function _do(_node) {
+          r.push(_node);
+          var children = data.nodeChildren(setting, _node);
+          if (children) {
+            r = r.concat(data.transformToArrayFormat(setting, children));
+          }
+        }
+      },
+      transformTozTreeFormat: function (setting, sNodes) {
+        var i, l,
+          key = setting.data.simpleData.idKey,
+          parentKey = setting.data.simpleData.pIdKey;
+        if (!key || key == "" || !sNodes) return [];
+
+        if (tools.isArray(sNodes)) {
+          var r = [];
+          var tmpMap = {};
+          for (i = 0, l = sNodes.length; i < l; i++) {
+            tmpMap[sNodes[i][key]] = sNodes[i];
+          }
+          for (i = 0, l = sNodes.length; i < l; i++) {
+            var p = tmpMap[sNodes[i][parentKey]];
+            if (p && sNodes[i][key] != sNodes[i][parentKey]) {
+              var children = data.nodeChildren(setting, p);
+              if (!children) {
+                children = data.nodeChildren(setting, p, []);
+              }
+              children.push(sNodes[i]);
+            } else {
+              r.push(sNodes[i]);
+            }
+          }
+          return r;
+        } else {
+          return [sNodes];
+        }
+      }
+    },
+    //method of event proxy
+    event = {
+      bindEvent: function (setting) {
+        for (var i = 0, j = _init.bind.length; i < j; i++) {
+          _init.bind[i].apply(this, arguments);
+        }
+      },
+      unbindEvent: function (setting) {
+        for (var i = 0, j = _init.unbind.length; i < j; i++) {
+          _init.unbind[i].apply(this, arguments);
+        }
+      },
+      bindTree: function (setting) {
+        var eventParam = {
+            treeId: setting.treeId
+          },
+          o = setting.treeObj;
+        if (!setting.view.txtSelectedEnable) {
+          // for can't select text
+          o.bind('selectstart', handler.onSelectStart).css({
+            "-moz-user-select": "-moz-none"
+          });
+        }
+        o.bind('click', eventParam, event.proxy);
+        o.bind('dblclick', eventParam, event.proxy);
+        o.bind('mouseover', eventParam, event.proxy);
+        o.bind('mouseout', eventParam, event.proxy);
+        o.bind('mousedown', eventParam, event.proxy);
+        o.bind('mouseup', eventParam, event.proxy);
+        o.bind('contextmenu', eventParam, event.proxy);
+      },
+      unbindTree: function (setting) {
+        var o = setting.treeObj;
+        o.unbind('selectstart', handler.onSelectStart)
+          .unbind('click', event.proxy)
+          .unbind('dblclick', event.proxy)
+          .unbind('mouseover', event.proxy)
+          .unbind('mouseout', event.proxy)
+          .unbind('mousedown', event.proxy)
+          .unbind('mouseup', event.proxy)
+          .unbind('contextmenu', event.proxy);
+      },
+      doProxy: function (e) {
+        var results = [];
+        for (var i = 0, j = _init.proxys.length; i < j; i++) {
+          var proxyResult = _init.proxys[i].apply(this, arguments);
+          results.push(proxyResult);
+          if (proxyResult.stop) {
+            break;
+          }
+        }
+        return results;
+      },
+      proxy: function (e) {
+        var setting = data.getSetting(e.data.treeId);
+        if (!tools.uCanDo(setting, e)) return true;
+        var results = event.doProxy(e),
+          r = true, x = false;
+        for (var i = 0, l = results.length; i < l; i++) {
+          var proxyResult = results[i];
+          if (proxyResult.nodeEventCallback) {
+            x = true;
+            r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+          }
+          if (proxyResult.treeEventCallback) {
+            x = true;
+            r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+          }
+        }
+        return r;
+      }
+    },
+    //method of event handler
+    handler = {
+      onSwitchNode: function (event, node) {
+        var setting = data.getSetting(event.data.treeId);
+        if (node.open) {
+          if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
+          data.getRoot(setting).expandTriggerFlag = true;
+          view.switchNode(setting, node);
+        } else {
+          if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
+          data.getRoot(setting).expandTriggerFlag = true;
+          view.switchNode(setting, node);
+        }
+        return true;
+      },
+      onClickNode: function (event, node) {
+        var setting = data.getSetting(event.data.treeId),
+          clickFlag = ((setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
+        if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
+        if (clickFlag === 0) {
+          view.cancelPreSelectedNode(setting, node);
+        } else {
+          view.selectNode(setting, node, clickFlag === 2);
+        }
+        setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
+        return true;
+      },
+      onZTreeMousedown: function (event, node) {
+        var setting = data.getSetting(event.data.treeId);
+        if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
+          tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
+        }
+        return true;
+      },
+      onZTreeMouseup: function (event, node) {
+        var setting = data.getSetting(event.data.treeId);
+        if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
+          tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
+        }
+        return true;
+      },
+      onZTreeDblclick: function (event, node) {
+        var setting = data.getSetting(event.data.treeId);
+        if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
+          tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
+        }
+        return true;
+      },
+      onZTreeContextmenu: function (event, node) {
+        var setting = data.getSetting(event.data.treeId);
+        if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
+          tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
+        }
+        return (typeof setting.callback.onRightClick) != "function";
+      },
+      onSelectStart: function (e) {
+        var n = e.originalEvent.srcElement.nodeName.toLowerCase();
+        return (n === "input" || n === "textarea");
+      }
+    },
+    //method of tools for zTree
+    tools = {
+      apply: function (fun, param, defaultValue) {
+        if ((typeof fun) == "function") {
+          return fun.apply(zt, param ? param : []);
+        }
+        return defaultValue;
+      },
+      canAsync: function (setting, node) {
+        var children = data.nodeChildren(setting, node);
+        var isParent = data.nodeIsParent(setting, node);
+        return (setting.async.enable && node && isParent && !(node.zAsync || (children && children.length > 0)));
+      },
+      clone: function (obj) {
+        if (obj === null) return null;
+        var o = tools.isArray(obj) ? [] : {};
+        for (var i in obj) {
+          o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? tools.clone(obj[i]) : obj[i]);
+        }
+        return o;
+      },
+      eqs: function (str1, str2) {
+        return str1.toLowerCase() === str2.toLowerCase();
+      },
+      isArray: function (arr) {
+        return Object.prototype.toString.apply(arr) === "[object Array]";
+      },
+      isElement: function (o) {
+        return (
+          typeof HTMLElement === "object" ? o instanceof HTMLElement : //DOM2
+            o && typeof o === "object" && o !== null && o.nodeType === 1 && typeof o.nodeName === "string"
+        );
+      },
+      $: function (node, exp, setting) {
+        if (!!exp && typeof exp != "string") {
+          setting = exp;
+          exp = "";
+        }
+        if (typeof node == "string") {
+          return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
+        } else {
+          return $("#" + node.tId + exp, setting ? setting.treeObj : null);
+        }
+      },
+      getMDom: function (setting, curDom, targetExpr) {
+        if (!curDom) return null;
+        while (curDom && curDom.id !== setting.treeId) {
+          for (var i = 0, l = targetExpr.length; curDom.tagName && i < l; i++) {
+            if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
+              return curDom;
+            }
+          }
+          curDom = curDom.parentNode;
+        }
+        return null;
+      },
+      getNodeMainDom: function (target) {
+        return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
+      },
+      isChildOrSelf: function (dom, parentId) {
+        return ($(dom).closest("#" + parentId).length > 0);
+      },
+      uCanDo: function (setting, e) {
+        return true;
+      }
+    },
+    //method of operate ztree dom
+    view = {
+      addNodes: function (setting, parentNode, index, newNodes, isSilent) {
+        var isParent = data.nodeIsParent(setting, parentNode);
+        if (setting.data.keep.leaf && parentNode && !isParent) {
+          return;
+        }
+        if (!tools.isArray(newNodes)) {
+          newNodes = [newNodes];
+        }
+        if (setting.data.simpleData.enable) {
+          newNodes = data.transformTozTreeFormat(setting, newNodes);
+        }
+        if (parentNode) {
+          var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
+            target_icoObj = $$(parentNode, consts.id.ICON, setting),
+            target_ulObj = $$(parentNode, consts.id.UL, setting);
+
+          if (!parentNode.open) {
+            view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
+            view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
+            parentNode.open = false;
+            target_ulObj.css({
+              "display": "none"
+            });
+          }
+
+          data.addNodesData(setting, parentNode, index, newNodes);
+          view.createNodes(setting, parentNode.level + 1, newNodes, parentNode, index);
+          if (!isSilent) {
+            view.expandCollapseParentNode(setting, parentNode, true);
+          }
+        } else {
+          data.addNodesData(setting, data.getRoot(setting), index, newNodes);
+          view.createNodes(setting, 0, newNodes, null, index);
+        }
+      },
+      appendNodes: function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
+        if (!nodes) return [];
+        var html = [];
+
+        var tmpPNode = (parentNode) ? parentNode : data.getRoot(setting),
+          tmpPChild = data.nodeChildren(setting, tmpPNode),
+          isFirstNode, isLastNode;
+
+        if (!tmpPChild || index >= tmpPChild.length - nodes.length) {
+          index = -1;
+        }
+
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          var node = nodes[i];
+          if (initFlag) {
+            isFirstNode = ((index === 0 || tmpPChild.length == nodes.length) && (i == 0));
+            isLastNode = (index < 0 && i == (nodes.length - 1));
+            data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
+            data.addNodeCache(setting, node);
+          }
+          var isParent = data.nodeIsParent(setting, node);
+
+          var childHtml = [];
+          var children = data.nodeChildren(setting, node);
+          if (children && children.length > 0) {
+            //make child html first, because checkType
+            childHtml = view.appendNodes(setting, level + 1, children, node, -1, initFlag, openFlag && node.open);
+          }
+          if (openFlag) {
+            view.makeDOMNodeMainBefore(html, setting, node);
+            view.makeDOMNodeLine(html, setting, node);
+            data.getBeforeA(setting, node, html);
+            view.makeDOMNodeNameBefore(html, setting, node);
+            data.getInnerBeforeA(setting, node, html);
+            view.makeDOMNodeIcon(html, setting, node);
+            data.getInnerAfterA(setting, node, html);
+            view.makeDOMNodeNameAfter(html, setting, node);
+            data.getAfterA(setting, node, html);
+            if (isParent && node.open) {
+              view.makeUlHtml(setting, node, html, childHtml.join(''));
+            }
+            view.makeDOMNodeMainAfter(html, setting, node);
+            data.addCreatedNode(setting, node);
+          }
+        }
+        return html;
+      },
+      appendParentULDom: function (setting, node) {
+        var html = [],
+          nObj = $$(node, setting);
+        if (!nObj.get(0) && !!node.parentTId) {
+          view.appendParentULDom(setting, node.getParentNode());
+          nObj = $$(node, setting);
+        }
+        var ulObj = $$(node, consts.id.UL, setting);
+        if (ulObj.get(0)) {
+          ulObj.remove();
+        }
+        var children = data.nodeChildren(setting, node),
+          childHtml = view.appendNodes(setting, node.level + 1, children, node, -1, false, true);
+        view.makeUlHtml(setting, node, html, childHtml.join(''));
+        nObj.append(html.join(''));
+      },
+      asyncNode: function (setting, node, isSilent, callback) {
+        var i, l;
+        var isParent = data.nodeIsParent(setting, node);
+        if (node && !isParent) {
+          tools.apply(callback);
+          return false;
+        } else if (node && node.isAjaxing) {
+          return false;
+        } else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
+          tools.apply(callback);
+          return false;
+        }
+        if (node) {
+          node.isAjaxing = true;
+          var icoObj = $$(node, consts.id.ICON, setting);
+          icoObj.attr({"style": "", "class": consts.className.BUTTON + " " + consts.className.ICO_LOADING});
+        }
+
+        var tmpParam = {};
+        var autoParam = tools.apply(setting.async.autoParam, [setting.treeId, node], setting.async.autoParam);
+        for (i = 0, l = autoParam.length; node && i < l; i++) {
+          var pKey = autoParam[i].split("="), spKey = pKey;
+          if (pKey.length > 1) {
+            spKey = pKey[1];
+            pKey = pKey[0];
+          }
+          tmpParam[spKey] = node[pKey];
+        }
+        var otherParam = tools.apply(setting.async.otherParam, [setting.treeId, node], setting.async.otherParam);
+        if (tools.isArray(otherParam)) {
+          for (i = 0, l = otherParam.length; i < l; i += 2) {
+            tmpParam[otherParam[i]] = otherParam[i + 1];
+          }
+        } else {
+          for (var p in otherParam) {
+            tmpParam[p] = otherParam[p];
+          }
+        }
+
+        var _tmpV = data.getRoot(setting)._ver;
+        $.ajax({
+          contentType: setting.async.contentType,
+          cache: false,
+          type: setting.async.type,
+          url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
+          data: setting.async.contentType.indexOf('application/json') > -1 ? JSON.stringify(tmpParam) : tmpParam,
+          dataType: setting.async.dataType,
+          headers: setting.async.headers,
+          xhrFields: setting.async.xhrFields,
+          success: function (msg) {
+            if (_tmpV != data.getRoot(setting)._ver) {
+              return;
+            }
+            var newNodes = [];
+            try {
+              if (!msg || msg.length == 0) {
+                newNodes = [];
+              } else if (typeof msg == "string") {
+                newNodes = eval("(" + msg + ")");
+              } else {
+                newNodes = msg;
+              }
+            } catch (err) {
+              newNodes = msg;
+            }
+
+            if (node) {
+              node.isAjaxing = null;
+              node.zAsync = true;
+            }
+            view.setNodeLineIcos(setting, node);
+            if (newNodes && newNodes !== "") {
+              newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+              view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+            } else {
+              view.addNodes(setting, node, -1, [], !!isSilent);
+            }
+            setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
+            tools.apply(callback);
+          },
+          error: function (XMLHttpRequest, textStatus, errorThrown) {
+            if (_tmpV != data.getRoot(setting)._ver) {
+              return;
+            }
+            if (node) node.isAjaxing = null;
+            view.setNodeLineIcos(setting, node);
+            setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+          }
+        });
+        return true;
+      },
+      cancelPreSelectedNode: function (setting, node, excludeNode) {
+        var list = data.getRoot(setting).curSelectedList,
+          i, n;
+        for (i = list.length - 1; i >= 0; i--) {
+          n = list[i];
+          if (node === n || (!node && (!excludeNode || excludeNode !== n))) {
+            $$(n, consts.id.A, setting).removeClass(consts.node.CURSELECTED);
+            if (node) {
+              data.removeSelectedNode(setting, node);
+              break;
+            } else {
+              list.splice(i, 1);
+              setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, n]);
+            }
+          }
+        }
+      },
+      createNodeCallback: function (setting) {
+        if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+          var root = data.getRoot(setting);
+          while (root.createdNodes.length > 0) {
+            var node = root.createdNodes.shift();
+            tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
+            if (!!setting.callback.onNodeCreated) {
+              setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
+            }
+          }
+        }
+      },
+      createNodes: function (setting, level, nodes, parentNode, index) {
+        if (!nodes || nodes.length == 0) return;
+        var root = data.getRoot(setting),
+          openFlag = !parentNode || parentNode.open || !!$$(data.nodeChildren(setting, parentNode)[0], setting).get(0);
+        root.createdNodes = [];
+        var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, index, true, openFlag),
+          parentObj, nextObj;
+
+        if (!parentNode) {
+          parentObj = setting.treeObj;
+          //setting.treeObj.append(zTreeHtml.join(''));
+        } else {
+          var ulObj = $$(parentNode, consts.id.UL, setting);
+          if (ulObj.get(0)) {
+            parentObj = ulObj;
+            //ulObj.append(zTreeHtml.join(''));
+          }
+        }
+        if (parentObj) {
+          if (index >= 0) {
+            nextObj = parentObj.children()[index];
+          }
+          if (index >= 0 && nextObj) {
+            $(nextObj).before(zTreeHtml.join(''));
+          } else {
+            parentObj.append(zTreeHtml.join(''));
+          }
+        }
+
+        view.createNodeCallback(setting);
+      },
+      destroy: function (setting) {
+        if (!setting) return;
+        data.initCache(setting);
+        data.initRoot(setting);
+        event.unbindTree(setting);
+        event.unbindEvent(setting);
+        setting.treeObj.empty();
+        delete settings[setting.treeId];
+      },
+      expandCollapseNode: function (setting, node, expandFlag, animateFlag, callback) {
+        var root = data.getRoot(setting);
+        var tmpCb, _callback;
+        if (!node) {
+          tools.apply(callback, []);
+          return;
+        }
+        var children = data.nodeChildren(setting, node);
+        var isParent = data.nodeIsParent(setting, node);
+        if (root.expandTriggerFlag) {
+          _callback = callback;
+          tmpCb = function () {
+            if (_callback) _callback();
+            if (node.open) {
+              setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
+            } else {
+              setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
+            }
+          };
+          callback = tmpCb;
+          root.expandTriggerFlag = false;
+        }
+        if (!node.open && isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (children && children.length > 0 && !$$(children[0], setting).get(0)))) {
+          view.appendParentULDom(setting, node);
+          view.createNodeCallback(setting);
+        }
+        if (node.open == expandFlag) {
+          tools.apply(callback, []);
+          return;
+        }
+        var ulObj = $$(node, consts.id.UL, setting),
+          switchObj = $$(node, consts.id.SWITCH, setting),
+          icoObj = $$(node, consts.id.ICON, setting);
+
+        if (isParent) {
+          node.open = !node.open;
+          if (node.iconOpen && node.iconClose) {
+            icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+          }
+
+          if (node.open) {
+            view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
+            view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
+            if (animateFlag == false || setting.view.expandSpeed == "") {
+              ulObj.show();
+              tools.apply(callback, []);
+            } else {
+              if (children && children.length > 0) {
+                ulObj.slideDown(setting.view.expandSpeed, callback);
+              } else {
+                ulObj.show();
+                tools.apply(callback, []);
+              }
+            }
+          } else {
+            view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
+            view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
+            if (animateFlag == false || setting.view.expandSpeed == "" || !(children && children.length > 0)) {
+              ulObj.hide();
+              tools.apply(callback, []);
+            } else {
+              ulObj.slideUp(setting.view.expandSpeed, callback);
+            }
+          }
+        } else {
+          tools.apply(callback, []);
+        }
+      },
+      expandCollapseParentNode: function (setting, node, expandFlag, animateFlag, callback) {
+        if (!node) return;
+        if (!node.parentTId) {
+          view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+          return;
+        } else {
+          view.expandCollapseNode(setting, node, expandFlag, animateFlag);
+        }
+        if (node.parentTId) {
+          view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
+        }
+      },
+      expandCollapseSonNode: function (setting, node, expandFlag, animateFlag, callback) {
+        var root = data.getRoot(setting),
+          treeNodes = (node) ? data.nodeChildren(setting, node) : data.nodeChildren(setting, root),
+          selfAnimateSign = (node) ? false : animateFlag,
+          expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
+        data.getRoot(setting).expandTriggerFlag = false;
+        if (treeNodes) {
+          for (var i = 0, l = treeNodes.length; i < l; i++) {
+            if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
+          }
+        }
+        data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
+        view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+      },
+      isSelectedNode: function (setting, node) {
+        if (!node) {
+          return false;
+        }
+        var list = data.getRoot(setting).curSelectedList,
+          i;
+        for (i = list.length - 1; i >= 0; i--) {
+          if (node === list[i]) {
+            return true;
+          }
+        }
+        return false;
+      },
+      makeDOMNodeIcon: function (html, setting, node) {
+        var nameStr = data.nodeName(setting, node),
+          name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        html.push("<span id='", node.tId, consts.id.ICON,
+          "' title='' treeNode", consts.id.ICON, " class='", view.makeNodeIcoClass(setting, node),
+          "' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
+          "' class='", consts.className.NAME,
+          "'>", name, "</span>");
+      },
+      makeDOMNodeLine: function (html, setting, node) {
+        html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
+      },
+      makeDOMNodeMainAfter: function (html, setting, node) {
+        html.push("</li>");
+      },
+      makeDOMNodeMainBefore: function (html, setting, node) {
+        html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level, "' tabindex='0' hidefocus='true' treenode>");
+      },
+      makeDOMNodeNameAfter: function (html, setting, node) {
+        html.push("</a>");
+      },
+      makeDOMNodeNameBefore: function (html, setting, node) {
+        var title = data.nodeTitle(setting, node),
+          url = view.makeNodeUrl(setting, node),
+          fontcss = view.makeNodeFontCss(setting, node),
+          nodeClasses = view.makeNodeClasses(setting, node),
+          fontStyle = [];
+        for (var f in fontcss) {
+          fontStyle.push(f, ":", fontcss[f], ";");
+        }
+        html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level,
+          nodeClasses.add ? ' ' + nodeClasses.add.join(' ') : '', 
+          "' treeNode", consts.id.A, " onclick=\"", (node.click || ''),
+          "\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='", view.makeNodeTarget(node), "' style='", fontStyle.join(''),
+          "'");
+        if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {
+          html.push("title='", title.replace(/'/g, "&#39;").replace(/</g, '&lt;').replace(/>/g, '&gt;'), "'");
+        }
+        html.push(">");
+      },
+      makeNodeFontCss: function (setting, node) {
+        var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
+        return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
+      },
+      makeNodeClasses: function (setting, node) {
+        var classes = tools.apply(setting.view.nodeClasses, [setting.treeId, node], setting.view.nodeClasses);
+        return (classes && (typeof classes !== "function")) ? classes : {add:[], remove:[]};
+      },
+      makeNodeIcoClass: function (setting, node) {
+        var icoCss = ["ico"];
+        if (!node.isAjaxing) {
+          var isParent = data.nodeIsParent(setting, node);
+          icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
+          if (isParent) {
+            icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+          } else {
+            icoCss.push(consts.folder.DOCU);
+          }
+        }
+        return consts.className.BUTTON + " " + icoCss.join('_');
+      },
+      makeNodeIcoStyle: function (setting, node) {
+        var icoStyle = [];
+        if (!node.isAjaxing) {
+          var isParent = data.nodeIsParent(setting, node);
+          var icon = (isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node[setting.data.key.icon];
+          if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
+          if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
+            icoStyle.push("display:none;");
+          }
+        }
+        return icoStyle.join('');
+      },
+      makeNodeLineClass: function (setting, node) {
+        var lineClass = [];
+        if (setting.view.showLine) {
+          if (node.level == 0 && node.isFirstNode && node.isLastNode) {
+            lineClass.push(consts.line.ROOT);
+          } else if (node.level == 0 && node.isFirstNode) {
+            lineClass.push(consts.line.ROOTS);
+          } else if (node.isLastNode) {
+            lineClass.push(consts.line.BOTTOM);
+          } else {
+            lineClass.push(consts.line.CENTER);
+          }
+        } else {
+          lineClass.push(consts.line.NOLINE);
+        }
+        if (data.nodeIsParent(setting, node)) {
+          lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+        } else {
+          lineClass.push(consts.folder.DOCU);
+        }
+        return view.makeNodeLineClassEx(node) + lineClass.join('_');
+      },
+      makeNodeLineClassEx: function (node) {
+        return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
+      },
+      makeNodeTarget: function (node) {
+        return (node.target || "_blank");
+      },
+      makeNodeUrl: function (setting, node) {
+        var urlKey = setting.data.key.url;
+        return node[urlKey] ? node[urlKey] : null;
+      },
+      makeUlHtml: function (setting, node, html, content) {
+        html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block" : "none"), "'>");
+        html.push(content);
+        html.push("</ul>");
+      },
+      makeUlLineClass: function (setting, node) {
+        return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
+      },
+      removeChildNodes: function (setting, node) {
+        if (!node) return;
+        var nodes = data.nodeChildren(setting, node);
+        if (!nodes) return;
+
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          data.removeNodeCache(setting, nodes[i]);
+        }
+        data.removeSelectedNode(setting);
+        delete node[setting.data.key.children];
+
+        if (!setting.data.keep.parent) {
+          data.nodeIsParent(setting, node, false);
+          node.open = false;
+          var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
+            tmp_icoObj = $$(node, consts.id.ICON, setting);
+          view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
+          view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
+          $$(node, consts.id.UL, setting).remove();
+        } else {
+          $$(node, consts.id.UL, setting).empty();
+        }
+      },
+      scrollIntoView: function (setting, dom) {
+        if (!dom) {
+          return;
+        }
+        // support IE 7 / 8
+        if (typeof Element === 'undefined' || typeof HTMLElement === 'undefined') {
+          var contRect = setting.treeObj.get(0).getBoundingClientRect(),
+            findMeRect = dom.getBoundingClientRect();
+          if (findMeRect.top < contRect.top || findMeRect.bottom > contRect.bottom
+            || findMeRect.right > contRect.right || findMeRect.left < contRect.left) {
+            dom.scrollIntoView();
+          }
+          return;
+        }
+        // CC-BY jocki84@googlemail.com, https://gist.github.com/jocki84/6ffafd003387179a988e
+        if (!Element.prototype.scrollIntoViewIfNeeded) {
+          Element.prototype.scrollIntoViewIfNeeded = function (centerIfNeeded) {
+            "use strict";
+
+            function makeRange(start, length) {
+              return {"start": start, "length": length, "end": start + length};
+            }
+
+            function coverRange(inner, outer) {
+              if (
+                false === centerIfNeeded ||
+                (outer.start < inner.end && inner.start < outer.end)
+              ) {
+                return Math.max(
+                  inner.end - outer.length,
+                  Math.min(outer.start, inner.start)
+                );
+              }
+              return (inner.start + inner.end - outer.length) / 2;
+            }
+
+            function makePoint(x, y) {
+              return {
+                "x": x,
+                "y": y,
+                "translate": function translate(dX, dY) {
+                  return makePoint(x + dX, y + dY);
+                }
+              };
+            }
+
+            function absolute(elem, pt) {
+              while (elem) {
+                pt = pt.translate(elem.offsetLeft, elem.offsetTop);
+                elem = elem.offsetParent;
+              }
+              return pt;
+            }
+
+            var target = absolute(this, makePoint(0, 0)),
+              extent = makePoint(this.offsetWidth, this.offsetHeight),
+              elem = this.parentNode,
+              origin;
+
+            while (elem instanceof HTMLElement) {
+              // Apply desired scroll amount.
+              origin = absolute(elem, makePoint(elem.clientLeft, elem.clientTop));
+              elem.scrollLeft = coverRange(
+                makeRange(target.x - origin.x, extent.x),
+                makeRange(elem.scrollLeft, elem.clientWidth)
+              );
+              elem.scrollTop = coverRange(
+                makeRange(target.y - origin.y, extent.y),
+                makeRange(elem.scrollTop, elem.clientHeight)
+              );
+
+              // Determine actual scroll amount by reading back scroll properties.
+              target = target.translate(-elem.scrollLeft, -elem.scrollTop);
+              elem = elem.parentNode;
+            }
+          };
+        }
+        dom.scrollIntoViewIfNeeded();
+      },
+      setFirstNode: function (setting, parentNode) {
+        var children = data.nodeChildren(setting, parentNode);
+        if (children.length > 0) {
+          children[0].isFirstNode = true;
+        }
+      },
+      setLastNode: function (setting, parentNode) {
+        var children = data.nodeChildren(setting, parentNode);
+        if (children.length > 0) {
+          children[children.length - 1].isLastNode = true;
+        }
+      },
+      removeNode: function (setting, node) {
+        var root = data.getRoot(setting),
+          parentNode = (node.parentTId) ? node.getParentNode() : root;
+
+        node.isFirstNode = false;
+        node.isLastNode = false;
+        node.getPreNode = function () {
+          return null;
+        };
+        node.getNextNode = function () {
+          return null;
+        };
+
+        if (!data.getNodeCache(setting, node.tId)) {
+          return;
+        }
+
+        $$(node, setting).remove();
+        data.removeNodeCache(setting, node);
+        data.removeSelectedNode(setting, node);
+
+        var children = data.nodeChildren(setting, parentNode);
+        for (var i = 0, l = children.length; i < l; i++) {
+          if (children[i].tId == node.tId) {
+            children.splice(i, 1);
+            break;
+          }
+        }
+        view.setFirstNode(setting, parentNode);
+        view.setLastNode(setting, parentNode);
+
+        var tmp_ulObj, tmp_switchObj, tmp_icoObj,
+          childLength = children.length;
+
+        //repair nodes old parent
+        if (!setting.data.keep.parent && childLength == 0) {
+          //old parentNode has no child nodes
+          data.nodeIsParent(setting, parentNode, false);
+          parentNode.open = false;
+          delete parentNode[setting.data.key.children];
+          tmp_ulObj = $$(parentNode, consts.id.UL, setting);
+          tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
+          tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
+          view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
+          view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
+          tmp_ulObj.css("display", "none");
+
+        } else if (setting.view.showLine && childLength > 0) {
+          //old parentNode has child nodes
+          var newLast = children[childLength - 1];
+          tmp_ulObj = $$(newLast, consts.id.UL, setting);
+          tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
+          tmp_icoObj = $$(newLast, consts.id.ICON, setting);
+          if (parentNode == root) {
+            if (children.length == 1) {
+              //node was root, and ztree has only one root after move node
+              view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
+            } else {
+              var tmp_first_switchObj = $$(children[0], consts.id.SWITCH, setting);
+              view.replaceSwitchClass(children[0], tmp_first_switchObj, consts.line.ROOTS);
+              view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+            }
+          } else {
+            view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+          }
+          tmp_ulObj.removeClass(consts.line.LINE);
+        }
+      },
+      replaceIcoClass: function (node, obj, newName) {
+        if (!obj || node.isAjaxing) return;
+        var tmpName = obj.attr("class");
+        if (tmpName == undefined) return;
+        var tmpList = tmpName.split("_");
+        switch (newName) {
+          case consts.folder.OPEN:
+          case consts.folder.CLOSE:
+          case consts.folder.DOCU:
+            tmpList[tmpList.length - 1] = newName;
+            break;
+        }
+        obj.attr("class", tmpList.join("_"));
+      },
+      replaceSwitchClass: function (node, obj, newName) {
+        if (!obj) return;
+        var tmpName = obj.attr("class");
+        if (tmpName == undefined) return;
+        var tmpList = tmpName.split("_");
+        switch (newName) {
+          case consts.line.ROOT:
+          case consts.line.ROOTS:
+          case consts.line.CENTER:
+          case consts.line.BOTTOM:
+          case consts.line.NOLINE:
+            tmpList[0] = view.makeNodeLineClassEx(node) + newName;
+            break;
+          case consts.folder.OPEN:
+          case consts.folder.CLOSE:
+          case consts.folder.DOCU:
+            tmpList[1] = newName;
+            break;
+        }
+        obj.attr("class", tmpList.join("_"));
+        if (newName !== consts.folder.DOCU) {
+          obj.removeAttr("disabled");
+        } else {
+          obj.attr("disabled", "disabled");
+        }
+      },
+      selectNode: function (setting, node, addFlag) {
+        if (!addFlag) {
+          view.cancelPreSelectedNode(setting, null, node);
+        }
+        $$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
+        data.addSelectedNode(setting, node);
+        setting.treeObj.trigger(consts.event.SELECTED, [setting.treeId, node]);
+      },
+      setNodeFontCss: function (setting, treeNode) {
+        var aObj = $$(treeNode, consts.id.A, setting),
+          fontCss = view.makeNodeFontCss(setting, treeNode);
+        if (fontCss) {
+          aObj.css(fontCss);
+        }
+      },
+      setNodeClasses: function (setting, treeNode) {
+        var aObj = $$(treeNode, consts.id.A, setting),
+          classes = view.makeNodeClasses(setting, treeNode);
+        if ('add' in classes && classes.add.length) {
+          aObj.addClass(classes.add.join(' '));
+        }
+        if ('remove' in classes && classes.remove.length) {
+          aObj.removeClass(classes.remove.join(' '));
+        }
+      },
+      setNodeLineIcos: function (setting, node) {
+        if (!node) return;
+        var switchObj = $$(node, consts.id.SWITCH, setting),
+          ulObj = $$(node, consts.id.UL, setting),
+          icoObj = $$(node, consts.id.ICON, setting),
+          ulLine = view.makeUlLineClass(setting, node);
+        if (ulLine.length == 0) {
+          ulObj.removeClass(consts.line.LINE);
+        } else {
+          ulObj.addClass(ulLine);
+        }
+        switchObj.attr("class", view.makeNodeLineClass(setting, node));
+        if (data.nodeIsParent(setting, node)) {
+          switchObj.removeAttr("disabled");
+        } else {
+          switchObj.attr("disabled", "disabled");
+        }
+        icoObj.removeAttr("style");
+        icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+        icoObj.attr("class", view.makeNodeIcoClass(setting, node));
+      },
+      setNodeName: function (setting, node) {
+        var title = data.nodeTitle(setting, node),
+          nObj = $$(node, consts.id.SPAN, setting);
+        nObj.empty();
+        if (setting.view.nameIsHTML) {
+          nObj.html(data.nodeName(setting, node));
+        } else {
+          nObj.text(data.nodeName(setting, node));
+        }
+        if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
+          var aObj = $$(node, consts.id.A, setting);
+          aObj.attr("title", !title ? "" : title);
+        }
+      },
+      setNodeTarget: function (setting, node) {
+        var aObj = $$(node, consts.id.A, setting);
+        aObj.attr("target", view.makeNodeTarget(node));
+      },
+      setNodeUrl: function (setting, node) {
+        var aObj = $$(node, consts.id.A, setting),
+          url = view.makeNodeUrl(setting, node);
+        if (url == null || url.length == 0) {
+          aObj.removeAttr("href");
+        } else {
+          aObj.attr("href", url);
+        }
+      },
+      switchNode: function (setting, node) {
+        if (node.open || !tools.canAsync(setting, node)) {
+          view.expandCollapseNode(setting, node, !node.open);
+        } else if (setting.async.enable) {
+          if (!view.asyncNode(setting, node)) {
+            view.expandCollapseNode(setting, node, !node.open);
+            return;
+          }
+        } else if (node) {
+          view.expandCollapseNode(setting, node, !node.open);
+        }
+      }
+    };
+  // zTree defind
+  $.fn.zTree = {
+    consts: _consts,
+    _z: {
+      tools: tools,
+      view: view,
+      event: event,
+      data: data
+    },
+    getZTreeObj: function (treeId) {
+      var o = data.getZTreeTools(treeId);
+      return o ? o : null;
+    },
+    destroy: function (treeId) {
+      if (!!treeId && treeId.length > 0) {
+        view.destroy(data.getSetting(treeId));
+      } else {
+        for (var s in settings) {
+          view.destroy(settings[s]);
+        }
+      }
+    },
+    init: function (obj, zSetting, zNodes) {
+      var setting = tools.clone(_setting);
+      $.extend(true, setting, zSetting);
+      setting.treeId = obj.attr("id");
+      setting.treeObj = obj;
+      setting.treeObj.empty();
+      settings[setting.treeId] = setting;
+      //For some older browser,(e.g., ie6)
+      if (typeof document.body.style.maxHeight === "undefined") {
+        setting.view.expandSpeed = "";
+      }
+      data.initRoot(setting);
+      var root = data.getRoot(setting);
+      zNodes = zNodes ? tools.clone(tools.isArray(zNodes) ? zNodes : [zNodes]) : [];
+      if (setting.data.simpleData.enable) {
+        data.nodeChildren(setting, root, data.transformTozTreeFormat(setting, zNodes));
+      } else {
+        data.nodeChildren(setting, root, zNodes);
+      }
+
+      data.initCache(setting);
+      event.unbindTree(setting);
+      event.bindTree(setting);
+      event.unbindEvent(setting);
+      event.bindEvent(setting);
+
+      var zTreeTools = {
+        setting: setting,
+        addNodes: function (parentNode, index, newNodes, isSilent) {
+          if (!parentNode) parentNode = null;
+          var isParent = data.nodeIsParent(setting, parentNode);
+          if (parentNode && !isParent && setting.data.keep.leaf) return null;
+
+          var i = parseInt(index, 10);
+          if (isNaN(i)) {
+            isSilent = !!newNodes;
+            newNodes = index;
+            index = -1;
+          } else {
+            index = i;
+          }
+          if (!newNodes) return null;
+
+
+          var xNewNodes = tools.clone(tools.isArray(newNodes) ? newNodes : [newNodes]);
+
+          function addCallback() {
+            view.addNodes(setting, parentNode, index, xNewNodes, (isSilent == true));
+          }
+
+          if (tools.canAsync(setting, parentNode)) {
+            view.asyncNode(setting, parentNode, isSilent, addCallback);
+          } else {
+            addCallback();
+          }
+          return xNewNodes;
+        },
+        cancelSelectedNode: function (node) {
+          view.cancelPreSelectedNode(setting, node);
+        },
+        destroy: function () {
+          view.destroy(setting);
+        },
+        expandAll: function (expandFlag) {
+          expandFlag = !!expandFlag;
+          view.expandCollapseSonNode(setting, null, expandFlag, true);
+          return expandFlag;
+        },
+        expandNode: function (node, expandFlag, sonSign, focus, callbackFlag) {
+          if (!node || !data.nodeIsParent(setting, node)) return null;
+          if (expandFlag !== true && expandFlag !== false) {
+            expandFlag = !node.open;
+          }
+          callbackFlag = !!callbackFlag;
+
+          if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
+            return null;
+          } else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
+            return null;
+          }
+          if (expandFlag && node.parentTId) {
+            view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
+          }
+          if (expandFlag === node.open && !sonSign) {
+            return null;
+          }
+
+          data.getRoot(setting).expandTriggerFlag = callbackFlag;
+          if (!tools.canAsync(setting, node) && sonSign) {
+            view.expandCollapseSonNode(setting, node, expandFlag, true, showNodeFocus);
+          } else {
+            node.open = !expandFlag;
+            view.switchNode(this.setting, node);
+            showNodeFocus();
+          }
+          return expandFlag;
+
+          function showNodeFocus() {
+            var a = $$(node, setting).get(0);
+            if (a && focus !== false) {
+              view.scrollIntoView(setting, a);
+            }
+          }
+        },
+        getNodes: function () {
+          return data.getNodes(setting);
+        },
+        getNodeByParam: function (key, value, parentNode) {
+          if (!key) return null;
+          return data.getNodeByParam(setting, parentNode ? data.nodeChildren(setting, parentNode) : data.getNodes(setting), key, value);
+        },
+        getNodeByTId: function (tId) {
+          return data.getNodeCache(setting, tId);
+        },
+        getNodesByParam: function (key, value, parentNode) {
+          if (!key) return null;
+          return data.getNodesByParam(setting, parentNode ? data.nodeChildren(setting, parentNode) : data.getNodes(setting), key, value);
+        },
+        getNodesByParamFuzzy: function (key, value, parentNode) {
+          if (!key) return null;
+          return data.getNodesByParamFuzzy(setting, parentNode ? data.nodeChildren(setting, parentNode) : data.getNodes(setting), key, value);
+        },
+        getNodesByFilter: function (filter, isSingle, parentNode, invokeParam) {
+          isSingle = !!isSingle;
+          if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
+          return data.getNodesByFilter(setting, parentNode ? data.nodeChildren(setting, parentNode) : data.getNodes(setting), filter, isSingle, invokeParam);
+        },
+        getNodeIndex: function (node) {
+          if (!node) return null;
+          var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+          var children = data.nodeChildren(setting, parentNode);
+          for (var i = 0, l = children.length; i < l; i++) {
+            if (children[i] == node) return i;
+          }
+          return -1;
+        },
+        getSelectedNodes: function () {
+          var r = [], list = data.getRoot(setting).curSelectedList;
+          for (var i = 0, l = list.length; i < l; i++) {
+            r.push(list[i]);
+          }
+          return r;
+        },
+        isSelectedNode: function (node) {
+          return data.isSelectedNode(setting, node);
+        },
+        reAsyncChildNodesPromise: function (parentNode, reloadType, isSilent) {
+          var promise = new Promise(function (resolve, reject) {
+            try {
+              zTreeTools.reAsyncChildNodes(parentNode, reloadType, isSilent, function () {
+                resolve(parentNode);
+              });
+            } catch (e) {
+              reject(e);
+            }
+          });
+          return promise;
+        },
+        reAsyncChildNodes: function (parentNode, reloadType, isSilent, callback) {
+          if (!this.setting.async.enable) return;
+          var isRoot = !parentNode;
+          if (isRoot) {
+            parentNode = data.getRoot(setting);
+          }
+          if (reloadType == "refresh") {
+            var children = data.nodeChildren(setting, parentNode);
+            for (var i = 0, l = children ? children.length : 0; i < l; i++) {
+              data.removeNodeCache(setting, children[i]);
+            }
+            data.removeSelectedNode(setting);
+            data.nodeChildren(setting, parentNode, []);
+            if (isRoot) {
+              this.setting.treeObj.empty();
+            } else {
+              var ulObj = $$(parentNode, consts.id.UL, setting);
+              ulObj.empty();
+            }
+          }
+          view.asyncNode(this.setting, isRoot ? null : parentNode, !!isSilent, callback);
+        },
+        refresh: function () {
+          this.setting.treeObj.empty();
+          var root = data.getRoot(setting),
+            nodes = data.nodeChildren(setting, root);
+          data.initRoot(setting);
+          data.nodeChildren(setting, root, nodes);
+          data.initCache(setting);
+          view.createNodes(setting, 0, data.nodeChildren(setting, root), null, -1);
+        },
+        removeChildNodes: function (node) {
+          if (!node) return null;
+          var nodes = data.nodeChildren(setting, node);
+          view.removeChildNodes(setting, node);
+          return nodes ? nodes : null;
+        },
+        removeNode: function (node, callbackFlag) {
+          if (!node) return;
+          callbackFlag = !!callbackFlag;
+          if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
+          view.removeNode(setting, node);
+          if (callbackFlag) {
+            this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+          }
+        },
+        selectNode: function (node, addFlag, isSilent) {
+          if (!node) return;
+          if (tools.uCanDo(setting)) {
+            addFlag = setting.view.selectedMulti && addFlag;
+            if (node.parentTId) {
+              view.expandCollapseParentNode(setting, node.getParentNode(), true, false, showNodeFocus);
+            } else if (!isSilent) {
+              try {
+                $$(node, setting).focus().blur();
+              } catch (e) {
+              }
+            }
+            view.selectNode(setting, node, addFlag);
+          }
+
+          function showNodeFocus() {
+            if (isSilent) {
+              return;
+            }
+            var a = $$(node, setting).get(0);
+            view.scrollIntoView(setting, a);
+          }
+        },
+        transformTozTreeNodes: function (simpleNodes) {
+          return data.transformTozTreeFormat(setting, simpleNodes);
+        },
+        transformToArray: function (nodes) {
+          return data.transformToArrayFormat(setting, nodes);
+        },
+        updateNode: function (node, checkTypeFlag) {
+          if (!node) return;
+          var nObj = $$(node, setting);
+          if (nObj.get(0) && tools.uCanDo(setting)) {
+            view.setNodeName(setting, node);
+            view.setNodeTarget(setting, node);
+            view.setNodeUrl(setting, node);
+            view.setNodeLineIcos(setting, node);
+            view.setNodeFontCss(setting, node);
+            view.setNodeClasses(setting, node);
+          }
+        }
+      };
+      root.treeTools = zTreeTools;
+      data.setZTreeTools(setting, zTreeTools);
+      var children = data.nodeChildren(setting, root);
+      if (children && children.length > 0) {
+        view.createNodes(setting, 0, children, null, -1);
+      } else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+        view.asyncNode(setting);
+      }
+      return zTreeTools;
+    }
+  };
+
+  var zt = $.fn.zTree,
+    $$ = tools.$,
+    consts = zt.consts;
+})(jQuery);
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/lib/jquery.ztree.exedit.js b/odex25_project/web_gantt_native/static/src/lib/jquery.ztree.exedit.js
new file mode 100644
index 000000000..4dcc2ad71
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/lib/jquery.ztree.exedit.js
@@ -0,0 +1,1204 @@
+/*
+ * JQuery zTree exedit
+ * v3.5.43
+ * http://treejs.cn/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Date: 2020-04-04
+ */
+
+(function ($) {
+  //default consts of exedit
+  var _consts = {
+      event: {
+        DRAG: "ztree_drag",
+        DROP: "ztree_drop",
+        RENAME: "ztree_rename",
+        DRAGMOVE: "ztree_dragmove"
+      },
+      id: {
+        EDIT: "_edit",
+        INPUT: "_input",
+        REMOVE: "_remove"
+      },
+      move: {
+        TYPE_INNER: "inner",
+        TYPE_PREV: "prev",
+        TYPE_NEXT: "next"
+      },
+      node: {
+        CURSELECTED_EDIT: "curSelectedNode_Edit",
+        TMPTARGET_TREE: "tmpTargetzTree",
+        TMPTARGET_NODE: "tmpTargetNode"
+      }
+    },
+    //default setting of exedit
+    _setting = {
+      edit: {
+        enable: false,
+        editNameSelectAll: false,
+        showRemoveBtn: true,
+        showRenameBtn: true,
+        removeTitle: "remove",
+        renameTitle: "rename",
+        drag: {
+          autoExpandTrigger: false,
+          isCopy: true,
+          isMove: true,
+          prev: true,
+          next: true,
+          inner: true,
+          minMoveSize: 5,
+          borderMax: 10,
+          borderMin: -5,
+          maxShowNodeNum: 5,
+          autoOpenTime: 500
+        }
+      },
+      view: {
+        addHoverDom: null,
+        removeHoverDom: null
+      },
+      callback: {
+        beforeDrag: null,
+        beforeDragOpen: null,
+        beforeDrop: null,
+        beforeEditName: null,
+        beforeRename: null,
+        onDrag: null,
+        onDragMove: null,
+        onDrop: null,
+        onRename: null
+      }
+    },
+    //default root of exedit
+    _initRoot = function (setting) {
+      var r = data.getRoot(setting), rs = data.getRoots();
+      r.curEditNode = null;
+      r.curEditInput = null;
+      r.curHoverNode = null;
+      r.dragFlag = 0;
+      r.dragNodeShowBefore = [];
+      r.dragMaskList = new Array();
+      rs.showHoverDom = true;
+    },
+    //default cache of exedit
+    _initCache = function (treeId) {
+    },
+    //default bind event of exedit
+    _bindEvent = function (setting) {
+      var o = setting.treeObj;
+      var c = consts.event;
+      o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
+        tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
+      });
+
+      o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
+        tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
+      });
+
+      o.bind(c.DRAGMOVE, function (event, srcEvent, treeId, treeNodes) {
+        tools.apply(setting.callback.onDragMove, [srcEvent, treeId, treeNodes]);
+      });
+
+      o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
+        tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
+      });
+    },
+    _unbindEvent = function (setting) {
+      var o = setting.treeObj;
+      var c = consts.event;
+      o.unbind(c.RENAME);
+      o.unbind(c.DRAG);
+      o.unbind(c.DRAGMOVE);
+      o.unbind(c.DROP);
+    },
+    //default event proxy of exedit
+    _eventProxy = function (e) {
+      var target = e.target,
+        setting = data.getSetting(e.data.treeId),
+        relatedTarget = e.relatedTarget,
+        tId = "", node = null,
+        nodeEventType = "", treeEventType = "",
+        nodeEventCallback = null, treeEventCallback = null,
+        tmp = null;
+
+      if (tools.eqs(e.type, "mouseover")) {
+        tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+        if (tmp) {
+          tId = tools.getNodeMainDom(tmp).id;
+          nodeEventType = "hoverOverNode";
+        }
+      } else if (tools.eqs(e.type, "mouseout")) {
+        tmp = tools.getMDom(setting, relatedTarget, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+        if (!tmp) {
+          tId = "remove";
+          nodeEventType = "hoverOutNode";
+        }
+      } else if (tools.eqs(e.type, "mousedown")) {
+        tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+        if (tmp) {
+          tId = tools.getNodeMainDom(tmp).id;
+          nodeEventType = "mousedownNode";
+        }
+      }
+      if (tId.length > 0) {
+        node = data.getNodeCache(setting, tId);
+        switch (nodeEventType) {
+          case "mousedownNode" :
+            nodeEventCallback = _handler.onMousedownNode;
+            break;
+          case "hoverOverNode" :
+            nodeEventCallback = _handler.onHoverOverNode;
+            break;
+          case "hoverOutNode" :
+            nodeEventCallback = _handler.onHoverOutNode;
+            break;
+        }
+      }
+      var proxyResult = {
+        stop: false,
+        node: node,
+        nodeEventType: nodeEventType,
+        nodeEventCallback: nodeEventCallback,
+        treeEventType: treeEventType,
+        treeEventCallback: treeEventCallback
+      };
+      return proxyResult
+    },
+    //default init node of exedit
+    _initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+      if (!n) return;
+      n.isHover = false;
+      n.editNameFlag = false;
+    },
+    //update zTreeObj, add method of edit
+    _zTreeTools = function (setting, zTreeTools) {
+      zTreeTools.cancelEditName = function (newName) {
+        var root = data.getRoot(this.setting);
+        if (!root.curEditNode) return;
+        view.cancelCurEditNode(this.setting, newName ? newName : null, true);
+      }
+      zTreeTools.copyNode = function (targetNode, node, moveType, isSilent) {
+        if (!node) return null;
+        var isParent = data.nodeIsParent(setting, targetNode);
+        if (targetNode && !isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
+        var _this = this,
+          newNode = tools.clone(node);
+        if (!targetNode) {
+          targetNode = null;
+          moveType = consts.move.TYPE_INNER;
+        }
+        if (moveType == consts.move.TYPE_INNER) {
+          function copyCallback() {
+            view.addNodes(_this.setting, targetNode, -1, [newNode], isSilent);
+          }
+
+          if (tools.canAsync(this.setting, targetNode)) {
+            view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
+          } else {
+            copyCallback();
+          }
+        } else {
+          view.addNodes(this.setting, targetNode.parentNode, -1, [newNode], isSilent);
+          view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
+        }
+        return newNode;
+      }
+      zTreeTools.editName = function (node) {
+        if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
+        if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
+        view.editNode(this.setting, node)
+      }
+      zTreeTools.moveNode = function (targetNode, node, moveType, isSilent) {
+        if (!node) return node;
+        var isParent = data.nodeIsParent(setting, targetNode);
+        if (targetNode && !isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
+          return null;
+        } else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
+          return null;
+        } else if (!targetNode) {
+          targetNode = null;
+        }
+        var _this = this;
+
+        function moveCallback() {
+          view.moveNode(_this.setting, targetNode, node, moveType, false, isSilent);
+        }
+
+        if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
+          view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
+        } else {
+          moveCallback();
+        }
+        return node;
+      }
+      zTreeTools.setEditable = function (editable) {
+        this.setting.edit.enable = editable;
+        return this.refresh();
+      }
+    },
+    //method of operate data
+    _data = {
+      setSonNodeLevel: function (setting, parentNode, node) {
+        if (!node) return;
+        var children = data.nodeChildren(setting, node);
+        node.level = (parentNode) ? parentNode.level + 1 : 0;
+        if (!children) return;
+        for (var i = 0, l = children.length; i < l; i++) {
+          if (children[i]) data.setSonNodeLevel(setting, node, children[i]);
+        }
+      }
+    },
+    //method of event proxy
+    _event = {},
+    //method of event handler
+    _handler = {
+      onHoverOverNode: function (event, node) {
+        var setting = data.getSetting(event.data.treeId),
+          root = data.getRoot(setting);
+        if (root.curHoverNode != node) {
+          _handler.onHoverOutNode(event);
+        }
+        root.curHoverNode = node;
+        view.addHoverDom(setting, node);
+      },
+      onHoverOutNode: function (event, node) {
+        var setting = data.getSetting(event.data.treeId),
+          root = data.getRoot(setting);
+        if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
+          view.removeTreeDom(setting, root.curHoverNode);
+          root.curHoverNode = null;
+        }
+      },
+      onMousedownNode: function (eventMouseDown, _node) {
+        var i, l,
+          setting = data.getSetting(eventMouseDown.data.treeId),
+          root = data.getRoot(setting), roots = data.getRoots();
+        //right click can't drag & drop
+        if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
+
+        //input of edit node name can't drag & drop
+        var target = eventMouseDown.target,
+          _nodes = data.getRoot(setting).curSelectedList,
+          nodes = [];
+        if (!data.isSelectedNode(setting, _node)) {
+          nodes = [_node];
+        } else {
+          for (i = 0, l = _nodes.length; i < l; i++) {
+            if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode" + consts.id.INPUT) !== null) {
+              return true;
+            }
+            nodes.push(_nodes[i]);
+            if (nodes[0].parentTId !== _nodes[i].parentTId) {
+              nodes = [_node];
+              break;
+            }
+          }
+        }
+
+        view.editNodeBlur = true;
+        view.cancelCurEditNode(setting);
+
+        var doc = $(setting.treeObj.get(0).ownerDocument),
+          body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
+          isOtherTree = false,
+          targetSetting = setting,
+          sourceSetting = setting,
+          preNode, nextNode,
+          preTmpTargetNodeId = null,
+          preTmpMoveType = null,
+          tmpTargetNodeId = null,
+          moveType = consts.move.TYPE_INNER,
+          mouseDownX = eventMouseDown.clientX,
+          mouseDownY = eventMouseDown.clientY,
+          startTime = (new Date()).getTime();
+
+        if (tools.uCanDo(setting)) {
+          doc.bind("mousemove", _docMouseMove);
+        }
+
+        function _docMouseMove(event) {
+          //avoid start drag after click node
+          if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
+            && Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
+            return true;
+          }
+          var i, l, tmpNode, tmpDom, tmpNodes;
+          body.css("cursor", "pointer");
+
+          if (root.dragFlag == 0) {
+            if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
+              _docMouseUp(event);
+              return true;
+            }
+
+            for (i = 0, l = nodes.length; i < l; i++) {
+              if (i == 0) {
+                root.dragNodeShowBefore = [];
+              }
+              tmpNode = nodes[i];
+              if (data.nodeIsParent(setting, tmpNode) && tmpNode.open) {
+                view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+                root.dragNodeShowBefore[tmpNode.tId] = true;
+              } else {
+                root.dragNodeShowBefore[tmpNode.tId] = false;
+              }
+            }
+
+            root.dragFlag = 1;
+            roots.showHoverDom = false;
+            tools.showIfameMask(setting, true);
+
+            //sort
+            var isOrder = true, lastIndex = -1;
+            if (nodes.length > 1) {
+              var pNodes = nodes[0].parentTId ? data.nodeChildren(setting, nodes[0].getParentNode()) : data.getNodes(setting);
+              tmpNodes = [];
+              for (i = 0, l = pNodes.length; i < l; i++) {
+                if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
+                  if (isOrder && lastIndex > -1 && (lastIndex + 1) !== i) {
+                    isOrder = false;
+                  }
+                  tmpNodes.push(pNodes[i]);
+                  lastIndex = i;
+                }
+                if (nodes.length === tmpNodes.length) {
+                  nodes = tmpNodes;
+                  break;
+                }
+              }
+            }
+            if (isOrder) {
+              preNode = nodes[0].getPreNode();
+              nextNode = nodes[nodes.length - 1].getNextNode();
+            }
+
+            //set node in selected
+            curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
+            for (i = 0, l = nodes.length; i < l; i++) {
+              tmpNode = nodes[i];
+              tmpNode.editNameFlag = false;
+              view.selectNode(setting, tmpNode, i > 0);
+              view.removeTreeDom(setting, tmpNode);
+
+              if (i > setting.edit.drag.maxShowNodeNum - 1) {
+                continue;
+              }
+
+              tmpDom = $$("<li id='" + tmpNode.tId + "_tmp'></li>", setting);
+              tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
+              tmpDom.css("padding", "0");
+              tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
+              curNode.append(tmpDom);
+              if (i == setting.edit.drag.maxShowNodeNum - 1) {
+                tmpDom = $$("<li id='" + tmpNode.tId + "_moretmp'><a>  ...  </a></li>", setting);
+                curNode.append(tmpDom);
+              }
+            }
+            curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
+            curNode.addClass(setting.treeObj.attr("class"));
+            curNode.appendTo(body);
+
+            tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
+            tmpArrow.attr("id", "zTreeMove_arrow_tmp");
+            tmpArrow.appendTo(body);
+
+            setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
+          }
+
+          if (root.dragFlag == 1) {
+            if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft() + 2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
+              var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
+              event.target = (xT.length > 0) ? xT.get(0) : event.target;
+            } else if (tmpTarget) {
+              tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+              if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+                .removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+            }
+            tmpTarget = null;
+            tmpTargetNodeId = null;
+
+            //judge drag & drop in multi ztree
+            isOtherTree = false;
+            targetSetting = setting;
+            var settings = data.getSettings();
+            for (var s in settings) {
+              if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
+                && (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length > 0)) {
+                isOtherTree = true;
+                targetSetting = settings[s];
+              }
+            }
+
+            var docScrollTop = doc.scrollTop(),
+              docScrollLeft = doc.scrollLeft(),
+              treeOffset = targetSetting.treeObj.offset(),
+              scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
+              scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
+              dTop = (event.clientY + docScrollTop - treeOffset.top),
+              dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
+              dLeft = (event.clientX + docScrollLeft - treeOffset.left),
+              dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
+              isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
+              isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
+              isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
+              isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
+              isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
+              isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
+              isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height() + 10) >= scrollHeight),
+              isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
+              isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width() + 10) >= scrollWidth);
+
+            if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+              //get node <li> dom
+              var targetObj = event.target;
+              while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
+                targetObj = targetObj.parentNode;
+              }
+
+              var canMove = true;
+              //don't move to self or children of self
+              for (i = 0, l = nodes.length; i < l; i++) {
+                tmpNode = nodes[i];
+                if (targetObj.id === tmpNode.tId) {
+                  canMove = false;
+                  break;
+                } else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
+                  canMove = false;
+                  break;
+                }
+              }
+              if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
+                tmpTarget = $(targetObj);
+                tmpTargetNodeId = targetObj.id;
+              }
+            }
+
+            //the mouse must be in zTree
+            tmpNode = nodes[0];
+            if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+              //judge mouse move in root of ztree
+              if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
+                tmpTarget = targetSetting.treeObj;
+              }
+              //auto scroll top
+              if (isTop) {
+                targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() - 10);
+              } else if (isBottom) {
+                targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() + 10);
+              }
+              if (isLeft) {
+                targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() - 10);
+              } else if (isRight) {
+                targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + 10);
+              }
+              //auto scroll left
+              if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
+                targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+              }
+            }
+
+            curNode.css({
+              "top": (event.clientY + docScrollTop + 3) + "px",
+              "left": (event.clientX + docScrollLeft + 3) + "px"
+            });
+
+            var dX = 0;
+            var dY = 0;
+            if (tmpTarget && tmpTarget.attr("id") != targetSetting.treeId) {
+              var tmpTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId),
+                isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
+                isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
+                isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
+                isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
+                canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
+                canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
+                canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !data.nodeIsParent(setting, tmpTargetNode)) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
+
+              function clearMove() {
+                tmpTarget = null;
+                tmpTargetNodeId = "";
+                moveType = consts.move.TYPE_INNER;
+                tmpArrow.css({
+                  "display": "none"
+                });
+                if (window.zTreeMoveTimer) {
+                  clearTimeout(window.zTreeMoveTimer);
+                  window.zTreeMoveTargetNodeTId = null
+                }
+              }
+
+              if (!canPrev && !canNext && !canInner) {
+                clearMove();
+              } else {
+                var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
+                  tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
+                  tmpTop = tmpTargetA.offset().top,
+                  tmpLeft = tmpTargetA.offset().left,
+                  prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1)) : -1,
+                  nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0)) : -1,
+                  dY_percent = (event.clientY + docScrollTop - tmpTop) / tmpTargetA.height();
+
+                if ((prevPercent == 1 || dY_percent <= prevPercent && dY_percent >= -.2) && canPrev) {
+                  dX = 1 - tmpArrow.width();
+                  dY = tmpTop - tmpArrow.height() / 2;
+                  moveType = consts.move.TYPE_PREV;
+                } else if ((nextPercent == 0 || dY_percent >= nextPercent && dY_percent <= 1.2) && canNext) {
+                  dX = 1 - tmpArrow.width();
+                  dY = (tmpNextA == null || (data.nodeIsParent(setting, tmpTargetNode) && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height() / 2) : (tmpNextA.offset().top - tmpArrow.height() / 2);
+                  moveType = consts.move.TYPE_NEXT;
+                } else if (canInner) {
+                  dX = 5 - tmpArrow.width();
+                  dY = tmpTop;
+                  moveType = consts.move.TYPE_INNER;
+                } else {
+                  clearMove();
+                }
+
+                if (tmpTarget) {
+                  tmpArrow.css({
+                    "display": "block",
+                    "top": dY + "px",
+                    "left": (tmpLeft + dX) + "px"
+                  });
+                  tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+
+                  if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
+                    startTime = (new Date()).getTime();
+                  }
+                  if (tmpTargetNode && data.nodeIsParent(setting, tmpTargetNode) && moveType == consts.move.TYPE_INNER) {
+                    var startTimer = true;
+                    if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
+                      clearTimeout(window.zTreeMoveTimer);
+                      window.zTreeMoveTargetNodeTId = null;
+                    } else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
+                      startTimer = false;
+                    }
+                    if (startTimer) {
+                      window.zTreeMoveTimer = setTimeout(function () {
+                        if (moveType != consts.move.TYPE_INNER) return;
+                        if (tmpTargetNode && data.nodeIsParent(setting, tmpTargetNode) && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
+                          && tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
+                          view.switchNode(targetSetting, tmpTargetNode);
+                          if (targetSetting.edit.drag.autoExpandTrigger) {
+                            targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+                          }
+                        }
+                      }, targetSetting.edit.drag.autoOpenTime + 50);
+                      window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+                    }
+                  }
+                }
+              }
+            } else {
+              moveType = consts.move.TYPE_INNER;
+              if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
+                tmpTarget.addClass(consts.node.TMPTARGET_TREE);
+              } else {
+                tmpTarget = null;
+              }
+              tmpArrow.css({
+                "display": "none"
+              });
+              if (window.zTreeMoveTimer) {
+                clearTimeout(window.zTreeMoveTimer);
+                window.zTreeMoveTargetNodeTId = null;
+              }
+            }
+            preTmpTargetNodeId = tmpTargetNodeId;
+            preTmpMoveType = moveType;
+
+            setting.treeObj.trigger(consts.event.DRAGMOVE, [event, setting.treeId, nodes]);
+          }
+          return false;
+        }
+
+        doc.bind("mouseup", _docMouseUp);
+
+        function _docMouseUp(event) {
+          if (window.zTreeMoveTimer) {
+            clearTimeout(window.zTreeMoveTimer);
+            window.zTreeMoveTargetNodeTId = null;
+          }
+          preTmpTargetNodeId = null;
+          preTmpMoveType = null;
+          doc.unbind("mousemove", _docMouseMove);
+          doc.unbind("mouseup", _docMouseUp);
+          doc.unbind("selectstart", _docSelect);
+          body.css("cursor", "");
+          if (tmpTarget) {
+            tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+            if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+              .removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+          }
+          tools.showIfameMask(setting, false);
+
+          roots.showHoverDom = true;
+          if (root.dragFlag == 0) return;
+          root.dragFlag = 0;
+
+          var i, l, tmpNode;
+          for (i = 0, l = nodes.length; i < l; i++) {
+            tmpNode = nodes[i];
+            if (data.nodeIsParent(setting, tmpNode) && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
+              view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+              delete root.dragNodeShowBefore[tmpNode.tId];
+            }
+          }
+
+          if (curNode) curNode.remove();
+          if (tmpArrow) tmpArrow.remove();
+
+          var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
+          if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId == nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
+            tmpTarget = null;
+          }
+          if (tmpTarget) {
+            var dragTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId);
+            if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
+              view.selectNodes(sourceSetting, nodes);
+              return;
+            }
+            var newNodes = isCopy ? tools.clone(nodes) : nodes;
+
+            function dropCallback() {
+              if (isOtherTree) {
+                if (!isCopy) {
+                  for (var i = 0, l = nodes.length; i < l; i++) {
+                    view.removeNode(setting, nodes[i]);
+                  }
+                }
+                if (moveType == consts.move.TYPE_INNER) {
+                  view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
+                } else {
+                  view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
+                }
+              } else {
+                if (isCopy && moveType == consts.move.TYPE_INNER) {
+                  view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
+                } else if (isCopy) {
+                  view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
+                } else {
+                  if (moveType != consts.move.TYPE_NEXT) {
+                    for (i = 0, l = newNodes.length; i < l; i++) {
+                      view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+                    }
+                  } else {
+                    for (i = -1, l = newNodes.length - 1; i < l; l--) {
+                      view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+                    }
+                  }
+                }
+              }
+              view.selectNodes(targetSetting, newNodes);
+
+              var a = $$(newNodes[0], setting).get(0);
+              view.scrollIntoView(setting, a);
+
+              setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
+            }
+
+            if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
+              view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
+            } else {
+              dropCallback();
+            }
+
+          } else {
+            view.selectNodes(sourceSetting, nodes);
+            setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
+          }
+        }
+
+        doc.bind("selectstart", _docSelect);
+
+        function _docSelect() {
+          return false;
+        }
+
+        // 2018-03-30 FireFox has fixed this issue.
+        //Avoid FireFox's Bug
+        //If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
+        // if(eventMouseDown.preventDefault) {
+        // 	eventMouseDown.preventDefault();
+        // }
+        return true;
+      }
+    },
+    //method of tools for zTree
+    _tools = {
+      getAbs: function (obj) {
+        var oRect = obj.getBoundingClientRect(),
+          scrollTop = document.body.scrollTop + document.documentElement.scrollTop,
+          scrollLeft = document.body.scrollLeft + document.documentElement.scrollLeft;
+        return [oRect.left + scrollLeft, oRect.top + scrollTop];
+      },
+      inputFocus: function (inputObj) {
+        if (inputObj.get(0)) {
+          inputObj.focus();
+          tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
+        }
+      },
+      inputSelect: function (inputObj) {
+        if (inputObj.get(0)) {
+          inputObj.focus();
+          inputObj.select();
+        }
+      },
+      setCursorPosition: function (obj, pos) {
+        if (obj.setSelectionRange) {
+          obj.focus();
+          obj.setSelectionRange(pos, pos);
+        } else if (obj.createTextRange) {
+          var range = obj.createTextRange();
+          range.collapse(true);
+          range.moveEnd('character', pos);
+          range.moveStart('character', pos);
+          range.select();
+        }
+      },
+      showIfameMask: function (setting, showSign) {
+        var root = data.getRoot(setting);
+        //clear full mask
+        while (root.dragMaskList.length > 0) {
+          root.dragMaskList[0].remove();
+          root.dragMaskList.shift();
+        }
+        if (showSign) {
+          //show mask
+          var iframeList = $$("iframe", setting);
+          for (var i = 0, l = iframeList.length; i < l; i++) {
+            var obj = iframeList.get(i),
+              r = tools.getAbs(obj),
+              dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
+            dragMask.appendTo($$("body", setting));
+            root.dragMaskList.push(dragMask);
+          }
+        }
+      }
+    },
+    //method of operate ztree dom
+    _view = {
+      addEditBtn: function (setting, node) {
+        if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
+          return;
+        }
+        if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
+          return;
+        }
+        var aObj = $$(node, consts.id.A, setting),
+          editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='" + tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle) + "' treeNode" + consts.id.EDIT + " style='display:none;'></span>";
+        aObj.append(editStr);
+
+        $$(node, consts.id.EDIT, setting).bind('click',
+          function () {
+            if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
+            view.editNode(setting, node);
+            return false;
+          }
+        ).show();
+      },
+      addRemoveBtn: function (setting, node) {
+        if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
+          return;
+        }
+        if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
+          return;
+        }
+        var aObj = $$(node, consts.id.A, setting),
+          removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='" + tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle) + "' treeNode" + consts.id.REMOVE + " style='display:none;'></span>";
+        aObj.append(removeStr);
+
+        $$(node, consts.id.REMOVE, setting).bind('click',
+          function () {
+            if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
+            view.removeNode(setting, node);
+            setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+            return false;
+          }
+        ).bind('mousedown',
+          function (eventMouseDown) {
+            return true;
+          }
+        ).show();
+      },
+      addHoverDom: function (setting, node) {
+        if (data.getRoots().showHoverDom) {
+          node.isHover = true;
+          if (setting.edit.enable) {
+            view.addEditBtn(setting, node);
+            view.addRemoveBtn(setting, node);
+          }
+          tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
+        }
+      },
+      cancelCurEditNode: function (setting, forceName, isCancel) {
+        var root = data.getRoot(setting),
+          node = root.curEditNode;
+
+        if (node) {
+          var inputObj = root.curEditInput,
+            newName = forceName ? forceName : (isCancel ? data.nodeName(setting, node) : inputObj.val());
+          if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
+            return false;
+          }
+          data.nodeName(setting, node, newName);
+          var aObj = $$(node, consts.id.A, setting);
+          aObj.removeClass(consts.node.CURSELECTED_EDIT);
+          inputObj.unbind();
+          view.setNodeName(setting, node);
+          node.editNameFlag = false;
+          root.curEditNode = null;
+          root.curEditInput = null;
+          view.selectNode(setting, node, false);
+          setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
+        }
+        root.noSelection = true;
+        return true;
+      },
+      editNode: function (setting, node) {
+        var root = data.getRoot(setting);
+        view.editNodeBlur = false;
+        if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+          setTimeout(function () {
+            tools.inputFocus(root.curEditInput);
+          }, 0);
+          return;
+        }
+        node.editNameFlag = true;
+        view.removeTreeDom(setting, node);
+        view.cancelCurEditNode(setting);
+        view.selectNode(setting, node, false);
+        $$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
+        var inputObj = $$(node, consts.id.INPUT, setting);
+        inputObj.attr("value", data.nodeName(setting, node));
+        if (setting.edit.editNameSelectAll) {
+          tools.inputSelect(inputObj);
+        } else {
+          tools.inputFocus(inputObj);
+        }
+
+        inputObj.bind('blur', function (event) {
+          if (!view.editNodeBlur) {
+            view.cancelCurEditNode(setting);
+          }
+        }).bind('keydown', function (event) {
+          if (event.keyCode == "13") {
+            view.editNodeBlur = true;
+            view.cancelCurEditNode(setting);
+          } else if (event.keyCode == "27") {
+            view.cancelCurEditNode(setting, null, true);
+          }
+        }).bind('click', function (event) {
+          return false;
+        }).bind('dblclick', function (event) {
+          return false;
+        });
+
+        $$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
+        root.curEditInput = inputObj;
+        root.noSelection = false;
+        root.curEditNode = node;
+      },
+      moveNode: function (setting, targetNode, node, moveType, animateFlag, isSilent) {
+        var root = data.getRoot(setting);
+        if (targetNode == node) return;
+        if (setting.data.keep.leaf && targetNode && !data.nodeIsParent(setting, targetNode) && moveType == consts.move.TYPE_INNER) return;
+        var oldParentNode = (node.parentTId ? node.getParentNode() : root),
+          targetNodeIsRoot = (targetNode === null || targetNode == root);
+        if (targetNodeIsRoot && targetNode === null) targetNode = root;
+        if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
+        var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
+
+        if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
+          moveType = consts.move.TYPE_INNER;
+        }
+
+        if (moveType == consts.move.TYPE_INNER) {
+          if (targetNodeIsRoot) {
+            //parentTId of root node is null
+            node.parentTId = null;
+          } else {
+            if (!data.nodeIsParent(setting, targetNode)) {
+              data.nodeIsParent(setting, targetNode, true);
+              targetNode.open = !!targetNode.open;
+              view.setNodeLineIcos(setting, targetNode);
+            }
+            node.parentTId = targetNode.tId;
+          }
+        }
+
+        //move node Dom
+        var targetObj, target_ulObj;
+        if (targetNodeIsRoot) {
+          targetObj = setting.treeObj;
+          target_ulObj = targetObj;
+        } else {
+          if (!isSilent && moveType == consts.move.TYPE_INNER) {
+            view.expandCollapseNode(setting, targetNode, true, false);
+          } else if (!isSilent) {
+            view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
+          }
+          targetObj = $$(targetNode, setting);
+          target_ulObj = $$(targetNode, consts.id.UL, setting);
+          if (!!targetObj.get(0) && !target_ulObj.get(0)) {
+            var ulstr = [];
+            view.makeUlHtml(setting, targetNode, ulstr, '');
+            targetObj.append(ulstr.join(''));
+          }
+          target_ulObj = $$(targetNode, consts.id.UL, setting);
+        }
+        var nodeDom = $$(node, setting);
+        if (!nodeDom.get(0)) {
+          nodeDom = view.appendNodes(setting, node.level, [node], null, -1, false, true).join('');
+        } else if (!targetObj.get(0)) {
+          nodeDom.remove();
+        }
+        if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
+          target_ulObj.append(nodeDom);
+        } else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
+          targetObj.before(nodeDom);
+        } else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
+          targetObj.after(nodeDom);
+        }
+
+        //repair the data after move
+        var i, l,
+          tmpSrcIndex = -1,
+          tmpTargetIndex = 0,
+          oldNeighbor = null,
+          newNeighbor = null,
+          oldLevel = node.level;
+        var oldChildren = data.nodeChildren(setting, oldParentNode);
+        var targetParentChildren = data.nodeChildren(setting, targetParentNode);
+        var targetChildren = data.nodeChildren(setting, targetNode);
+        if (node.isFirstNode) {
+          tmpSrcIndex = 0;
+          if (oldChildren.length > 1) {
+            oldNeighbor = oldChildren[1];
+            oldNeighbor.isFirstNode = true;
+          }
+        } else if (node.isLastNode) {
+          tmpSrcIndex = oldChildren.length - 1;
+          oldNeighbor = oldChildren[tmpSrcIndex - 1];
+          oldNeighbor.isLastNode = true;
+        } else {
+          for (i = 0, l = oldChildren.length; i < l; i++) {
+            if (oldChildren[i].tId == node.tId) {
+              tmpSrcIndex = i;
+              break;
+            }
+          }
+        }
+        if (tmpSrcIndex >= 0) {
+          oldChildren.splice(tmpSrcIndex, 1);
+        }
+        if (moveType != consts.move.TYPE_INNER) {
+          for (i = 0, l = targetParentChildren.length; i < l; i++) {
+            if (targetParentChildren[i].tId == targetNode.tId) tmpTargetIndex = i;
+          }
+        }
+        if (moveType == consts.move.TYPE_INNER) {
+          if (!targetChildren) {
+            targetChildren = data.nodeChildren(setting, targetNode, []);
+          }
+          if (targetChildren.length > 0) {
+            newNeighbor = targetChildren[targetChildren.length - 1];
+            newNeighbor.isLastNode = false;
+          }
+          targetChildren.splice(targetChildren.length, 0, node);
+          node.isLastNode = true;
+          node.isFirstNode = (targetChildren.length == 1);
+        } else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
+          targetParentChildren.splice(tmpTargetIndex, 0, node);
+          newNeighbor = targetNode;
+          newNeighbor.isFirstNode = false;
+          node.parentTId = targetNode.parentTId;
+          node.isFirstNode = true;
+          node.isLastNode = false;
+
+        } else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
+          targetParentChildren.splice(tmpTargetIndex + 1, 0, node);
+          newNeighbor = targetNode;
+          newNeighbor.isLastNode = false;
+          node.parentTId = targetNode.parentTId;
+          node.isFirstNode = false;
+          node.isLastNode = true;
+
+        } else {
+          if (moveType == consts.move.TYPE_PREV) {
+            targetParentChildren.splice(tmpTargetIndex, 0, node);
+          } else {
+            targetParentChildren.splice(tmpTargetIndex + 1, 0, node);
+          }
+          node.parentTId = targetNode.parentTId;
+          node.isFirstNode = false;
+          node.isLastNode = false;
+        }
+        data.fixPIdKeyValue(setting, node);
+        data.setSonNodeLevel(setting, node.getParentNode(), node);
+
+        //repair node what been moved
+        view.setNodeLineIcos(setting, node);
+        view.repairNodeLevelClass(setting, node, oldLevel);
+
+        //repair node's old parentNode dom
+        if (!setting.data.keep.parent && oldChildren.length < 1) {
+          //old parentNode has no child nodes
+          data.nodeIsParent(setting, oldParentNode, false);
+          oldParentNode.open = false;
+          var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
+            tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
+            tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
+          view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
+          view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
+          tmp_ulObj.css("display", "none");
+
+        } else if (oldNeighbor) {
+          //old neigbor node
+          view.setNodeLineIcos(setting, oldNeighbor);
+        }
+
+        //new neigbor node
+        if (newNeighbor) {
+          view.setNodeLineIcos(setting, newNeighbor);
+        }
+
+        //repair checkbox / radio
+        if (!!setting.check && setting.check.enable && view.repairChkClass) {
+          view.repairChkClass(setting, oldParentNode);
+          view.repairParentChkClassWithSelf(setting, oldParentNode);
+          if (oldParentNode != node.parent)
+            view.repairParentChkClassWithSelf(setting, node);
+        }
+
+        //expand parents after move
+        if (!isSilent) {
+          view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+        }
+      },
+      removeEditBtn: function (setting, node) {
+        $$(node, consts.id.EDIT, setting).unbind().remove();
+      },
+      removeRemoveBtn: function (setting, node) {
+        $$(node, consts.id.REMOVE, setting).unbind().remove();
+      },
+      removeTreeDom: function (setting, node) {
+        node.isHover = false;
+        view.removeEditBtn(setting, node);
+        view.removeRemoveBtn(setting, node);
+        tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
+      },
+      repairNodeLevelClass: function (setting, node, oldLevel) {
+        if (oldLevel === node.level) return;
+        var liObj = $$(node, setting),
+          aObj = $$(node, consts.id.A, setting),
+          ulObj = $$(node, consts.id.UL, setting),
+          oldClass = consts.className.LEVEL + oldLevel,
+          newClass = consts.className.LEVEL + node.level;
+        liObj.removeClass(oldClass);
+        liObj.addClass(newClass);
+        aObj.removeClass(oldClass);
+        aObj.addClass(newClass);
+        ulObj.removeClass(oldClass);
+        ulObj.addClass(newClass);
+      },
+      selectNodes: function (setting, nodes) {
+        for (var i = 0, l = nodes.length; i < l; i++) {
+          view.selectNode(setting, nodes[i], i > 0);
+        }
+      }
+    },
+
+    _z = {
+      tools: _tools,
+      view: _view,
+      event: _event,
+      data: _data
+    };
+  $.extend(true, $.fn.zTree.consts, _consts);
+  $.extend(true, $.fn.zTree._z, _z);
+
+  var zt = $.fn.zTree,
+    tools = zt._z.tools,
+    consts = zt.consts,
+    view = zt._z.view,
+    data = zt._z.data,
+    event = zt._z.event,
+    $$ = tools.$;
+
+  data.exSetting(_setting);
+  data.addInitBind(_bindEvent);
+  data.addInitUnBind(_unbindEvent);
+  data.addInitCache(_initCache);
+  data.addInitNode(_initNode);
+  data.addInitProxy(_eventProxy);
+  data.addInitRoot(_initRoot);
+  data.addZTreeTools(_zTreeTools);
+
+  var _cancelPreSelectedNode = view.cancelPreSelectedNode;
+  view.cancelPreSelectedNode = function (setting, node) {
+    var list = data.getRoot(setting).curSelectedList;
+    for (var i = 0, j = list.length; i < j; i++) {
+      if (!node || node === list[i]) {
+        view.removeTreeDom(setting, list[i]);
+        if (node) break;
+      }
+    }
+    if (_cancelPreSelectedNode) _cancelPreSelectedNode.apply(view, arguments);
+  }
+
+  var _createNodes = view.createNodes;
+  view.createNodes = function (setting, level, nodes, parentNode, index) {
+    if (_createNodes) {
+      _createNodes.apply(view, arguments);
+    }
+    if (!nodes) return;
+    if (view.repairParentChkClassWithSelf) {
+      view.repairParentChkClassWithSelf(setting, parentNode);
+    }
+  }
+
+  var _makeNodeUrl = view.makeNodeUrl;
+  view.makeNodeUrl = function (setting, node) {
+    return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
+  }
+
+  var _removeNode = view.removeNode;
+  view.removeNode = function (setting, node) {
+    var root = data.getRoot(setting);
+    if (root.curEditNode === node) root.curEditNode = null;
+    if (_removeNode) {
+      _removeNode.apply(view, arguments);
+    }
+  }
+
+  var _selectNode = view.selectNode;
+  view.selectNode = function (setting, node, addFlag) {
+    var root = data.getRoot(setting);
+    if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+      return false;
+    }
+    if (_selectNode) _selectNode.apply(view, arguments);
+    view.addHoverDom(setting, node);
+    return true;
+  }
+
+  var _uCanDo = tools.uCanDo;
+  tools.uCanDo = function (setting, e) {
+    var root = data.getRoot(setting);
+    if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
+      return true;
+    }
+    if (root.curEditNode) {
+      view.editNodeBlur = false;
+      root.curEditInput.focus();
+    }
+    return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
+  }
+})(jQuery);
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/lib/twix.js b/odex25_project/web_gantt_native/static/src/lib/twix.js
new file mode 100644
index 000000000..27235c8f5
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/lib/twix.js
@@ -0,0 +1,669 @@
+// Generated by CoffeeScript 1.10.0
+(function() {
+  var hasModule, isArray, makeTwix,
+    slice = [].slice;
+
+  hasModule = (typeof module !== "undefined" && module !== null) && (module.exports != null);
+
+  isArray = function(input) {
+    return Object.prototype.toString.call(input) === '[object Array]';
+  };
+
+  makeTwix = function(moment) {
+    var Twix;
+    if (moment == null) {
+      throw new Error("Can't find moment");
+    }
+    Twix = (function() {
+      function Twix(start, end, parseFormat, options) {
+        var ref;
+        if (options == null) {
+          options = {};
+        }
+        if (typeof parseFormat !== 'string') {
+          options = parseFormat != null ? parseFormat : {};
+          parseFormat = null;
+        }
+        if (typeof options === 'boolean') {
+          options = {
+            allDay: options
+          };
+        }
+        this._oStart = moment(start, parseFormat, options.parseStrict);
+        this._oEnd = moment(end, parseFormat, options.parseStrict);
+        this.allDay = (ref = options.allDay) != null ? ref : false;
+        this._mutated();
+      }
+
+      Twix._extend = function() {
+        var attr, first, j, len, other, others;
+        first = arguments[0], others = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+        for (j = 0, len = others.length; j < len; j++) {
+          other = others[j];
+          for (attr in other) {
+            if (typeof other[attr] !== 'undefined') {
+              first[attr] = other[attr];
+            }
+          }
+        }
+        return first;
+      };
+
+      Twix.prototype.start = function() {
+        return this._start.clone();
+      };
+
+      Twix.prototype.end = function() {
+        return this._end.clone();
+      };
+
+      Twix.prototype.isSame = function(period) {
+        return this._start.isSame(this._end, period);
+      };
+
+      Twix.prototype.length = function(period) {
+        return this._displayEnd.diff(this._start, period);
+      };
+
+      Twix.prototype.count = function(period) {
+        var end, start;
+        start = this.start().startOf(period);
+        end = this.end().startOf(period);
+        return end.diff(start, period) + 1;
+      };
+
+      Twix.prototype.countInner = function(period) {
+        var end, ref, start;
+        ref = this._inner(period), start = ref[0], end = ref[1];
+        if (start >= end) {
+          return 0;
+        }
+        return end.diff(start, period);
+      };
+
+      Twix.prototype.iterate = function(intervalAmount, period, minHours) {
+        var end, hasNext, ref, start;
+        ref = this._prepIterateInputs(intervalAmount, period, minHours), intervalAmount = ref[0], period = ref[1], minHours = ref[2];
+        start = this.start().startOf(period);
+        end = this.end().startOf(period);
+        if (this.allDay) {
+          end = end.add(1, 'd');
+        }
+        hasNext = (function(_this) {
+          return function() {
+            return (!_this.allDay && start <= end && (!minHours || !start.isSame(end) || _this._end.hours() > minHours)) || (_this.allDay && start < end);
+          };
+        })(this);
+        return this._iterateHelper(period, start, hasNext, intervalAmount);
+      };
+
+      Twix.prototype.iterateInner = function(intervalAmount, period) {
+        var end, hasNext, ref, ref1, start;
+        ref = this._prepIterateInputs(intervalAmount, period), intervalAmount = ref[0], period = ref[1];
+        ref1 = this._inner(period, intervalAmount), start = ref1[0], end = ref1[1];
+        hasNext = function() {
+          return start < end;
+        };
+        return this._iterateHelper(period, start, hasNext, intervalAmount);
+      };
+
+      Twix.prototype.humanizeLength = function() {
+        if (this.allDay) {
+          if (this.isSame('d')) {
+            return 'all day';
+          } else {
+            return this._start.from(this.end().add(1, 'd'), true);
+          }
+        } else {
+          return this._start.from(this._end, true);
+        }
+      };
+
+      Twix.prototype.asDuration = function(units) {
+        var diff;
+        diff = this._end.diff(this._start);
+        return moment.duration(diff);
+      };
+
+      Twix.prototype.isPast = function() {
+        return this._lastMilli < moment();
+      };
+
+      Twix.prototype.isFuture = function() {
+        return this._start > moment();
+      };
+
+      Twix.prototype.isCurrent = function() {
+        return !this.isPast() && !this.isFuture();
+      };
+
+      Twix.prototype.contains = function(mom) {
+        if (!moment.isMoment(mom)) {
+          mom = moment(mom);
+        }
+        return this._start <= mom && this._lastMilli >= mom;
+      };
+
+      Twix.prototype.isEmpty = function() {
+        return this._start.isSame(this._displayEnd);
+      };
+
+      Twix.prototype.overlaps = function(other) {
+        return this._displayEnd.isAfter(other._start) && this._start.isBefore(other._displayEnd);
+      };
+
+      Twix.prototype.engulfs = function(other) {
+        return this._start <= other._start && this._displayEnd >= other._displayEnd;
+      };
+
+      Twix.prototype.union = function(other) {
+        var allDay, newEnd, newStart;
+        allDay = this.allDay && other.allDay;
+        newStart = this._start < other._start ? this._start : other._start;
+        newEnd = this._lastMilli > other._lastMilli ? (allDay ? this._end : this._displayEnd) : (allDay ? other._end : other._displayEnd);
+        return new Twix(newStart, newEnd, allDay);
+      };
+
+      Twix.prototype.intersection = function(other) {
+        var allDay, newEnd, newStart;
+        allDay = this.allDay && other.allDay;
+        newStart = this._start > other._start ? this._start : other._start;
+        newEnd = this._lastMilli < other._lastMilli ? (allDay ? this._end : this._displayEnd) : (allDay ? other._end : other._displayEnd);
+        return new Twix(newStart, newEnd, allDay);
+      };
+
+      Twix.prototype.xor = function() {
+        var allDay, arr, endTime, i, item, j, k, last, len, len1, o, open, other, others, ref, results, start, t;
+        others = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+        open = 0;
+        start = null;
+        results = [];
+        allDay = ((function() {
+          var j, len, results1;
+          results1 = [];
+          for (j = 0, len = others.length; j < len; j++) {
+            o = others[j];
+            if (o.allDay) {
+              results1.push(o);
+            }
+          }
+          return results1;
+        })()).length === others.length;
+        arr = [];
+        ref = [this].concat(others);
+        for (i = j = 0, len = ref.length; j < len; i = ++j) {
+          item = ref[i];
+          arr.push({
+            time: item._start,
+            i: i,
+            type: 0
+          });
+          arr.push({
+            time: item._displayEnd,
+            i: i,
+            type: 1
+          });
+        }
+        arr = arr.sort(function(a, b) {
+          return a.time - b.time;
+        });
+        for (k = 0, len1 = arr.length; k < len1; k++) {
+          other = arr[k];
+          if (other.type === 1) {
+            open -= 1;
+          }
+          if (open === other.type) {
+            start = other.time;
+          }
+          if (open === (other.type + 1) % 2) {
+            if (start) {
+              last = results[results.length - 1];
+              if (last && last._end.isSame(start)) {
+                last._oEnd = other.time;
+                last._mutated();
+              } else {
+                endTime = allDay ? other.time.clone().subtract(1, 'd') : other.time;
+                t = new Twix(start, endTime, allDay);
+                if (!t.isEmpty()) {
+                  results.push(t);
+                }
+              }
+            }
+            start = null;
+          }
+          if (other.type === 0) {
+            open += 1;
+          }
+        }
+        return results;
+      };
+
+      Twix.prototype.difference = function() {
+        var j, len, others, ref, results1, t;
+        others = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+        ref = this.xor.apply(this, others).map((function(_this) {
+          return function(i) {
+            return _this.intersection(i);
+          };
+        })(this));
+        results1 = [];
+        for (j = 0, len = ref.length; j < len; j++) {
+          t = ref[j];
+          if (!t.isEmpty() && t.isValid()) {
+            results1.push(t);
+          }
+        }
+        return results1;
+      };
+
+      Twix.prototype.split = function() {
+        var args, dur, end, final, i, mom, start, time, times, vals;
+        args = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+        end = start = this.start();
+        if (moment.isDuration(args[0])) {
+          dur = args[0];
+        } else if ((!moment.isMoment(args[0]) && !isArray(args[0]) && typeof args[0] === 'object') || (typeof args[0] === 'number' && typeof args[1] === 'string')) {
+          dur = moment.duration(args[0], args[1]);
+        } else if (isArray(args[0])) {
+          times = args[0];
+        } else {
+          times = args;
+        }
+        if (times) {
+          times = (function() {
+            var j, len, results1;
+            results1 = [];
+            for (j = 0, len = times.length; j < len; j++) {
+              time = times[j];
+              results1.push(moment(time));
+            }
+            return results1;
+          })();
+          times = ((function() {
+            var j, len, results1;
+            results1 = [];
+            for (j = 0, len = times.length; j < len; j++) {
+              mom = times[j];
+              if (mom.isValid() && mom >= start) {
+                results1.push(mom);
+              }
+            }
+            return results1;
+          })()).sort();
+        }
+        if ((dur && dur.asMilliseconds() === 0) || (times && times.length === 0)) {
+          return [this];
+        }
+        vals = [];
+        i = 0;
+        final = this._displayEnd;
+        while (start < final && ((times == null) || times[i])) {
+          end = dur ? start.clone().add(dur) : times[i].clone();
+          end = moment.min(final, end);
+          if (!start.isSame(end)) {
+            vals.push(moment.twix(start, end));
+          }
+          start = end;
+          i += 1;
+        }
+        if (!end.isSame(this._displayEnd) && times) {
+          vals.push(moment.twix(end, this._displayEnd));
+        }
+        return vals;
+      };
+
+      Twix.prototype.divide = function(parts) {
+        return this.split(this.length() / parts, 'ms').slice(0, +(parts - 1) + 1 || 9e9);
+      };
+
+      Twix.prototype.isValid = function() {
+        return this._start.isValid() && this._end.isValid() && this._start <= this._displayEnd;
+      };
+
+      Twix.prototype.equals = function(other) {
+        return (other instanceof Twix) && this.allDay === other.allDay && this._start.valueOf() === other._start.valueOf() && this._end.valueOf() === other._end.valueOf();
+      };
+
+      Twix.prototype.toString = function() {
+        return "{start: " + (this._start.format()) + ", end: " + (this._end.format()) + ", allDay: " + (this.allDay ? 'true' : 'false') + "}";
+      };
+
+      Twix.prototype.toArray = function(intervalAmount, period, minHours) {
+        var itr, range;
+        itr = this.iterate(intervalAmount, period, minHours);
+        range = [];
+        while (itr.hasNext()) {
+          range.push(itr.next());
+        }
+        return range;
+      };
+
+      Twix.prototype.simpleFormat = function(momentOpts, inopts) {
+        var options, s;
+        options = {
+          allDay: '(all day)',
+          template: Twix.formatTemplate
+        };
+        Twix._extend(options, inopts || {});
+        s = options.template(this._start.format(momentOpts), this._end.format(momentOpts));
+        if (this.allDay && options.allDay) {
+          s += " " + options.allDay;
+        }
+        return s;
+      };
+
+      Twix.prototype.format = function(inopts) {
+        var atomicMonthDate, common_bucket, end_bucket, fold, format, fs, global_first, goesIntoTheMorning, j, len, momentHourFormat, needDate, needsMeridiem, options, process, start_bucket, together;
+        if (this.isEmpty()) {
+          return '';
+        }
+        momentHourFormat = this._start.localeData()._longDateFormat['LT'][0];
+        options = {
+          groupMeridiems: true,
+          spaceBeforeMeridiem: true,
+          showDayOfWeek: false,
+          hideTime: false,
+          hideYear: false,
+          implicitMinutes: true,
+          implicitDate: false,
+          implicitYear: true,
+          yearFormat: 'YYYY',
+          monthFormat: 'MMM',
+          weekdayFormat: 'ddd',
+          dayFormat: 'D',
+          meridiemFormat: 'A',
+          hourFormat: momentHourFormat,
+          minuteFormat: 'mm',
+          allDay: 'all day',
+          explicitAllDay: false,
+          lastNightEndsAt: 0,
+          template: Twix.formatTemplate
+        };
+        Twix._extend(options, inopts || {});
+        fs = [];
+        needsMeridiem = options.hourFormat && options.hourFormat[0] === 'h';
+        goesIntoTheMorning = options.lastNightEndsAt > 0 && !this.allDay && this.end().startOf('d').valueOf() === this.start().add(1, 'd').startOf('d').valueOf() && this._start.hours() > 12 && this._end.hours() < options.lastNightEndsAt;
+        needDate = !options.hideDate && (!options.implicitDate || this.start().startOf('d').valueOf() !== moment().startOf('d').valueOf() || !(this.isSame('d') || goesIntoTheMorning));
+        atomicMonthDate = !(this.allDay || options.hideTime);
+        if (this.allDay && this.isSame('d') && (options.implicitDate || options.explicitAllDay)) {
+          fs.push({
+            name: 'all day simple',
+            fn: function() {
+              return options.allDay;
+            },
+            pre: ' ',
+            slot: 0
+          });
+        }
+        if (needDate && !options.hideYear && (!options.implicitYear || this._start.year() !== moment().year() || !this.isSame('y'))) {
+          fs.push({
+            name: 'year',
+            fn: function(date) {
+              return date.format(options.yearFormat);
+            },
+            pre: ', ',
+            slot: 4
+          });
+        }
+        if (atomicMonthDate && needDate) {
+          fs.push({
+            name: 'month-date',
+            fn: function(date) {
+              return date.format(options.monthFormat + " " + options.dayFormat);
+            },
+            ignoreEnd: function() {
+              return goesIntoTheMorning;
+            },
+            pre: ' ',
+            slot: 2
+          });
+        }
+        if (!atomicMonthDate && needDate) {
+          fs.push({
+            name: 'month',
+            fn: function(date) {
+              return date.format(options.monthFormat);
+            },
+            pre: ' ',
+            slot: 2
+          });
+        }
+        if (!atomicMonthDate && needDate) {
+          fs.push({
+            name: 'date',
+            fn: function(date) {
+              return date.format(options.dayFormat);
+            },
+            pre: ' ',
+            slot: 3
+          });
+        }
+        if (needDate && options.showDayOfWeek) {
+          fs.push({
+            name: 'day of week',
+            fn: function(date) {
+              return date.format(options.weekdayFormat);
+            },
+            pre: ' ',
+            slot: 1
+          });
+        }
+        if (options.groupMeridiems && needsMeridiem && !this.allDay && !options.hideTime) {
+          fs.push({
+            name: 'meridiem',
+            fn: function(t) {
+              return t.format(options.meridiemFormat);
+            },
+            slot: 6,
+            pre: options.spaceBeforeMeridiem ? ' ' : ''
+          });
+        }
+        if (!this.allDay && !options.hideTime) {
+          fs.push({
+            name: 'time',
+            fn: function(date) {
+              var str;
+              str = date.minutes() === 0 && options.implicitMinutes && needsMeridiem ? date.format(options.hourFormat) : date.format(options.hourFormat + ":" + options.minuteFormat);
+              if (!options.groupMeridiems && needsMeridiem) {
+                if (options.spaceBeforeMeridiem) {
+                  str += ' ';
+                }
+                str += date.format(options.meridiemFormat);
+              }
+              return str;
+            },
+            slot: 5,
+            pre: ', '
+          });
+        }
+        start_bucket = [];
+        end_bucket = [];
+        common_bucket = [];
+        together = true;
+        process = (function(_this) {
+          return function(format) {
+            var end_str, start_group, start_str;
+            start_str = format.fn(_this._start);
+            end_str = format.ignoreEnd && format.ignoreEnd() ? start_str : format.fn(_this._end);
+            start_group = {
+              format: format,
+              value: function() {
+                return start_str;
+              }
+            };
+            if (end_str === start_str && together) {
+              return common_bucket.push(start_group);
+            } else {
+              if (together) {
+                together = false;
+                common_bucket.push({
+                  format: {
+                    slot: format.slot,
+                    pre: ''
+                  },
+                  value: function() {
+                    return options.template(fold(start_bucket), fold(end_bucket, true).trim());
+                  }
+                });
+              }
+              start_bucket.push(start_group);
+              return end_bucket.push({
+                format: format,
+                value: function() {
+                  return end_str;
+                }
+              });
+            }
+          };
+        })(this);
+        for (j = 0, len = fs.length; j < len; j++) {
+          format = fs[j];
+          process(format);
+        }
+        global_first = true;
+        fold = function(array, skip_pre) {
+          var k, len1, local_first, ref, section, str;
+          local_first = true;
+          str = '';
+          ref = array.sort(function(a, b) {
+            return a.format.slot - b.format.slot;
+          });
+          for (k = 0, len1 = ref.length; k < len1; k++) {
+            section = ref[k];
+            if (!global_first) {
+              if (local_first && skip_pre) {
+                str += ' ';
+              } else {
+                str += section.format.pre;
+              }
+            }
+            str += section.value();
+            global_first = false;
+            local_first = false;
+          }
+          return str;
+        };
+        return fold(common_bucket);
+      };
+
+      Twix.prototype._iterateHelper = function(period, iter, hasNext, intervalAmount) {
+        return {
+          next: function() {
+            var val;
+            if (!hasNext()) {
+              return null;
+            } else {
+              val = iter.clone();
+              iter.add(intervalAmount, period);
+              return val;
+            }
+          },
+          hasNext: hasNext
+        };
+      };
+
+      Twix.prototype._prepIterateInputs = function() {
+        var inputs, intervalAmount, minHours, period, ref, ref1;
+        inputs = 1 <= arguments.length ? slice.call(arguments, 0) : [];
+        if (typeof inputs[0] === 'number') {
+          return inputs;
+        }
+        if (typeof inputs[0] === 'string') {
+          period = inputs.shift();
+          intervalAmount = (ref = inputs.pop()) != null ? ref : 1;
+          if (inputs.length) {
+            minHours = (ref1 = inputs[0]) != null ? ref1 : false;
+          }
+        }
+        if (moment.isDuration(inputs[0])) {
+          period = 'ms';
+          intervalAmount = inputs[0].as(period);
+        }
+        return [intervalAmount, period, minHours];
+      };
+
+      Twix.prototype._inner = function(period, intervalAmount) {
+        var durationCount, durationPeriod, end, modulus, start;
+        if (period == null) {
+          period = 'ms';
+        }
+        if (intervalAmount == null) {
+          intervalAmount = 1;
+        }
+        start = this.start();
+        end = this._displayEnd.clone();
+        if (start > start.clone().startOf(period)) {
+          start.startOf(period).add(intervalAmount, period);
+        }
+        if (end < end.clone().endOf(period)) {
+          end.startOf(period);
+        }
+        durationPeriod = start.twix(end).asDuration(period);
+        durationCount = durationPeriod.get(period);
+        modulus = durationCount % intervalAmount;
+        end.subtract(modulus, period);
+        return [start, end];
+      };
+
+      Twix.prototype._mutated = function() {
+        this._start = this.allDay ? this._oStart.clone().startOf('d') : this._oStart;
+        this._lastMilli = this.allDay ? this._oEnd.clone().endOf('d') : this._oEnd;
+        this._end = this.allDay ? this._oEnd.clone().startOf('d') : this._oEnd;
+        return this._displayEnd = this.allDay ? this._end.clone().add(1, 'd') : this._end;
+      };
+
+      return Twix;
+
+    })();
+    Twix._extend(moment.locale(), {
+      _twix: Twix.defaults
+    });
+    Twix.formatTemplate = function(leftSide, rightSide) {
+      return leftSide + " - " + rightSide;
+    };
+    moment.twix = function() {
+      return (function(func, args, ctor) {
+        ctor.prototype = func.prototype;
+        var child = new ctor, result = func.apply(child, args);
+        return Object(result) === result ? result : child;
+      })(Twix, arguments, function(){});
+    };
+    moment.fn.twix = function() {
+      return (function(func, args, ctor) {
+        ctor.prototype = func.prototype;
+        var child = new ctor, result = func.apply(child, args);
+        return Object(result) === result ? result : child;
+      })(Twix, [this].concat(slice.call(arguments)), function(){});
+    };
+    moment.fn.forDuration = function(duration, allDay) {
+      return new Twix(this, this.clone().add(duration), allDay);
+    };
+    if (moment.duration.fn) {
+      moment.duration.fn.afterMoment = function(startingTime, allDay) {
+        return new Twix(startingTime, moment(startingTime).clone().add(this), allDay);
+      };
+      moment.duration.fn.beforeMoment = function(startingTime, allDay) {
+        return new Twix(moment(startingTime).clone().subtract(this), startingTime, allDay);
+      };
+    }
+    moment.twixClass = Twix;
+    return Twix;
+  };
+
+  if (hasModule) {
+    return module.exports = makeTwix(require('moment'));
+  }
+
+  if (typeof define === 'function') {
+    define('twix', ['moment'], function(moment) {
+      return makeTwix(moment);
+    });
+  }
+
+  if (this.moment) {
+    this.Twix = makeTwix(this.moment);
+  } else if (typeof moment !== "undefined" && moment !== null) {
+    this.Twix = makeTwix(moment);
+  }
+
+}).call(this);
\ No newline at end of file
diff --git a/odex25_project/web_gantt_native/static/src/xml/web_gantt_template.xml b/odex25_project/web_gantt_native/static/src/xml/web_gantt_template.xml
new file mode 100644
index 000000000..0f07eda3d
--- /dev/null
+++ b/odex25_project/web_gantt_native/static/src/xml/web_gantt_template.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+
+    <div t-name="GanttAPS.Pager" class="btn-group btn-group-sm">
+
+        <span class="o_pager_counter">
+            <span class="o_pager_limit btn btn-light btn-sm" style="display: none;"></span>
+            <span class="gantt_pager_info ">
+                <span class="o_pager_size btn-sm "></span>
+            </span>
+
+        </span>
+
+
+    </div>
+
+
+    <div class="item-actions" t-name="GanttList.action">
+	</div>
+
+    <div class="item-infos" t-name="GanttList.info">
+	</div>
+
+
+	<div class="gantt-item-tree" t-name="GanttList.item.ztree">
+		<ul id="treeGantt" class="ztree"></ul>
+	</div>
+
+
+    <t t-name="GanttList.options">
+        <div class="gantt-list-options"></div>
+    </t>
+
+
+    <t t-name="GanttTimeLine.docs">
+        <div class="task-gantt-timeline-docs"></div>
+    </t>
+
+
+    <t t-name="GanttTimeLine.first">
+        <div class="task-gantt-timeline-first"></div>
+    </t>
+
+
+    <t t-name="GanttTimeLine.summary">
+        <div class="task-gantt-timeline-summary"></div>
+    </t>
+
+
+    <t t-name="GanttTimeLine.ghost">
+        <div class="task-gantt-timeline-ghost"></div>
+    </t>
+
+
+    <t t-name="GanttTimeLine.info">
+        <div class="task-gantt-timeline-info"></div>
+    </t>
+
+    <t t-name="GanttTimeLine.arrow">
+        <div class="task-gantt-timeline-arrow"></div>
+    </t>
+
+
+    <t t-name="GanttTimeLine.data">
+        <div class="task-gantt-timeline-row"></div>
+    </t>
+
+
+    <t t-name="GanttTimeLine.reslevel">
+        <div class="task-gantt-timeline-load"></div>
+    </t>
+
+    <t t-name="GanttTimeLine.resbar">
+        <div class="task-gantt-timeline-load-bar"></div>
+    </t>
+
+    <t t-name="GanttTimeLine.intersection">
+        <div class="task-gantt-timeline-inter-section"></div>
+    </t>
+
+
+
+    <t t-name="GanttList.item">
+        <div class="task-gantt-item"></div>
+    </t>
+
+    <t t-name="GanttList.sorting.item">
+        <div class="task-gantt-sorting-item"></div>
+    </t>
+
+
+    <t t-name="GanttTimeLine.head">
+
+        <div class="task-gantt-timeline-head">
+            <div class="task-gantt-scale-secondary"/>
+        </div>
+
+        <div class="task-gantt-timeline-data"></div>
+        <div class="task-gantt-pointer"></div>
+
+    </t>
+
+
+    <t t-name="TimelineGantt.scroll">
+        <div class="timeline-gantt-scroll-scale"></div>
+    </t>
+
+
+    <t t-name="TimelineGantt.header">
+
+        <div class="timeline-gantt-scroll"></div>
+
+        <div class="timeline-gantt-header">
+            <div class="timeline-gantt-items">
+                <div class="timeline-gantt-options"></div>
+<!--                <div class="timeline-gantt-gutter"></div>-->
+            </div>
+
+            <div class="timeline-gantt-head">
+                <div class="timeline-gantt-scale-primary"/>
+                <div class="timeline-gantt-scale-secondary"/>
+            </div>
+        </div>
+    </t>
+
+
+<!--layout-->
+
+    <t t-name="TimelineGanttLayout.header">
+
+         <div class="timeline-gantt-scroll-layout"></div>
+
+        <div class="timeline-gantt-header">
+            <div class="timeline-gantt-items-layout">
+                <div class="timeline-gantt-options-layout"></div>
+            </div>
+
+            <div class="timeline-gantt-head">
+                <div class="timeline-gantt-scale-primary"/>
+                <div class="timeline-gantt-scale-secondary"/>
+            </div>
+        </div>
+    </t>
+
+
+
+    <t t-name="APSGanttView.buttons">
+        <div class="o_gantt_native_buttons">
+            <div class="btn-group btn-group-sm">
+                <button  type="button" class="task-gantt-today btn btn-primary btn-sm">
+                    Today
+                </button>
+            </div>
+
+            <div class="btn-group btn-group-sm">
+                <button type="button" class="task-gantt-zoom task-gantt-zoom-1h btn btn-default">1H</button>
+                <button type="button" class="task-gantt-zoom task-gantt-zoom-2h btn btn-default">2H</button>
+                <button type="button" class="task-gantt-zoom task-gantt-zoom-4h btn btn-default">4H</button>
+                <button type="button" class="task-gantt-zoom task-gantt-zoom-8h btn btn-default">8H</button>
+                <button type="button" class="task-gantt-zoom task-gantt-zoom-days btn btn-default ">Days</button>
+                <button type="button" class="task-gantt-zoom task-gantt-zoom-month btn btn-default ">Month</button>
+                <button type="button" class="task-gantt-zoom task-gantt-zoom-weeks btn btn-default ">Weeks</button>
+                <button type="button" class="task-gantt-zoom task-gantt-zoom-quarter btn btn-default ">Quarter</button>
+            </div>
+        </div>
+    </t>
+
+
+    <t t-name="GanttContainerView">
+        <div class="gantt-view" t-att-data-id="widget.id">
+        </div>
+    </t>
+
+
+    <t t-name="GanttContainerView.main">
+
+        <div class="gantt-container">
+
+            <div class="timeline-gantt"></div>
+
+            <div class="task-gantt">
+                <div class="task-gantt-list" t-att-style="'width:'+gutterOffset+'px;'">
+                    <div class="task-gantt-action"></div>
+                    <div class="task-gantt-items"></div>
+                    <div class="task-gantt-info"></div>
+                </div>
+
+                <div class="task-gantt-timeline">
+                    <div class="task-gantt-timeline-inner"></div>
+                    <div class="task-gantt-line-hints"></div>
+                    <div class="task-gantt-line-tips"></div>
+                </div>
+            </div>
+
+
+<!--            Layout-->
+<!--            <div class="timeline-gantt-scroll-layout"></div> timeline -->
+<!--            <div class="timeline-gantt-layout"></div>-->
+
+<!--            <div class="task-gantt-layout"> timeline -->
+
+<!--                <div class="task-gantt-list-resource" t-att-style="'width:'+gutterOffset+'px;'">-->
+
+<!--                </div>-->
+
+<!--                <div class="task-gantt-timeline-resource">-->
+
+<!--                </div>-->
+
+<!--            </div> timeline-->
+
+
+        </div>
+    </t>
+
+
+
+
+
+
+    <t t-name="GanttToolTip">
+        <div class="task-gantt-line-tip-bar"></div>
+    </t>
+
+
+    <t t-name="GanttToolHint">
+        <div class="task-gantt-line-hint-move"></div>
+    </t>
+
+    <t t-name="GanttHeaderHint">
+        <div class="task-gantt-line-hint-move"></div>
+    </t>
+
+
+
+
+
+</templates>
diff --git a/odex25_project/web_gantt_native/views/web_gantt_src.xml b/odex25_project/web_gantt_native/views/web_gantt_src.xml
new file mode 100644
index 000000000..5f76ed432
--- /dev/null
+++ b/odex25_project/web_gantt_native/views/web_gantt_src.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <template id="assets_backend" name="eb_gantt_native assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+
+                <link rel="stylesheet" href="/web_gantt_native/static/src/css/gantt_native.css"/>
+                <link rel="stylesheet" href="/web_gantt_native/static/src/css/gantt_native_ztree.css"/>
+
+
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/lib/twix.js"></script>
+
+
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/lib/jquery.ztree.core.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/lib/jquery.ztree.exedit.js"></script>
+
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/native_gantt_view.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/native_gantt_controller.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/native_gantt_model.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/native_gantt_renderer.js"></script>
+
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_tool_field.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_pager.js"></script>
+
+
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_head.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_data.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_tool_tip.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_tool_hint.js"></script>
+
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_arrow_draw.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_arrow.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_ghost.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_bar_summary.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_bar_first.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_header.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_header_hint.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_scroll.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_info.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_res_level.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_res_bar.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_intersection.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_timeline_bar_docs.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_item_options.js"></script>
+
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_item_ztree.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_item_action.js"></script>
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/gantt_item_info.js"></script>
+
+                <script type="text/javascript" src="/web_gantt_native/static/src/js/native_gantt_data.js"></script>
+
+
+
+
+            </xpath>
+        </template>
+    </data>
+</openerp>
diff --git a/odex25_project/web_widget_colorpicker/README.rst b/odex25_project/web_widget_colorpicker/README.rst
new file mode 100644
index 000000000..779d7e8e8
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/README.rst
@@ -0,0 +1,41 @@
+Color Picker widget for Odoo web client
+================================
+
+
+Features
+========
+
+Now only in RGBA code.
+
+
+* Display the color on form view when you are not editing it
+
+  |form_view_no_edit|
+
+* Display the color on form view when you editing it
+
+  |form_view_edit|
+
+Usage
+=====
+
+You need to declare a char.
+
+    colorpicker = fields.Char(
+        string="Color Picker",
+    )
+
+
+In the view declaration,
+
+    ...
+    <field name="arch" type="xml">
+        <form string="View name">
+            ...
+            <field name="colorpicker" widget="colorpicker"/>
+            ...
+        </form>
+    </field>
+    ...
+
+
diff --git a/odex25_project/web_widget_colorpicker/__init__.py b/odex25_project/web_widget_colorpicker/__init__.py
new file mode 100644
index 000000000..ec51c5a2b
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+#
diff --git a/odex25_project/web_widget_colorpicker/__manifest__.py b/odex25_project/web_widget_colorpicker/__manifest__.py
new file mode 100644
index 000000000..0345bdb55
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/__manifest__.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+{
+    "name": """Web Widget Colorpicker""",
+    "summary": """Added Color Picker for From""",
+    "category": "Odex25-Project/Odex25-Project",
+    "images": ['static/description/icon.png'],
+    "version": "14.21.04.21",
+    "description": """
+
+            For Form View - added = widget="colorpicker"
+            
+            ...
+            <field name="arch" type="xml">
+                <form string="View name">
+                    ...
+                    <field name="colorpicker" widget="colorpicker"/>
+                    ...
+                </form>
+            </field>
+            ...
+
+    """,
+
+    "author": "Viktor Vorobjov",
+    "license": "LGPL-3",
+    "website": "https://straga.github.io",
+    "support": "vostraga@gmail.com",
+    "price": 0.00,
+    "currency": "EUR",
+
+    "depends": [
+        "web"
+    ],
+    "external_dependencies": {"python": [], "bin": []},
+    "data": [
+        'view/web_widget_colorpicker_view.xml'
+    ],
+    "qweb": [
+        'static/src/xml/widget.xml',
+
+    ],
+    "demo": [],
+
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+    "installable": True,
+    "auto_install": False,
+    "application": False,
+}
diff --git a/odex25_project/web_widget_colorpicker/images/form_view_edit.png b/odex25_project/web_widget_colorpicker/images/form_view_edit.png
new file mode 100644
index 000000000..716e936ee
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/images/form_view_edit.png differ
diff --git a/odex25_project/web_widget_colorpicker/images/form_view_no_edit.png b/odex25_project/web_widget_colorpicker/images/form_view_no_edit.png
new file mode 100644
index 000000000..cb097a6cb
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/images/form_view_no_edit.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/description/form_view_edit.png b/odex25_project/web_widget_colorpicker/static/description/form_view_edit.png
new file mode 100644
index 000000000..716e936ee
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/static/description/form_view_edit.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/description/form_view_no_edit.png b/odex25_project/web_widget_colorpicker/static/description/form_view_no_edit.png
new file mode 100644
index 000000000..cb097a6cb
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/static/description/form_view_no_edit.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/description/icon.png b/odex25_project/web_widget_colorpicker/static/description/icon.png
new file mode 100644
index 000000000..ab43cbc9f
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/static/description/icon.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/description/index.html b/odex25_project/web_widget_colorpicker/static/description/index.html
new file mode 100644
index 000000000..1ad296b60
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/description/index.html
@@ -0,0 +1,80 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Web Widget field</h2>
+        <h3 class="oe_slogan">Bootstrap Color Picker</h3>
+        <div class="oe_demo oe_picture oe_screenshot">
+            <img src="icon.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video PlayList <a href="https://www.youtube.com/watch?v=oLn3-2C5O2Y">Odoo Gantt Native - web widget color picker</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Demo</h2>
+            <p class="oe_mt32">Live:https://demo14.garage12.eu/ </p>
+            <p class="oe_mt32">user: demo Password:demog </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>The module is used in: </h2>
+            <p class="oe_mt32"> Gantt Project native. <a href="https://apps.odoo.com/apps/modules/14.0/project_native/">Gantt Native view for Projects </a>
+            <p class="oe_mt32"> Gantt MRP. <a href="https://apps.odoo.com/apps/modules/14.0/project_native/">Gantt Native view for MRP - Manufacture </a>
+            <p class="oe_mt32"> Gantt Web View Framework <a href="https://apps.odoo.com/apps/modules/14.0/web_gantt_native/">Gantt Native view for MRP - Manufacture</a>
+            <p class="oe_mt32"> Gantt Leave <a href="https://apps.odoo.com/apps/modules/14.0/hr_holidays_gantt_native/">Gantt Native view for Leave </a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">in Action</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Form View
+            </p>
+            <img class="oe_picture oe_screenshot" src="form_view_no_edit.png"/>
+        </div>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Edit Form View
+            </p>
+            <img class="oe_picture oe_screenshot" src="form_view_edit.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Need our service?</h2>
+            <p class="oe_mt32">Contact us by <a href="mailto:vostraga@gmail.com">email</a>
+            <ul>
+                <li><a href="mailto:vostraga@gmail.com">vostraga@gmail.com <i class="fa fa-envelope-o"></i></a></li>
+            </ul>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_separator">
+</section>
diff --git a/odex25_project/web_widget_colorpicker/static/src/css/widget.css b/odex25_project/web_widget_colorpicker/static/src/css/widget.css
new file mode 100644
index 000000000..651b7d263
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/css/widget.css
@@ -0,0 +1,30 @@
+.openerp .oe_form .oe_form_field_time_delta input {
+    width: 100%;
+}
+
+.openerp .oe_form .oe_form_field_delta div {
+    border: 1px solid;
+    display: inline-block;
+    height: 14px;
+    margin-right: 10px;
+    position: relative;
+    top: 3px;
+    width: 40px;
+}
+
+.oe_list_field_time_delta div {
+    border: 1px solid;
+    display: inline-block;
+    height: 14px;
+    margin-right: 10px;
+    position: relative;
+    top: 3px;
+    width: 40px;
+}
+
+.time_delta_box {
+    width: 10px;
+    height: 10px;
+    display: inline-block;
+    margin-right: 5px;
+}
diff --git a/odex25_project/web_widget_colorpicker/static/src/js/widget.js b/odex25_project/web_widget_colorpicker/static/src/js/widget.js
new file mode 100644
index 000000000..1ff50069f
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/js/widget.js
@@ -0,0 +1,58 @@
+odoo.define('web.web_widget_colorpicker', function(require) {
+    "use strict";
+
+    var field_registry = require('web.field_registry');
+    var fields = require('web.basic_fields');
+
+    var FieldColorPicker = fields.FieldChar.extend({
+
+        template: 'FieldColorPicker',
+        widget_class: 'oe_form_field_color',
+
+        _renderReadonly: function () {
+            var show_value = this._formatValue(this.value);
+            this.$el.text(show_value);
+            this.$el.css("background-color", show_value);
+
+        },
+
+        _getValue: function () {
+            var $input = this.$el.find('input');
+
+            var val = $input.val();
+            var isOk = /^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+(?:\.\d+)?))?\)$/i.test(val);
+
+            if (!isOk) {
+                    return '';
+                }
+
+            return $input.val();
+
+
+        },
+
+        _renderEdit: function () {
+
+                var show_value = this.value ;
+                var $input = this.$el.find('input');
+                $input.val(show_value);
+
+                this.$el.colorpicker({format: 'rgba'});
+                this.$input = $input;
+
+        },
+
+
+    });
+
+        field_registry
+        .add('colorpicker', FieldColorPicker);
+
+
+
+return {
+    FieldColorPicker: FieldColorPicker
+};
+
+
+});
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.css b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.css
new file mode 100644
index 000000000..2abaeb1b3
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.css
@@ -0,0 +1,230 @@
+/*!
+ * Bootstrap Colorpicker v2.5.1
+ * https://itsjavi.com/bootstrap-colorpicker/
+ *
+ * Originally written by (c) 2012 Stefan Petre
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ */
+.colorpicker-saturation {
+  width: 100px;
+  height: 100px;
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAQAAADa613fAAAP9klEQVR4XnRWC47rNgwcKjlA0bv2VL1Qi/YELRav7203iS1ppqZoiXCAhuBHVLI74xFtG3/Hz2joIOjRGuR5eMYuRn9YA1fds859KX8ZvczLr9/pImiR3Rqky9/wlajRIdVE/1Rufeu/0No3/ASgBZAJUkwgi0iCaEatekJJoEqiTQncd67/gyOfRCZshTed0Nl8LbLj8D6qxtoq9/7kJz/aH/3Xfu8VwI5+AUH8DxE7gUyiIpZ5LwiGzUqE3CScJsCDQHAsvBnxWpkbC0QMHmBp6latWS0bnvrCN/x1+xPfce+Ij0GAyeAGGz15sOiax2UylPhKrFaMPnVWClwepKh07hdhkVDsK2uoyEIySergjdbY2VBtV8VLr8Mf9mF/4wMb7kR8FOhzFWZZe7HIZD9JRIbee28eJKBweTB6TwjYkAgWaUmtDveGw1Wx3zZ76YlPPfQd/+gTTUFkiGiJ+NQAszU1EPT/QJEgufolAMPkNU4CVOyUIBLg4xglEZHGQnTFOFV0VaulYddBhA986ge/7N/yQi/3flFgwfQq2ibLnTDBRl9TmUHyJASPV/eoN0UISIr+ICQKIFV4EpljSjV1uFVUq9hRtet5e9gXvuyHPW0zMhQxWaoBBa9Tg8vsCEhww23Smd0CKjIkmPIoxWrUBDgJqFCyESF43ctQxLUoHN7Q1KyVhqrNNm3cy2vMyQNPVKjc29Rh5SSU+giWdRJHkLnQG71FQEuNyNGBTDdBQQAKCuGiEUS/jcyGbkMPq931OIzb/dUPGuVlG7f+slqkO5NAAlzTMdcq0NkzmsEBmAQkbI+pSHbiqnuWIA6lijhvqwIxMyWxMGZiPU669XJE1tADDTs2HWpwKxuqdnTpOiOR42xlzLtm3pXGel3xd8/oTs8Xy0MV8GM1RlsC2Y3Wy3wut3M+2mEVux0Gt9fhzTWyLvGiiJYaqY5DWRFIwAiQ5r6gB9GpQihJw4I9j5Mkscj3BnzGjBhv8xna5P1Jo428o6IOPY5KFZtVOkEKqUjqQY9Gi+jrIOFwJUDzRtA9xyoIrGGmkNRmxVAnZoK+TkUIeUYni5wEzgOG5iZX5HCr2JyQNqdk++G0rgb1ochSIGutTj4P7F0PuRUAolmh5sCzAHn1BYyaADh6bgFeoBx6vst091CEvcSLWBBpqGq384jZ5llVHSwEShLx+D4d0mU3D5eEAJQ9KEhOZUYnDENV2qKgmIlQhWfdvcoXYaegPp/n1oKIOgYFqxrzQSciqNhv/5FqPpy6b0UcX2vf13DfWySRSEgkEYlEJJGQSyKJSEQSCYlEEpHexIVO3XOevffze2a+PfPv9x1rne1c3b3Mmlmz9mE++zuzngfnw/E+Dlc4LL4NwHdFy7u3KGPVmZ6/4eeMoDyre3i/KHADIHYO04w9zO0mAotuKnrc7XaPjvu66bNe5cDT7RlPepEnfS2X8dF1/utDvD+OwGDBxEgQywLCvIMYWBY+DShwAAORAdv9PswhDAqOUCi5+71AbFcDMR4xBDNfhySKXPXZ1+Vub+Q1Ltf5z7eC0AjVldHI26rIFdKIAyYBJCFVUhVDwttAnM52B3Ect1TFQXzJ0z33lOuib/QO8g+CuO0gKBRU80A8hkeJ0b1KRQWmFQVSh8mf3lpUpNaRulzN5NArrmKKGMijXgzk7w5ijdFVgT8f1IdFNjVWjDWicUYWEEMmSFDtILdzHW5XueHp7p+yuS54ep5/c5BE2Gw/gWPNYU4/PZaak2VGEsFjSbOf8irea6KQgojGCk0KxZY31tWWgzwayF8N5KYyo3VADVicWWrhwzr3ZqIOa5xW5zbqMPPMiyDURHDIHQTeWq7KFXcQPOqzPOL5Ov/iIDEDy7DHEwx0PTgjO8SS0fOEHcZNMt+XKEFMj8Q4QUSvPu6HPuvd4N9/x12RPwcIVRCAakSOUzHgsUSMFWYzDQ+PiOJqAOuYc9jh5TecnA+xHfFyOYhebeTH89P80wrCJzUjlsx7euIV0g4zQFUSiBPioIWBACFC7GgDj8P91ZSJOQmQP74MAnQo8H5RIe8kZ0kBcQCMAlEpRDiKROBxbR0ksdhWFq0gR9q9uQzkDzuIFQSPqAgRCAsCaVNF2ZAAhxvtzcqcnDk6tpXxSsayqXLIgSOb6zqeH+fvO0i9XEu5EVV+OZehRZJ6BGTeaRhCkTzVIZeAzaWGAFfErIPogQI5CuR3HQQx7DzBB16R3s7e0MBUPedjWutgG/JUTPqMeAQNEiytJRnJearWUgdwFNxN7rtBoECuj/O3BMHaTIxQ0a4GctireElTJHJvLTaalih5kvBCGMvkdESUMAdCFaI4yG8SpDfRWAptqkAJUwCG6B7lOREFSZBqKs57MEHqVJEBwHa2lp0OiKtiQ18gx9P89QrSXyc0vObBM4vPmBADqJZLAo/yzK7qPSZstCy+fDSZlhrm+Zkyjsf5q2otdC14zkLjHLf0me9wjNqQo0B1a6wBJRaIEgC2Qw9oby/cRHA+xHCQy/xlB1HVSV3Y/5yVhsc7dBi2UoIWCMcbELZWgxNCGUZ5y4ceBaLlE8dAfrEosrYT+z8ya3sxXndFBxuQivNGEHFCbLGBlBLKGYHZoeoQpcjtMn/uICPefcxecpuDOEemg9S/44cflZPIlWolyHkLrEpgbS9IQRlAgZgi0WDjsEiPh+PN/Fkogq4GdzPtarlRGW2tJwEK1RMTEvdVdmhAKHO1pdUuGQsVcX+rSfGzDbwGyE8NRPQc83HCaOkTZwPqABZBdFq8zAN1gue0FPO8wYUFBE1WkMwVzM1iQ4BItFh+H36Qy/yJg0DRQICmBl+tbKUC5cCj3yXI+SUFBS78ZAcBtHt+e9lBuiqpTNh9zTvIjzuIWxVYGQJpAZY+VWS3QKh84iSZbwuIdiDpc4KztQa/sjhMaDJEJDSZ8mZ+kCBdC0JpKVNQzZdKu+EsOeFCosrngVAkDS/uy6iGnW7UxmMpkB8FyFKo6iQW8z1HuBdMu1pdkZdB8jWTjlFtNaiJRYniIDcD+eECMqFLS9ED6DgxzCMKnRD3HYYA2uMCJUh70OK8G0EUnJV8lqe8nj84QdqLhdoJskNlEw1ivajM8LtPBhIeN99LESXI9xcQIHFQudHngZjUhXOQeGlUYmAddh5pxMhzV0M1vMAtMFIVmfp6fq+DgEWefjQVenstaqUy3bJQAiVlEihDghCDINFQg8oUhoQPkO8SBEM7SFQ72VYBwPuE7k8uYF5LNwg/TEd2zkuKjIIhTiJRlYrDfNS1QL7DYUcbcCyKJNwOwucVCVSwBBj/DwghXA2hQtACgCBBPprfXkAIFIYRXhONQARFU00Tsh6LEmmQUbkTImMi9me5qaHDIeBgHeRbdxAIqAJBCDSoCNVQglrciqX/ZCD9RRP6rgpBvhmKAFhg2ForBLXBYPtUjj7vCHPe8SXbYAY47gHB9mKeqjjIg/53fmMD0fR9Bug7SFcHI6EA1OC/E8QTL4NgBSGiCiyTChnI1zcQxmyfRZGM6w701KRybDvsIK3LWDx6mxGkcglEZQLkawnCdppZ6sgCh8trWWBUQaUWCEOlOs7HAenFE45QSu9RQQDAqchXNxDq4orQR44qRIFUQvM+mRJuB6GDEixgCbSBQGXghEEbdn1P/zO/QhAWCsWsmRhLa2VFkSZIgSVKmgEQhvk6K8YKMRZl7Dwg4amOUYvFBfLlE4RasOCB5S9PXKq0AqGDMiYIReXF0mYctITWBmqR5F38X5Y7yJfeCtKBzNbWYm5XpsMpf3dRZD3jPDesvdVCOs6KYQXIFw1E4fcE8dHWOepZBXpLJcACWUZVMRZbfvgXR4Ak8A7VVSKSVuu9p6/mFxyE7cOWavtLp952O8huK83+gmHzHaAsVXLgAvl8gPCvHzAFsM8GNXGKPH5cmN02sXTLa8QdKRXMzHv67/k5A9k1UIx36UH/VlWWtuKssNiRapB6BaLXl6MA+ayDcNS3v/sYXgCL620F1kk8QhKAEOvKu4DvajDO5zkHc4fBg76anyEIIcamBPex5EK8AoVHhMW7QAqWrYD1204CJB1hCfOAV/PTBPH0zBmJmsZZKCEaAmdqm4zMcYxYLN0JuHThIAjirAnp3px7TRgD+ZSD/K92M1CNIgbC8Ex7FkSEIlQEEUQEQQQBRBABEUQQEQTx3X0Evap9AhP39jL5OvuzAWuvbDaTTDIzX2aypUCJ0i7nAigoQAk9gUIUSxXEoCFyyVIuL9ZQcMZoArnwr4D0OLS8jGNGTgGnsZQWMYrcOARoIReAALBeWhf+RUCAIEsECFQHLkwR5zj4JW3t5WOUU5djvgQIawD53EDsctmYz8xGaZGPBUR3qNkiGwqDICUYIFpqBgRaayCfFiAWR2wWvoobmzxdF8N5kyxXmvap/sgGcLF/aoBosbG+lE395R8zCA4BqUYgOgYq+HtvBrT0LK15X8lZwx5f9klCX0rdgXzIIGbdhXMqZtHzJhuptEjmsFc4KzmN5IFPtfM7gWw2kPczSIqQSPUDYKYBMamsBCpKphW0iA5H8AbMDPJOQYjLZg1Vk4G49GlCYNYAkdOd0kwRQ8FCyAHydgLZ6Z2AqrVtjDUQ7hCEmrkEooDAsB2YnBCvkBpZ6yBvJpCd7Mn5zJ6C4QF2BUQPgHEIGUrGnHzQ8rlMekBeTyAzwDJksxwM4+w3BY02B8mIl0CmFRm+ZscxAuSnvwqQsECTIGSV6FEoJFTygVuzB5xAsKqBvAQE3+nkVoJDI1BJIaPBWik7ZSu5NIp5A3mRQaTFvLgkO9fVgEgMqqeVfb+p55tijWH+Kea71ubq4v8Sl8089sZKbKEZNq+VUfISJJF7j79WrbYgS994ZEf+nIz0pNFRWqapSmK6P45i3OQuItIiPDyg6RnxZ4D0g+CFPxAzluoRsWsaA6I6JOqVWCisDvJ0BgHTzMSRgMi0vmi8R+sR6tg/XUh7kCc7kMRqSNkTBDx0OkAUegFcMazciBXNpm798R6klXap/WZz49TQwBHqEcj4oCToUPjUuP9lfxcbyKMAwT6bTf1qqIIQDl3i5oCERNmVm0wgW4A8BGRxMX3hWh8bEV5Rvfp4DS5F3djWH2ztDNWKW7OBjgjIwsDWaKRknJjqMsh9QCa1p608lLovFkBE969DYtYelSzwSRcg535vAsFeNU9SzRCYZb4LDmxmFQKkwYGM+5y/G7b1uxMIylLdyE5yxIyYsoXWhQIpzQhYPi3JkJoKkB9+BxD0OMuyOEBe36DgyPSrxscmATldgKj8PxrkA/kA5PYMgkrocwIQ6GSRGmF0VaNqBKQZ5FYDEZSDzFTzq9mBQjAayE1A+ryDTzcQZe0Ibbxj7EwpAmTrJwEimZR9CCPtODhzxuNtY19Zd2Lf/fjCTnEiDAOg62j1utb/dv9mZ/aHCj4AyOHbsW3/As0BTzIgeJU7AAAAAElFTkSuQmCC");
+  cursor: crosshair;
+  float: left;
+}
+.colorpicker-saturation i {
+  display: block;
+  height: 5px;
+  width: 5px;
+  border: 1px solid #000;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin: -4px 0 0 -4px;
+}
+.colorpicker-saturation i b {
+  display: block;
+  height: 5px;
+  width: 5px;
+  border: 1px solid #fff;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.colorpicker-hue,
+.colorpicker-alpha {
+  width: 15px;
+  height: 100px;
+  float: left;
+  cursor: row-resize;
+  margin-left: 4px;
+  margin-bottom: 4px;
+}
+.colorpicker-hue i,
+.colorpicker-alpha i {
+  display: block;
+  height: 1px;
+  background: #000;
+  border-top: 1px solid #fff;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  margin-top: -1px;
+}
+.colorpicker-hue {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAMAAABw8qpSAAABLFBMVEXqFBb/ABH/ACL/ADH/AEH/AFD/AGD/AG7/AH7/AI3/AJ3/AKz/ALz/AMr/ANv/AOr/APr2AP/mAP/XAP/HAP+4AP+oAP+aAP+JAP97AP9rAP9cAP9MAP8+AP8tAP8fAP8PAP8BAv8AEP8AH/8AL/8APv8ATv8AXP8Abf8Ae/8Ai/8Amv8Aqv8AuP8Ayf8A1/8A5/8A9/8A//gA/+kA/9kA/8oA/7oA/6wA/5sA/40A/30A/24A/14A/1AA/z8A/zEA/yEA/xEB/wMN/wAd/wAs/wA8/wBK/wBb/wBp/wB5/wCI/wCY/wCm/wC3/wDF/wDV/wDk/wD1/wD/+gD/7AD/3AD/zAD/vgD/rQD/nwD/jgD/gAD/cAD/YgD/UQD/QwD/MgD/JAD/FAD4Eg42qAedAAAAh0lEQVR4XgXAg3EDAAAAwI9to7Zt27a1/w49BASFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTS1tHXo1KVbj159+g0YNGTYiFFjxk2YNGXajFlz5i1YtGTZilVr1m3YtGXbjl179h04dOTYiVNnzl24dOXajVt37j149OTZi1dv3n349OXbj19//wOxE1dQ8reGAAAAAElFTkSuQmCC");
+}
+.colorpicker-alpha {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABkCAQAAAAVxWkcAAABr0lEQVR4Xo2VwU0DQQxF7dmRuNIFlzlSAR3QAaXQQdIBJVABFXDcOVAAd67cjJLR07dkhcSrkZKfb/t7bG88rFo3B5gZPMNycItu2xloGV7MWHzM9zuzFWCkmA0nK6AszCUJDW6+mG6R03ncw5v8EMTEvZ2O3AliYjpslblc0RF9LmZYWxURU6aKytWZYsoWCAe+xwOZp1GsEukGiIkYxcQCHck99+gRgB7JncyIB5SGEhP3Yh5P6JwX+u6AnYot104d8DJT7uH7M9JH6OZbimj0vfMVaYnJIZFJDBW9kHlerL2C6JV4mSt7uuo2N57RxnZ+usQjn0R1jwBJBrNO3evJpVYUWsJ/E3UiXRlv24/7YZ04xmEdWlzcKS+B/eapeyMvFd2k0+hRk/T0AmTW8h69s2sjYMsdPntECiILhAeIMZAeH4QvUwfn6ijC0tTV+fT9ky8jM9nK2g7Ly1VjSpKYq6IvsAm7MtNu1orEqa/K3KNvgMFdhfquPfJmp2dbh0/8Gzb6Y22ViaNr6n5410zXdngVhbu6XqdOtWOuin5hjABGp4a2uotZ71MVCfwDBt2/v37yo6AAAAAASUVORK5CYII=");
+  display: none;
+}
+.colorpicker-saturation,
+.colorpicker-hue,
+.colorpicker-alpha {
+  background-size: contain;
+}
+.colorpicker {
+  padding: 4px;
+  min-width: 130px;
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  z-index: 2500;
+}
+.colorpicker:before,
+.colorpicker:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.colorpicker:after {
+  clear: both;
+}
+.colorpicker:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 6px;
+}
+.colorpicker:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 7px;
+}
+.colorpicker div {
+  position: relative;
+}
+.colorpicker.colorpicker-with-alpha {
+  min-width: 140px;
+}
+.colorpicker.colorpicker-with-alpha .colorpicker-alpha {
+  display: block;
+}
+.colorpicker-color {
+  height: 10px;
+  margin-top: 5px;
+  clear: both;
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABkCAQAAAAVxWkcAAABr0lEQVR4Xo2VwU0DQQxF7dmRuNIFlzlSAR3QAaXQQdIBJVABFXDcOVAAd67cjJLR07dkhcSrkZKfb/t7bG88rFo3B5gZPMNycItu2xloGV7MWHzM9zuzFWCkmA0nK6AszCUJDW6+mG6R03ncw5v8EMTEvZ2O3AliYjpslblc0RF9LmZYWxURU6aKytWZYsoWCAe+xwOZp1GsEukGiIkYxcQCHck99+gRgB7JncyIB5SGEhP3Yh5P6JwX+u6AnYot104d8DJT7uH7M9JH6OZbimj0vfMVaYnJIZFJDBW9kHlerL2C6JV4mSt7uuo2N57RxnZ+usQjn0R1jwBJBrNO3evJpVYUWsJ/E3UiXRlv24/7YZ04xmEdWlzcKS+B/eapeyMvFd2k0+hRk/T0AmTW8h69s2sjYMsdPntECiILhAeIMZAeH4QvUwfn6ijC0tTV+fT9ky8jM9nK2g7Ly1VjSpKYq6IvsAm7MtNu1orEqa/K3KNvgMFdhfquPfJmp2dbh0/8Gzb6Y22ViaNr6n5410zXdngVhbu6XqdOtWOuin5hjABGp4a2uotZ71MVCfwDBt2/v37yo6AAAAAASUVORK5CYII=");
+  background-position: 0 100%;
+}
+.colorpicker-color div {
+  height: 10px;
+}
+.colorpicker-selectors {
+  display: none;
+  height: 10px;
+  margin-top: 5px;
+  clear: both;
+}
+.colorpicker-selectors i {
+  cursor: pointer;
+  float: left;
+  height: 10px;
+  width: 10px;
+}
+.colorpicker-selectors i + i {
+  margin-left: 3px;
+}
+.colorpicker-element .input-group-addon i,
+.colorpicker-element .add-on i {
+  display: inline-block;
+  cursor: pointer;
+  height: 16px;
+  vertical-align: text-top;
+  width: 16px;
+}
+.colorpicker.colorpicker-inline {
+  position: relative;
+  display: inline-block;
+  float: none;
+  z-index: auto;
+}
+.colorpicker.colorpicker-horizontal {
+  width: 110px;
+  min-width: 110px;
+  height: auto;
+}
+.colorpicker.colorpicker-horizontal .colorpicker-saturation {
+  margin-bottom: 4px;
+}
+.colorpicker.colorpicker-horizontal .colorpicker-color {
+  width: 100px;
+}
+.colorpicker.colorpicker-horizontal .colorpicker-hue,
+.colorpicker.colorpicker-horizontal .colorpicker-alpha {
+  width: 100px;
+  height: 15px;
+  float: left;
+  cursor: col-resize;
+  margin-left: 0px;
+  margin-bottom: 4px;
+}
+.colorpicker.colorpicker-horizontal .colorpicker-hue i,
+.colorpicker.colorpicker-horizontal .colorpicker-alpha i {
+  display: block;
+  height: 15px;
+  background: #ffffff;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 1px;
+  border: none;
+  margin-top: 0px;
+}
+.colorpicker.colorpicker-horizontal .colorpicker-hue {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAABCAMAAAAfBfuPAAABLFBMVEXqFBb/ABH/ACL/ADH/AEH/AFD/AGD/AG7/AH7/AI3/AJ3/AKz/ALz/AMr/ANv/AOr/APr2AP/mAP/XAP/HAP+4AP+oAP+aAP+JAP97AP9rAP9cAP9MAP8+AP8tAP8fAP8PAP8BAv8AEP8AH/8AL/8APv8ATv8AXP8Abf8Ae/8Ai/8Amv8Aqv8AuP8Ayf8A1/8A5/8A9/8A//gA/+kA/9kA/8oA/7oA/6wA/5sA/40A/30A/24A/14A/1AA/z8A/zEA/yEA/xEB/wMN/wAd/wAs/wA8/wBK/wBb/wBp/wB5/wCI/wCY/wCm/wC3/wDF/wDV/wDk/wD1/wD/+gD/7AD/3AD/zAD/vgD/rQD/nwD/jgD/gAD/cAD/YgD/UQD/QwD/MgD/JAD/FAD4Eg42qAedAAAAbUlEQVR4XgXAghEDsbxtlrZt27ax/w49ACAYQTGcICmaYTleECVZUTXdMC1Wm93hdLk9Xp8/EAyFI9FYPJFMpTPZXL5QLJUr1Vq90Wy1O91efzAcjSfT2XyxXK03293+cDydL9fb/fF8vT/f3x+LfRNXARMbCAAAAABJRU5ErkJggg==");
+}
+.colorpicker.colorpicker-horizontal .colorpicker-alpha {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAKCAQAAADoFTP1AAAB9ElEQVR4XoWTQW4VMRBEu9qWEimL7DhEMp8NF+ASnJJLcAQgE1bcgBUSkYKUuHCrZ9pjeqSU5Yn9LPu7umJQBIIv+k7vIOrtK66L4lmr3pVOrOv3otp619KZ0/KjdNI79L52Uo09FBQWrU0vfe5trezU+hLsoUKd3Repovte+0vbq/7Lj5XbaHECKasR9G4MPlbp+gzZxd6koPEJCkAYC5SjcOTAIIOK90Dja1IfIZ8Z+zAY9jm3b5Ia+MT5sFcqRJrR2AYYA8Kua5BzYRrFPNmD4PQMegGJMOffJJUsWiI3nCHZZjInNdffLWOufzbc3JaboCAVxwmnRHbhLSPwRJ4wU0BRSc6HkECYYVw95nMKgJOcylxrJttE5Ibzf9Xq9GPvP+WX3MiV/MGHfRu/SentRQrfG1GzsIrytdNXucSRKxQNIGHM9YhGFQJcdjNcBZvfJayuYe4Sia1CzwW+19mWOhe37HsxJWKwbu/jluEU15QzAQjAqCEbhMJc78GYV2E0kooHDubUImWkTOhGpgv8PoT8DJG/bzxna4BZ0eOFSOaLADGeSpFsg5AzeaDZIDQQXjZ4y/8ryfzUXBwdELRjTjCNvOeT0rNlrJz90vwy6N9pXXQEluX0inElpPWokSdiLCfiNJJjMKQ8Qsh8GEKQKMo/eiHrNbI9UksAAAAASUVORK5CYII=");
+}
+.colorpicker-right:before {
+  left: auto;
+  right: 6px;
+}
+.colorpicker-right:after {
+  left: auto;
+  right: 7px;
+}
+.colorpicker-no-arrow:before {
+  border-right: 0;
+  border-left: 0;
+}
+.colorpicker-no-arrow:after {
+  border-right: 0;
+  border-left: 0;
+}
+.colorpicker.colorpicker-visible,
+.colorpicker-alpha.colorpicker-visible,
+.colorpicker-saturation.colorpicker-visible,
+.colorpicker-hue.colorpicker-visible,
+.colorpicker-selectors.colorpicker-visible {
+  display: block;
+}
+.colorpicker.colorpicker-hidden,
+.colorpicker-alpha.colorpicker-hidden,
+.colorpicker-saturation.colorpicker-hidden,
+.colorpicker-hue.colorpicker-hidden,
+.colorpicker-selectors.colorpicker-hidden {
+  display: none;
+}
+.colorpicker-inline.colorpicker-visible {
+  display: inline-block;
+}
+/*# sourceMappingURL=bootstrap-colorpicker.css.map */
\ No newline at end of file
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map
new file mode 100644
index 000000000..3c46f50b5
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["src/less/colorpicker.less"],"names":[],"mappings":";;;;;;;;;AAoBA;EACE,YAAA;EACA,aAAA;EAXA,sBAAsB,66KAAtB;EAaA,iBAAA;EACA,WAAA;;AALF,uBAME;EACE,cAAA;EACA,WAAA;EACA,UAAA;EACA,sBAAA;EAfF,0BAAA;EACA,uBAAA;EACA,kBAAA;EAeE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,qBAAA;;AAfJ,uBAME,EAUE;EACE,cAAA;EACA,WAAA;EACA,UAAA;EACA,sBAAA;EAzBJ,0BAAA;EACA,uBAAA;EACA,kBAAA;;AA6BF;AACA;EACE,WAAA;EACA,aAAA;EACA,WAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;;AAGF,gBAAiB;AACjB,kBAAmB;EACjB,cAAA;EACA,WAAA;EACA,gBAAA;EACA,0BAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,gBAAA;;AAGF;EA1DE,sBAAsB,yrBAAtB;;AA8DF;EA9DE,sBAAsB,qqBAAtB;EAgEA,aAAA;;AAGF;AACA;AACA;EACE,wBAAA;;AAGF;EACE,YAAA;EACA,gBAAA;EACA,eAAA;EAxEA,0BAAA;EACA,uBAAA;EACA,kBAAA;EAwEA,aAAA;;AAGF,YAAY;AACZ,YAAY;EACV,cAAA;EACA,SAAS,EAAT;EACA,cAAA;;AAGF,YAAY;EACV,WAAA;;AAGF,YAAY;EACV,SAAS,EAAT;EACA,qBAAA;EACA,kCAAA;EACA,mCAAA;EACA,6BAAA;EACA,uCAAA;EACA,kBAAA;EACA,SAAA;EACA,SAAA;;AAGF,YAAY;EACV,SAAS,EAAT;EACA,qBAAA;EACA,kCAAA;EACA,mCAAA;EACA,gCAAA;EACA,kBAAA;EACA,SAAA;EACA,SAAA;;AAGF,YAAa;EACX,kBAAA;;AAGF,YAAY;EACV,gBAAA;;AAGF,YAAY,uBAAwB;EAClC,cAAA;;AAGF;EACE,YAAA;EACA,eAAA;EACA,WAAA;EAlIA,sBAAsB,qqBAAtB;EAoIA,2BAAA;;AAGF,kBAAmB;EACjB,YAAA;;AAGF;EACE,aAAA;EACA,YAAA;EACA,eAAA;EACA,WAAA;;AAGF,sBAAuB;EACrB,eAAA;EACA,WAAA;EACA,YAAA;EACA,WAAA;;AAGF,sBAAuB,EAAE;EACvB,gBAAA;;AAGF,oBAAqB,mBAAmB;AACxC,oBAAqB,QAAQ;EAC3B,qBAAA;EACA,eAAA;EACA,YAAA;EACA,wBAAA;EACA,WAAA;;AAGF,YAAY;EACV,kBAAA;EACA,qBAAA;EACA,WAAA;EACA,aAAA;;AAGF,YAAY;EACV,YAAA;EACA,gBAAA;EACA,YAAA;;AAGF,YAAY,uBAAwB;EAClC,kBAAA;;AAGF,YAAY,uBAAwB;EAClC,YAAA;;AAGF,YAAY,uBAAwB;AACpC,YAAY,uBAAwB;EAClC,YAAA;EACA,YAAA;EACA,WAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;;AAGF,YAAY,uBAAwB,iBAAiB;AACrD,YAAY,uBAAwB,mBAAmB;EACrD,cAAA;EACA,YAAA;EACA,mBAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;EACA,UAAA;EACA,YAAA;EACA,eAAA;;AAGF,YAAY,uBAAwB;EAlNlC,sBAAsB,ypBAAtB;;AAsNF,YAAY,uBAAwB;EAtNlC,sBAAsB,iwBAAtB;;AA0NF,kBAAkB;EAChB,UAAA;EACA,UAAA;;AAGF,kBAAkB;EAChB,UAAA;EACA,UAAA;;AAGF,qBAAqB;EACnB,eAAA;EACA,cAAA;;AAGF,qBAAqB;EACnB,eAAA;EACA,cAAA;;AAQA,YAAC;AAAD,kBAAC;AAAD,uBAAC;AAAD,gBAAC;AAAD,sBAAC;EACC,cAAA;;AASF,YAAC;AAAD,kBAAC;AAAD,uBAAC;AAAD,gBAAC;AAAD,sBAAC;EACC,aAAA;;AAIJ,mBAAmB;EACjB,qBAAA","sourcesContent":["/*!\n * Bootstrap Colorpicker v2.5.1\n * https://itsjavi.com/bootstrap-colorpicker/\n *\n * Originally written by (c) 2012 Stefan Petre\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0.txt\n *\n */\n\n.bgImg(@imgBase64) {\n  background-image: url(\"@{imgBase64}\");\n}\n\n.borderRadius(@size) {\n  -webkit-border-radius: @size;\n  -moz-border-radius: @size;\n  border-radius: @size;\n}\n\n.colorpicker-saturation {\n  width: 100px;\n  height: 100px;\n  .bgImg('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAQAAADa613fAAAP9klEQVR4XnRWC47rNgwcKjlA0bv2VL1Qi/YELRav7203iS1ppqZoiXCAhuBHVLI74xFtG3/Hz2joIOjRGuR5eMYuRn9YA1fds859KX8ZvczLr9/pImiR3Rqky9/wlajRIdVE/1Rufeu/0No3/ASgBZAJUkwgi0iCaEatekJJoEqiTQncd67/gyOfRCZshTed0Nl8LbLj8D6qxtoq9/7kJz/aH/3Xfu8VwI5+AUH8DxE7gUyiIpZ5LwiGzUqE3CScJsCDQHAsvBnxWpkbC0QMHmBp6latWS0bnvrCN/x1+xPfce+Ij0GAyeAGGz15sOiax2UylPhKrFaMPnVWClwepKh07hdhkVDsK2uoyEIySergjdbY2VBtV8VLr8Mf9mF/4wMb7kR8FOhzFWZZe7HIZD9JRIbee28eJKBweTB6TwjYkAgWaUmtDveGw1Wx3zZ76YlPPfQd/+gTTUFkiGiJ+NQAszU1EPT/QJEgufolAMPkNU4CVOyUIBLg4xglEZHGQnTFOFV0VaulYddBhA986ge/7N/yQi/3flFgwfQq2ibLnTDBRl9TmUHyJASPV/eoN0UISIr+ICQKIFV4EpljSjV1uFVUq9hRtet5e9gXvuyHPW0zMhQxWaoBBa9Tg8vsCEhww23Smd0CKjIkmPIoxWrUBDgJqFCyESF43ctQxLUoHN7Q1KyVhqrNNm3cy2vMyQNPVKjc29Rh5SSU+giWdRJHkLnQG71FQEuNyNGBTDdBQQAKCuGiEUS/jcyGbkMPq931OIzb/dUPGuVlG7f+slqkO5NAAlzTMdcq0NkzmsEBmAQkbI+pSHbiqnuWIA6lijhvqwIxMyWxMGZiPU669XJE1tADDTs2HWpwKxuqdnTpOiOR42xlzLtm3pXGel3xd8/oTs8Xy0MV8GM1RlsC2Y3Wy3wut3M+2mEVux0Gt9fhzTWyLvGiiJYaqY5DWRFIwAiQ5r6gB9GpQihJw4I9j5Mkscj3BnzGjBhv8xna5P1Jo428o6IOPY5KFZtVOkEKqUjqQY9Gi+jrIOFwJUDzRtA9xyoIrGGmkNRmxVAnZoK+TkUIeUYni5wEzgOG5iZX5HCr2JyQNqdk++G0rgb1ochSIGutTj4P7F0PuRUAolmh5sCzAHn1BYyaADh6bgFeoBx6vst091CEvcSLWBBpqGq384jZ5llVHSwEShLx+D4d0mU3D5eEAJQ9KEhOZUYnDENV2qKgmIlQhWfdvcoXYaegPp/n1oKIOgYFqxrzQSciqNhv/5FqPpy6b0UcX2vf13DfWySRSEgkEYlEJJGQSyKJSEQSCYlEEpHexIVO3XOevffze2a+PfPv9x1rne1c3b3Mmlmz9mE++zuzngfnw/E+Dlc4LL4NwHdFy7u3KGPVmZ6/4eeMoDyre3i/KHADIHYO04w9zO0mAotuKnrc7XaPjvu66bNe5cDT7RlPepEnfS2X8dF1/utDvD+OwGDBxEgQywLCvIMYWBY+DShwAAORAdv9PswhDAqOUCi5+71AbFcDMR4xBDNfhySKXPXZ1+Vub+Q1Ltf5z7eC0AjVldHI26rIFdKIAyYBJCFVUhVDwttAnM52B3Ect1TFQXzJ0z33lOuib/QO8g+CuO0gKBRU80A8hkeJ0b1KRQWmFQVSh8mf3lpUpNaRulzN5NArrmKKGMijXgzk7w5ijdFVgT8f1IdFNjVWjDWicUYWEEMmSFDtILdzHW5XueHp7p+yuS54ep5/c5BE2Gw/gWPNYU4/PZaak2VGEsFjSbOf8irea6KQgojGCk0KxZY31tWWgzwayF8N5KYyo3VADVicWWrhwzr3ZqIOa5xW5zbqMPPMiyDURHDIHQTeWq7KFXcQPOqzPOL5Ov/iIDEDy7DHEwx0PTgjO8SS0fOEHcZNMt+XKEFMj8Q4QUSvPu6HPuvd4N9/x12RPwcIVRCAakSOUzHgsUSMFWYzDQ+PiOJqAOuYc9jh5TecnA+xHfFyOYhebeTH89P80wrCJzUjlsx7euIV0g4zQFUSiBPioIWBACFC7GgDj8P91ZSJOQmQP74MAnQo8H5RIe8kZ0kBcQCMAlEpRDiKROBxbR0ksdhWFq0gR9q9uQzkDzuIFQSPqAgRCAsCaVNF2ZAAhxvtzcqcnDk6tpXxSsayqXLIgSOb6zqeH+fvO0i9XEu5EVV+OZehRZJ6BGTeaRhCkTzVIZeAzaWGAFfErIPogQI5CuR3HQQx7DzBB16R3s7e0MBUPedjWutgG/JUTPqMeAQNEiytJRnJearWUgdwFNxN7rtBoECuj/O3BMHaTIxQ0a4GctireElTJHJvLTaalih5kvBCGMvkdESUMAdCFaI4yG8SpDfRWAptqkAJUwCG6B7lOREFSZBqKs57MEHqVJEBwHa2lp0OiKtiQ18gx9P89QrSXyc0vObBM4vPmBADqJZLAo/yzK7qPSZstCy+fDSZlhrm+Zkyjsf5q2otdC14zkLjHLf0me9wjNqQo0B1a6wBJRaIEgC2Qw9oby/cRHA+xHCQy/xlB1HVSV3Y/5yVhsc7dBi2UoIWCMcbELZWgxNCGUZ5y4ceBaLlE8dAfrEosrYT+z8ya3sxXndFBxuQivNGEHFCbLGBlBLKGYHZoeoQpcjtMn/uICPefcxecpuDOEemg9S/44cflZPIlWolyHkLrEpgbS9IQRlAgZgi0WDjsEiPh+PN/Fkogq4GdzPtarlRGW2tJwEK1RMTEvdVdmhAKHO1pdUuGQsVcX+rSfGzDbwGyE8NRPQc83HCaOkTZwPqABZBdFq8zAN1gue0FPO8wYUFBE1WkMwVzM1iQ4BItFh+H36Qy/yJg0DRQICmBl+tbKUC5cCj3yXI+SUFBS78ZAcBtHt+e9lBuiqpTNh9zTvIjzuIWxVYGQJpAZY+VWS3QKh84iSZbwuIdiDpc4KztQa/sjhMaDJEJDSZ8mZ+kCBdC0JpKVNQzZdKu+EsOeFCosrngVAkDS/uy6iGnW7UxmMpkB8FyFKo6iQW8z1HuBdMu1pdkZdB8jWTjlFtNaiJRYniIDcD+eECMqFLS9ED6DgxzCMKnRD3HYYA2uMCJUh70OK8G0EUnJV8lqe8nj84QdqLhdoJskNlEw1ivajM8LtPBhIeN99LESXI9xcQIHFQudHngZjUhXOQeGlUYmAddh5pxMhzV0M1vMAtMFIVmfp6fq+DgEWefjQVenstaqUy3bJQAiVlEihDghCDINFQg8oUhoQPkO8SBEM7SFQ72VYBwPuE7k8uYF5LNwg/TEd2zkuKjIIhTiJRlYrDfNS1QL7DYUcbcCyKJNwOwucVCVSwBBj/DwghXA2hQtACgCBBPprfXkAIFIYRXhONQARFU00Tsh6LEmmQUbkTImMi9me5qaHDIeBgHeRbdxAIqAJBCDSoCNVQglrciqX/ZCD9RRP6rgpBvhmKAFhg2ForBLXBYPtUjj7vCHPe8SXbYAY47gHB9mKeqjjIg/53fmMD0fR9Bug7SFcHI6EA1OC/E8QTL4NgBSGiCiyTChnI1zcQxmyfRZGM6w701KRybDvsIK3LWDx6mxGkcglEZQLkawnCdppZ6sgCh8trWWBUQaUWCEOlOs7HAenFE45QSu9RQQDAqchXNxDq4orQR44qRIFUQvM+mRJuB6GDEixgCbSBQGXghEEbdn1P/zO/QhAWCsWsmRhLa2VFkSZIgSVKmgEQhvk6K8YKMRZl7Dwg4amOUYvFBfLlE4RasOCB5S9PXKq0AqGDMiYIReXF0mYctITWBmqR5F38X5Y7yJfeCtKBzNbWYm5XpsMpf3dRZD3jPDesvdVCOs6KYQXIFw1E4fcE8dHWOepZBXpLJcACWUZVMRZbfvgXR4Ak8A7VVSKSVuu9p6/mFxyE7cOWavtLp952O8huK83+gmHzHaAsVXLgAvl8gPCvHzAFsM8GNXGKPH5cmN02sXTLa8QdKRXMzHv67/k5A9k1UIx36UH/VlWWtuKssNiRapB6BaLXl6MA+ayDcNS3v/sYXgCL620F1kk8QhKAEOvKu4DvajDO5zkHc4fBg76anyEIIcamBPex5EK8AoVHhMW7QAqWrYD1204CJB1hCfOAV/PTBPH0zBmJmsZZKCEaAmdqm4zMcYxYLN0JuHThIAjirAnp3px7TRgD+ZSD/K92M1CNIgbC8Ex7FkSEIlQEEUQEQQQBRBABEUQQEQTx3X0Evap9AhP39jL5OvuzAWuvbDaTTDIzX2aypUCJ0i7nAigoQAk9gUIUSxXEoCFyyVIuL9ZQcMZoArnwr4D0OLS8jGNGTgGnsZQWMYrcOARoIReAALBeWhf+RUCAIEsECFQHLkwR5zj4JW3t5WOUU5djvgQIawD53EDsctmYz8xGaZGPBUR3qNkiGwqDICUYIFpqBgRaayCfFiAWR2wWvoobmzxdF8N5kyxXmvap/sgGcLF/aoBosbG+lE395R8zCA4BqUYgOgYq+HtvBrT0LK15X8lZwx5f9klCX0rdgXzIIGbdhXMqZtHzJhuptEjmsFc4KzmN5IFPtfM7gWw2kPczSIqQSPUDYKYBMamsBCpKphW0iA5H8AbMDPJOQYjLZg1Vk4G49GlCYNYAkdOd0kwRQ8FCyAHydgLZ6Z2AqrVtjDUQ7hCEmrkEooDAsB2YnBCvkBpZ6yBvJpCd7Mn5zJ6C4QF2BUQPgHEIGUrGnHzQ8rlMekBeTyAzwDJksxwM4+w3BY02B8mIl0CmFRm+ZscxAuSnvwqQsECTIGSV6FEoJFTygVuzB5xAsKqBvAQE3+nkVoJDI1BJIaPBWik7ZSu5NIp5A3mRQaTFvLgkO9fVgEgMqqeVfb+p55tijWH+Kea71ubq4v8Sl8089sZKbKEZNq+VUfISJJF7j79WrbYgS994ZEf+nIz0pNFRWqapSmK6P45i3OQuItIiPDyg6RnxZ4D0g+CFPxAzluoRsWsaA6I6JOqVWCisDvJ0BgHTzMSRgMi0vmi8R+sR6tg/XUh7kCc7kMRqSNkTBDx0OkAUegFcMazciBXNpm798R6klXap/WZz49TQwBHqEcj4oCToUPjUuP9lfxcbyKMAwT6bTf1qqIIQDl3i5oCERNmVm0wgW4A8BGRxMX3hWh8bEV5Rvfp4DS5F3djWH2ztDNWKW7OBjgjIwsDWaKRknJjqMsh9QCa1p608lLovFkBE969DYtYelSzwSRcg535vAsFeNU9SzRCYZb4LDmxmFQKkwYGM+5y/G7b1uxMIylLdyE5yxIyYsoXWhQIpzQhYPi3JkJoKkB9+BxD0OMuyOEBe36DgyPSrxscmATldgKj8PxrkA/kA5PYMgkrocwIQ6GSRGmF0VaNqBKQZ5FYDEZSDzFTzq9mBQjAayE1A+ryDTzcQZe0Ibbxj7EwpAmTrJwEimZR9CCPtODhzxuNtY19Zd2Lf/fjCTnEiDAOg62j1utb/dv9mZ/aHCj4AyOHbsW3/As0BTzIgeJU7AAAAAElFTkSuQmCC');\n  cursor: crosshair;\n  float: left;\n  i {\n    display: block;\n    height: 5px;\n    width: 5px;\n    border: 1px solid #000;\n    .borderRadius(5px);\n    position: absolute;\n    top: 0;\n    left: 0;\n    margin: -4px 0 0 -4px;\n    b {\n      display: block;\n      height: 5px;\n      width: 5px;\n      border: 1px solid #fff;\n      .borderRadius(5px);\n    }\n  }\n}\n\n.colorpicker-hue,\n.colorpicker-alpha {\n  width: 15px;\n  height: 100px;\n  float: left;\n  cursor: row-resize;\n  margin-left: 4px;\n  margin-bottom: 4px;\n}\n\n.colorpicker-hue i,\n.colorpicker-alpha i {\n  display: block;\n  height: 1px;\n  background: #000;\n  border-top: 1px solid #fff;\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 100%;\n  margin-top: -1px;\n}\n\n.colorpicker-hue {\n  .bgImg('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAMAAABw8qpSAAABLFBMVEXqFBb/ABH/ACL/ADH/AEH/AFD/AGD/AG7/AH7/AI3/AJ3/AKz/ALz/AMr/ANv/AOr/APr2AP/mAP/XAP/HAP+4AP+oAP+aAP+JAP97AP9rAP9cAP9MAP8+AP8tAP8fAP8PAP8BAv8AEP8AH/8AL/8APv8ATv8AXP8Abf8Ae/8Ai/8Amv8Aqv8AuP8Ayf8A1/8A5/8A9/8A//gA/+kA/9kA/8oA/7oA/6wA/5sA/40A/30A/24A/14A/1AA/z8A/zEA/yEA/xEB/wMN/wAd/wAs/wA8/wBK/wBb/wBp/wB5/wCI/wCY/wCm/wC3/wDF/wDV/wDk/wD1/wD/+gD/7AD/3AD/zAD/vgD/rQD/nwD/jgD/gAD/cAD/YgD/UQD/QwD/MgD/JAD/FAD4Eg42qAedAAAAh0lEQVR4XgXAg3EDAAAAwI9to7Zt27a1/w49BASFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTS1tHXo1KVbj159+g0YNGTYiFFjxk2YNGXajFlz5i1YtGTZilVr1m3YtGXbjl179h04dOTYiVNnzl24dOXajVt37j149OTZi1dv3n349OXbj19//wOxE1dQ8reGAAAAAElFTkSuQmCC');\n}\n\n.colorpicker-alpha {\n  .bgImg('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABkCAQAAAAVxWkcAAABr0lEQVR4Xo2VwU0DQQxF7dmRuNIFlzlSAR3QAaXQQdIBJVABFXDcOVAAd67cjJLR07dkhcSrkZKfb/t7bG88rFo3B5gZPMNycItu2xloGV7MWHzM9zuzFWCkmA0nK6AszCUJDW6+mG6R03ncw5v8EMTEvZ2O3AliYjpslblc0RF9LmZYWxURU6aKytWZYsoWCAe+xwOZp1GsEukGiIkYxcQCHck99+gRgB7JncyIB5SGEhP3Yh5P6JwX+u6AnYot104d8DJT7uH7M9JH6OZbimj0vfMVaYnJIZFJDBW9kHlerL2C6JV4mSt7uuo2N57RxnZ+usQjn0R1jwBJBrNO3evJpVYUWsJ/E3UiXRlv24/7YZ04xmEdWlzcKS+B/eapeyMvFd2k0+hRk/T0AmTW8h69s2sjYMsdPntECiILhAeIMZAeH4QvUwfn6ijC0tTV+fT9ky8jM9nK2g7Ly1VjSpKYq6IvsAm7MtNu1orEqa/K3KNvgMFdhfquPfJmp2dbh0/8Gzb6Y22ViaNr6n5410zXdngVhbu6XqdOtWOuin5hjABGp4a2uotZ71MVCfwDBt2/v37yo6AAAAAASUVORK5CYII=');\n  display: none;\n}\n\n.colorpicker-saturation,\n.colorpicker-hue,\n.colorpicker-alpha {\n  background-size: contain;\n}\n\n.colorpicker {\n  padding: 4px;\n  min-width: 130px;\n  margin-top: 1px;\n  .borderRadius(4px);\n  z-index: 2500;\n}\n\n.colorpicker:before,\n.colorpicker:after {\n  display: table;\n  content: \"\";\n  line-height: 0;\n}\n\n.colorpicker:after {\n  clear: both;\n}\n\n.colorpicker:before {\n  content: '';\n  display: inline-block;\n  border-left: 7px solid transparent;\n  border-right: 7px solid transparent;\n  border-bottom: 7px solid #ccc;\n  border-bottom-color: rgba(0, 0, 0, 0.2);\n  position: absolute;\n  top: -7px;\n  left: 6px;\n}\n\n.colorpicker:after {\n  content: '';\n  display: inline-block;\n  border-left: 6px solid transparent;\n  border-right: 6px solid transparent;\n  border-bottom: 6px solid #ffffff;\n  position: absolute;\n  top: -6px;\n  left: 7px;\n}\n\n.colorpicker div {\n  position: relative;\n}\n\n.colorpicker.colorpicker-with-alpha {\n  min-width: 140px;\n}\n\n.colorpicker.colorpicker-with-alpha .colorpicker-alpha {\n  display: block;\n}\n\n.colorpicker-color {\n  height: 10px;\n  margin-top: 5px;\n  clear: both;\n  .bgImg('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABkCAQAAAAVxWkcAAABr0lEQVR4Xo2VwU0DQQxF7dmRuNIFlzlSAR3QAaXQQdIBJVABFXDcOVAAd67cjJLR07dkhcSrkZKfb/t7bG88rFo3B5gZPMNycItu2xloGV7MWHzM9zuzFWCkmA0nK6AszCUJDW6+mG6R03ncw5v8EMTEvZ2O3AliYjpslblc0RF9LmZYWxURU6aKytWZYsoWCAe+xwOZp1GsEukGiIkYxcQCHck99+gRgB7JncyIB5SGEhP3Yh5P6JwX+u6AnYot104d8DJT7uH7M9JH6OZbimj0vfMVaYnJIZFJDBW9kHlerL2C6JV4mSt7uuo2N57RxnZ+usQjn0R1jwBJBrNO3evJpVYUWsJ/E3UiXRlv24/7YZ04xmEdWlzcKS+B/eapeyMvFd2k0+hRk/T0AmTW8h69s2sjYMsdPntECiILhAeIMZAeH4QvUwfn6ijC0tTV+fT9ky8jM9nK2g7Ly1VjSpKYq6IvsAm7MtNu1orEqa/K3KNvgMFdhfquPfJmp2dbh0/8Gzb6Y22ViaNr6n5410zXdngVhbu6XqdOtWOuin5hjABGp4a2uotZ71MVCfwDBt2/v37yo6AAAAAASUVORK5CYII=');\n  background-position: 0 100%;\n}\n\n.colorpicker-color div {\n  height: 10px;\n}\n\n.colorpicker-selectors {\n  display: none;\n  height: 10px;\n  margin-top: 5px;\n  clear: both;\n}\n\n.colorpicker-selectors i {\n  cursor: pointer;\n  float: left;\n  height: 10px;\n  width: 10px;\n}\n\n.colorpicker-selectors i + i {\n  margin-left: 3px;\n}\n\n.colorpicker-element .input-group-addon i,\n.colorpicker-element .add-on i {\n  display: inline-block;\n  cursor: pointer;\n  height: 16px;\n  vertical-align: text-top;\n  width: 16px;\n}\n\n.colorpicker.colorpicker-inline {\n  position: relative;\n  display: inline-block;\n  float: none;\n  z-index: auto;\n}\n\n.colorpicker.colorpicker-horizontal {\n  width: 110px;\n  min-width: 110px;\n  height: auto;\n}\n\n.colorpicker.colorpicker-horizontal .colorpicker-saturation {\n  margin-bottom: 4px;\n}\n\n.colorpicker.colorpicker-horizontal .colorpicker-color {\n  width: 100px;\n}\n\n.colorpicker.colorpicker-horizontal .colorpicker-hue,\n.colorpicker.colorpicker-horizontal .colorpicker-alpha {\n  width: 100px;\n  height: 15px;\n  float: left;\n  cursor: col-resize;\n  margin-left: 0px;\n  margin-bottom: 4px;\n}\n\n.colorpicker.colorpicker-horizontal .colorpicker-hue i,\n.colorpicker.colorpicker-horizontal .colorpicker-alpha i {\n  display: block;\n  height: 15px;\n  background: #ffffff;\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 1px;\n  border: none;\n  margin-top: 0px;\n}\n\n.colorpicker.colorpicker-horizontal .colorpicker-hue {\n  .bgImg('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAABCAMAAAAfBfuPAAABLFBMVEXqFBb/ABH/ACL/ADH/AEH/AFD/AGD/AG7/AH7/AI3/AJ3/AKz/ALz/AMr/ANv/AOr/APr2AP/mAP/XAP/HAP+4AP+oAP+aAP+JAP97AP9rAP9cAP9MAP8+AP8tAP8fAP8PAP8BAv8AEP8AH/8AL/8APv8ATv8AXP8Abf8Ae/8Ai/8Amv8Aqv8AuP8Ayf8A1/8A5/8A9/8A//gA/+kA/9kA/8oA/7oA/6wA/5sA/40A/30A/24A/14A/1AA/z8A/zEA/yEA/xEB/wMN/wAd/wAs/wA8/wBK/wBb/wBp/wB5/wCI/wCY/wCm/wC3/wDF/wDV/wDk/wD1/wD/+gD/7AD/3AD/zAD/vgD/rQD/nwD/jgD/gAD/cAD/YgD/UQD/QwD/MgD/JAD/FAD4Eg42qAedAAAAbUlEQVR4XgXAghEDsbxtlrZt27ax/w49ACAYQTGcICmaYTleECVZUTXdMC1Wm93hdLk9Xp8/EAyFI9FYPJFMpTPZXL5QLJUr1Vq90Wy1O91efzAcjSfT2XyxXK03293+cDydL9fb/fF8vT/f3x+LfRNXARMbCAAAAABJRU5ErkJggg==');\n}\n\n.colorpicker.colorpicker-horizontal .colorpicker-alpha {\n  .bgImg('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAKCAQAAADoFTP1AAAB9ElEQVR4XoWTQW4VMRBEu9qWEimL7DhEMp8NF+ASnJJLcAQgE1bcgBUSkYKUuHCrZ9pjeqSU5Yn9LPu7umJQBIIv+k7vIOrtK66L4lmr3pVOrOv3otp619KZ0/KjdNI79L52Uo09FBQWrU0vfe5trezU+hLsoUKd3Repovte+0vbq/7Lj5XbaHECKasR9G4MPlbp+gzZxd6koPEJCkAYC5SjcOTAIIOK90Dja1IfIZ8Z+zAY9jm3b5Ia+MT5sFcqRJrR2AYYA8Kua5BzYRrFPNmD4PQMegGJMOffJJUsWiI3nCHZZjInNdffLWOufzbc3JaboCAVxwmnRHbhLSPwRJ4wU0BRSc6HkECYYVw95nMKgJOcylxrJttE5Ibzf9Xq9GPvP+WX3MiV/MGHfRu/SentRQrfG1GzsIrytdNXucSRKxQNIGHM9YhGFQJcdjNcBZvfJayuYe4Sia1CzwW+19mWOhe37HsxJWKwbu/jluEU15QzAQjAqCEbhMJc78GYV2E0kooHDubUImWkTOhGpgv8PoT8DJG/bzxna4BZ0eOFSOaLADGeSpFsg5AzeaDZIDQQXjZ4y/8ryfzUXBwdELRjTjCNvOeT0rNlrJz90vwy6N9pXXQEluX0inElpPWokSdiLCfiNJJjMKQ8Qsh8GEKQKMo/eiHrNbI9UksAAAAASUVORK5CYII=');\n}\n\n.colorpicker-right:before {\n  left: auto;\n  right: 6px;\n}\n\n.colorpicker-right:after {\n  left: auto;\n  right: 7px;\n}\n\n.colorpicker-no-arrow:before {\n  border-right: 0;\n  border-left: 0;\n}\n\n.colorpicker-no-arrow:after {\n  border-right: 0;\n  border-left: 0;\n}\n\n.colorpicker,\n.colorpicker-alpha,\n.colorpicker-saturation,\n.colorpicker-hue,\n.colorpicker-selectors {\n  &.colorpicker-visible {\n    display: block;\n  }\n}\n\n.colorpicker,\n.colorpicker-alpha,\n.colorpicker-saturation,\n.colorpicker-hue,\n.colorpicker-selectors {\n  &.colorpicker-hidden {\n    display: none;\n  }\n}\n\n.colorpicker-inline.colorpicker-visible {\n  display: inline-block;\n}\n"]}
\ No newline at end of file
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
new file mode 100644
index 000000000..43494ca46
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
@@ -0,0 +1,10 @@
+/*!
+ * Bootstrap Colorpicker v2.5.1
+ * https://itsjavi.com/bootstrap-colorpicker/
+ *
+ * Originally written by (c) 2012 Stefan Petre
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ */.colorpicker-saturation{width:100px;height:100px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAQAAADa613fAAAP9klEQVR4XnRWC47rNgwcKjlA0bv2VL1Qi/YELRav7203iS1ppqZoiXCAhuBHVLI74xFtG3/Hz2joIOjRGuR5eMYuRn9YA1fds859KX8ZvczLr9/pImiR3Rqky9/wlajRIdVE/1Rufeu/0No3/ASgBZAJUkwgi0iCaEatekJJoEqiTQncd67/gyOfRCZshTed0Nl8LbLj8D6qxtoq9/7kJz/aH/3Xfu8VwI5+AUH8DxE7gUyiIpZ5LwiGzUqE3CScJsCDQHAsvBnxWpkbC0QMHmBp6latWS0bnvrCN/x1+xPfce+Ij0GAyeAGGz15sOiax2UylPhKrFaMPnVWClwepKh07hdhkVDsK2uoyEIySergjdbY2VBtV8VLr8Mf9mF/4wMb7kR8FOhzFWZZe7HIZD9JRIbee28eJKBweTB6TwjYkAgWaUmtDveGw1Wx3zZ76YlPPfQd/+gTTUFkiGiJ+NQAszU1EPT/QJEgufolAMPkNU4CVOyUIBLg4xglEZHGQnTFOFV0VaulYddBhA986ge/7N/yQi/3flFgwfQq2ibLnTDBRl9TmUHyJASPV/eoN0UISIr+ICQKIFV4EpljSjV1uFVUq9hRtet5e9gXvuyHPW0zMhQxWaoBBa9Tg8vsCEhww23Smd0CKjIkmPIoxWrUBDgJqFCyESF43ctQxLUoHN7Q1KyVhqrNNm3cy2vMyQNPVKjc29Rh5SSU+giWdRJHkLnQG71FQEuNyNGBTDdBQQAKCuGiEUS/jcyGbkMPq931OIzb/dUPGuVlG7f+slqkO5NAAlzTMdcq0NkzmsEBmAQkbI+pSHbiqnuWIA6lijhvqwIxMyWxMGZiPU669XJE1tADDTs2HWpwKxuqdnTpOiOR42xlzLtm3pXGel3xd8/oTs8Xy0MV8GM1RlsC2Y3Wy3wut3M+2mEVux0Gt9fhzTWyLvGiiJYaqY5DWRFIwAiQ5r6gB9GpQihJw4I9j5Mkscj3BnzGjBhv8xna5P1Jo428o6IOPY5KFZtVOkEKqUjqQY9Gi+jrIOFwJUDzRtA9xyoIrGGmkNRmxVAnZoK+TkUIeUYni5wEzgOG5iZX5HCr2JyQNqdk++G0rgb1ochSIGutTj4P7F0PuRUAolmh5sCzAHn1BYyaADh6bgFeoBx6vst091CEvcSLWBBpqGq384jZ5llVHSwEShLx+D4d0mU3D5eEAJQ9KEhOZUYnDENV2qKgmIlQhWfdvcoXYaegPp/n1oKIOgYFqxrzQSciqNhv/5FqPpy6b0UcX2vf13DfWySRSEgkEYlEJJGQSyKJSEQSCYlEEpHexIVO3XOevffze2a+PfPv9x1rne1c3b3Mmlmz9mE++zuzngfnw/E+Dlc4LL4NwHdFy7u3KGPVmZ6/4eeMoDyre3i/KHADIHYO04w9zO0mAotuKnrc7XaPjvu66bNe5cDT7RlPepEnfS2X8dF1/utDvD+OwGDBxEgQywLCvIMYWBY+DShwAAORAdv9PswhDAqOUCi5+71AbFcDMR4xBDNfhySKXPXZ1+Vub+Q1Ltf5z7eC0AjVldHI26rIFdKIAyYBJCFVUhVDwttAnM52B3Ect1TFQXzJ0z33lOuib/QO8g+CuO0gKBRU80A8hkeJ0b1KRQWmFQVSh8mf3lpUpNaRulzN5NArrmKKGMijXgzk7w5ijdFVgT8f1IdFNjVWjDWicUYWEEMmSFDtILdzHW5XueHp7p+yuS54ep5/c5BE2Gw/gWPNYU4/PZaak2VGEsFjSbOf8irea6KQgojGCk0KxZY31tWWgzwayF8N5KYyo3VADVicWWrhwzr3ZqIOa5xW5zbqMPPMiyDURHDIHQTeWq7KFXcQPOqzPOL5Ov/iIDEDy7DHEwx0PTgjO8SS0fOEHcZNMt+XKEFMj8Q4QUSvPu6HPuvd4N9/x12RPwcIVRCAakSOUzHgsUSMFWYzDQ+PiOJqAOuYc9jh5TecnA+xHfFyOYhebeTH89P80wrCJzUjlsx7euIV0g4zQFUSiBPioIWBACFC7GgDj8P91ZSJOQmQP74MAnQo8H5RIe8kZ0kBcQCMAlEpRDiKROBxbR0ksdhWFq0gR9q9uQzkDzuIFQSPqAgRCAsCaVNF2ZAAhxvtzcqcnDk6tpXxSsayqXLIgSOb6zqeH+fvO0i9XEu5EVV+OZehRZJ6BGTeaRhCkTzVIZeAzaWGAFfErIPogQI5CuR3HQQx7DzBB16R3s7e0MBUPedjWutgG/JUTPqMeAQNEiytJRnJearWUgdwFNxN7rtBoECuj/O3BMHaTIxQ0a4GctireElTJHJvLTaalih5kvBCGMvkdESUMAdCFaI4yG8SpDfRWAptqkAJUwCG6B7lOREFSZBqKs57MEHqVJEBwHa2lp0OiKtiQ18gx9P89QrSXyc0vObBM4vPmBADqJZLAo/yzK7qPSZstCy+fDSZlhrm+Zkyjsf5q2otdC14zkLjHLf0me9wjNqQo0B1a6wBJRaIEgC2Qw9oby/cRHA+xHCQy/xlB1HVSV3Y/5yVhsc7dBi2UoIWCMcbELZWgxNCGUZ5y4ceBaLlE8dAfrEosrYT+z8ya3sxXndFBxuQivNGEHFCbLGBlBLKGYHZoeoQpcjtMn/uICPefcxecpuDOEemg9S/44cflZPIlWolyHkLrEpgbS9IQRlAgZgi0WDjsEiPh+PN/Fkogq4GdzPtarlRGW2tJwEK1RMTEvdVdmhAKHO1pdUuGQsVcX+rSfGzDbwGyE8NRPQc83HCaOkTZwPqABZBdFq8zAN1gue0FPO8wYUFBE1WkMwVzM1iQ4BItFh+H36Qy/yJg0DRQICmBl+tbKUC5cCj3yXI+SUFBS78ZAcBtHt+e9lBuiqpTNh9zTvIjzuIWxVYGQJpAZY+VWS3QKh84iSZbwuIdiDpc4KztQa/sjhMaDJEJDSZ8mZ+kCBdC0JpKVNQzZdKu+EsOeFCosrngVAkDS/uy6iGnW7UxmMpkB8FyFKo6iQW8z1HuBdMu1pdkZdB8jWTjlFtNaiJRYniIDcD+eECMqFLS9ED6DgxzCMKnRD3HYYA2uMCJUh70OK8G0EUnJV8lqe8nj84QdqLhdoJskNlEw1ivajM8LtPBhIeN99LESXI9xcQIHFQudHngZjUhXOQeGlUYmAddh5pxMhzV0M1vMAtMFIVmfp6fq+DgEWefjQVenstaqUy3bJQAiVlEihDghCDINFQg8oUhoQPkO8SBEM7SFQ72VYBwPuE7k8uYF5LNwg/TEd2zkuKjIIhTiJRlYrDfNS1QL7DYUcbcCyKJNwOwucVCVSwBBj/DwghXA2hQtACgCBBPprfXkAIFIYRXhONQARFU00Tsh6LEmmQUbkTImMi9me5qaHDIeBgHeRbdxAIqAJBCDSoCNVQglrciqX/ZCD9RRP6rgpBvhmKAFhg2ForBLXBYPtUjj7vCHPe8SXbYAY47gHB9mKeqjjIg/53fmMD0fR9Bug7SFcHI6EA1OC/E8QTL4NgBSGiCiyTChnI1zcQxmyfRZGM6w701KRybDvsIK3LWDx6mxGkcglEZQLkawnCdppZ6sgCh8trWWBUQaUWCEOlOs7HAenFE45QSu9RQQDAqchXNxDq4orQR44qRIFUQvM+mRJuB6GDEixgCbSBQGXghEEbdn1P/zO/QhAWCsWsmRhLa2VFkSZIgSVKmgEQhvk6K8YKMRZl7Dwg4amOUYvFBfLlE4RasOCB5S9PXKq0AqGDMiYIReXF0mYctITWBmqR5F38X5Y7yJfeCtKBzNbWYm5XpsMpf3dRZD3jPDesvdVCOs6KYQXIFw1E4fcE8dHWOepZBXpLJcACWUZVMRZbfvgXR4Ak8A7VVSKSVuu9p6/mFxyE7cOWavtLp952O8huK83+gmHzHaAsVXLgAvl8gPCvHzAFsM8GNXGKPH5cmN02sXTLa8QdKRXMzHv67/k5A9k1UIx36UH/VlWWtuKssNiRapB6BaLXl6MA+ayDcNS3v/sYXgCL620F1kk8QhKAEOvKu4DvajDO5zkHc4fBg76anyEIIcamBPex5EK8AoVHhMW7QAqWrYD1204CJB1hCfOAV/PTBPH0zBmJmsZZKCEaAmdqm4zMcYxYLN0JuHThIAjirAnp3px7TRgD+ZSD/K92M1CNIgbC8Ex7FkSEIlQEEUQEQQQBRBABEUQQEQTx3X0Evap9AhP39jL5OvuzAWuvbDaTTDIzX2aypUCJ0i7nAigoQAk9gUIUSxXEoCFyyVIuL9ZQcMZoArnwr4D0OLS8jGNGTgGnsZQWMYrcOARoIReAALBeWhf+RUCAIEsECFQHLkwR5zj4JW3t5WOUU5djvgQIawD53EDsctmYz8xGaZGPBUR3qNkiGwqDICUYIFpqBgRaayCfFiAWR2wWvoobmzxdF8N5kyxXmvap/sgGcLF/aoBosbG+lE395R8zCA4BqUYgOgYq+HtvBrT0LK15X8lZwx5f9klCX0rdgXzIIGbdhXMqZtHzJhuptEjmsFc4KzmN5IFPtfM7gWw2kPczSIqQSPUDYKYBMamsBCpKphW0iA5H8AbMDPJOQYjLZg1Vk4G49GlCYNYAkdOd0kwRQ8FCyAHydgLZ6Z2AqrVtjDUQ7hCEmrkEooDAsB2YnBCvkBpZ6yBvJpCd7Mn5zJ6C4QF2BUQPgHEIGUrGnHzQ8rlMekBeTyAzwDJksxwM4+w3BY02B8mIl0CmFRm+ZscxAuSnvwqQsECTIGSV6FEoJFTygVuzB5xAsKqBvAQE3+nkVoJDI1BJIaPBWik7ZSu5NIp5A3mRQaTFvLgkO9fVgEgMqqeVfb+p55tijWH+Kea71ubq4v8Sl8089sZKbKEZNq+VUfISJJF7j79WrbYgS994ZEf+nIz0pNFRWqapSmK6P45i3OQuItIiPDyg6RnxZ4D0g+CFPxAzluoRsWsaA6I6JOqVWCisDvJ0BgHTzMSRgMi0vmi8R+sR6tg/XUh7kCc7kMRqSNkTBDx0OkAUegFcMazciBXNpm798R6klXap/WZz49TQwBHqEcj4oCToUPjUuP9lfxcbyKMAwT6bTf1qqIIQDl3i5oCERNmVm0wgW4A8BGRxMX3hWh8bEV5Rvfp4DS5F3djWH2ztDNWKW7OBjgjIwsDWaKRknJjqMsh9QCa1p608lLovFkBE969DYtYelSzwSRcg535vAsFeNU9SzRCYZb4LDmxmFQKkwYGM+5y/G7b1uxMIylLdyE5yxIyYsoXWhQIpzQhYPi3JkJoKkB9+BxD0OMuyOEBe36DgyPSrxscmATldgKj8PxrkA/kA5PYMgkrocwIQ6GSRGmF0VaNqBKQZ5FYDEZSDzFTzq9mBQjAayE1A+ryDTzcQZe0Ibbxj7EwpAmTrJwEimZR9CCPtODhzxuNtY19Zd2Lf/fjCTnEiDAOg62j1utb/dv9mZ/aHCj4AyOHbsW3/As0BTzIgeJU7AAAAAElFTkSuQmCC);cursor:crosshair;float:left}.colorpicker-saturation i{display:block;height:5px;width:5px;border:1px solid #000;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:absolute;top:0;left:0;margin:-4px 0 0 -4px}.colorpicker-saturation i b{display:block;height:5px;width:5px;border:1px solid #fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.colorpicker-alpha,.colorpicker-hue{width:15px;height:100px;float:left;cursor:row-resize;margin-left:4px;margin-bottom:4px}.colorpicker-alpha i,.colorpicker-hue i{display:block;height:1px;background:#000;border-top:1px solid #fff;position:absolute;top:0;left:0;width:100%;margin-top:-1px}.colorpicker-hue{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAMAAABw8qpSAAABLFBMVEXqFBb/ABH/ACL/ADH/AEH/AFD/AGD/AG7/AH7/AI3/AJ3/AKz/ALz/AMr/ANv/AOr/APr2AP/mAP/XAP/HAP+4AP+oAP+aAP+JAP97AP9rAP9cAP9MAP8+AP8tAP8fAP8PAP8BAv8AEP8AH/8AL/8APv8ATv8AXP8Abf8Ae/8Ai/8Amv8Aqv8AuP8Ayf8A1/8A5/8A9/8A//gA/+kA/9kA/8oA/7oA/6wA/5sA/40A/30A/24A/14A/1AA/z8A/zEA/yEA/xEB/wMN/wAd/wAs/wA8/wBK/wBb/wBp/wB5/wCI/wCY/wCm/wC3/wDF/wDV/wDk/wD1/wD/+gD/7AD/3AD/zAD/vgD/rQD/nwD/jgD/gAD/cAD/YgD/UQD/QwD/MgD/JAD/FAD4Eg42qAedAAAAh0lEQVR4XgXAg3EDAAAAwI9to7Zt27a1/w49BASFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTS1tHXo1KVbj159+g0YNGTYiFFjxk2YNGXajFlz5i1YtGTZilVr1m3YtGXbjl179h04dOTYiVNnzl24dOXajVt37j149OTZi1dv3n349OXbj19//wOxE1dQ8reGAAAAAElFTkSuQmCC)}.colorpicker-alpha{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABkCAQAAAAVxWkcAAABr0lEQVR4Xo2VwU0DQQxF7dmRuNIFlzlSAR3QAaXQQdIBJVABFXDcOVAAd67cjJLR07dkhcSrkZKfb/t7bG88rFo3B5gZPMNycItu2xloGV7MWHzM9zuzFWCkmA0nK6AszCUJDW6+mG6R03ncw5v8EMTEvZ2O3AliYjpslblc0RF9LmZYWxURU6aKytWZYsoWCAe+xwOZp1GsEukGiIkYxcQCHck99+gRgB7JncyIB5SGEhP3Yh5P6JwX+u6AnYot104d8DJT7uH7M9JH6OZbimj0vfMVaYnJIZFJDBW9kHlerL2C6JV4mSt7uuo2N57RxnZ+usQjn0R1jwBJBrNO3evJpVYUWsJ/E3UiXRlv24/7YZ04xmEdWlzcKS+B/eapeyMvFd2k0+hRk/T0AmTW8h69s2sjYMsdPntECiILhAeIMZAeH4QvUwfn6ijC0tTV+fT9ky8jM9nK2g7Ly1VjSpKYq6IvsAm7MtNu1orEqa/K3KNvgMFdhfquPfJmp2dbh0/8Gzb6Y22ViaNr6n5410zXdngVhbu6XqdOtWOuin5hjABGp4a2uotZ71MVCfwDBt2/v37yo6AAAAAASUVORK5CYII=);display:none}.colorpicker-alpha,.colorpicker-hue,.colorpicker-saturation{background-size:contain}.colorpicker{padding:4px;min-width:130px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;z-index:2500}.colorpicker:after,.colorpicker:before{display:table;content:"";line-height:0}.colorpicker:after{clear:both}.colorpicker:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:6px}.colorpicker:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.colorpicker div{position:relative}.colorpicker.colorpicker-with-alpha{min-width:140px}.colorpicker.colorpicker-with-alpha .colorpicker-alpha{display:block}.colorpicker-color{height:10px;margin-top:5px;clear:both;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABkCAQAAAAVxWkcAAABr0lEQVR4Xo2VwU0DQQxF7dmRuNIFlzlSAR3QAaXQQdIBJVABFXDcOVAAd67cjJLR07dkhcSrkZKfb/t7bG88rFo3B5gZPMNycItu2xloGV7MWHzM9zuzFWCkmA0nK6AszCUJDW6+mG6R03ncw5v8EMTEvZ2O3AliYjpslblc0RF9LmZYWxURU6aKytWZYsoWCAe+xwOZp1GsEukGiIkYxcQCHck99+gRgB7JncyIB5SGEhP3Yh5P6JwX+u6AnYot104d8DJT7uH7M9JH6OZbimj0vfMVaYnJIZFJDBW9kHlerL2C6JV4mSt7uuo2N57RxnZ+usQjn0R1jwBJBrNO3evJpVYUWsJ/E3UiXRlv24/7YZ04xmEdWlzcKS+B/eapeyMvFd2k0+hRk/T0AmTW8h69s2sjYMsdPntECiILhAeIMZAeH4QvUwfn6ijC0tTV+fT9ky8jM9nK2g7Ly1VjSpKYq6IvsAm7MtNu1orEqa/K3KNvgMFdhfquPfJmp2dbh0/8Gzb6Y22ViaNr6n5410zXdngVhbu6XqdOtWOuin5hjABGp4a2uotZ71MVCfwDBt2/v37yo6AAAAAASUVORK5CYII=);background-position:0 100%}.colorpicker-color div{height:10px}.colorpicker-selectors{display:none;height:10px;margin-top:5px;clear:both}.colorpicker-selectors i{cursor:pointer;float:left;height:10px;width:10px}.colorpicker-selectors i+i{margin-left:3px}.colorpicker-element .add-on i,.colorpicker-element .input-group-addon i{display:inline-block;cursor:pointer;height:16px;vertical-align:text-top;width:16px}.colorpicker.colorpicker-inline{position:relative;display:inline-block;float:none;z-index:auto}.colorpicker.colorpicker-horizontal{width:110px;min-width:110px;height:auto}.colorpicker.colorpicker-horizontal .colorpicker-saturation{margin-bottom:4px}.colorpicker.colorpicker-horizontal .colorpicker-color{width:100px}.colorpicker.colorpicker-horizontal .colorpicker-alpha,.colorpicker.colorpicker-horizontal .colorpicker-hue{width:100px;height:15px;float:left;cursor:col-resize;margin-left:0;margin-bottom:4px}.colorpicker.colorpicker-horizontal .colorpicker-alpha i,.colorpicker.colorpicker-horizontal .colorpicker-hue i{display:block;height:15px;background:#fff;position:absolute;top:0;left:0;width:1px;border:none;margin-top:0}.colorpicker.colorpicker-horizontal .colorpicker-hue{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAABCAMAAAAfBfuPAAABLFBMVEXqFBb/ABH/ACL/ADH/AEH/AFD/AGD/AG7/AH7/AI3/AJ3/AKz/ALz/AMr/ANv/AOr/APr2AP/mAP/XAP/HAP+4AP+oAP+aAP+JAP97AP9rAP9cAP9MAP8+AP8tAP8fAP8PAP8BAv8AEP8AH/8AL/8APv8ATv8AXP8Abf8Ae/8Ai/8Amv8Aqv8AuP8Ayf8A1/8A5/8A9/8A//gA/+kA/9kA/8oA/7oA/6wA/5sA/40A/30A/24A/14A/1AA/z8A/zEA/yEA/xEB/wMN/wAd/wAs/wA8/wBK/wBb/wBp/wB5/wCI/wCY/wCm/wC3/wDF/wDV/wDk/wD1/wD/+gD/7AD/3AD/zAD/vgD/rQD/nwD/jgD/gAD/cAD/YgD/UQD/QwD/MgD/JAD/FAD4Eg42qAedAAAAbUlEQVR4XgXAghEDsbxtlrZt27ax/w49ACAYQTGcICmaYTleECVZUTXdMC1Wm93hdLk9Xp8/EAyFI9FYPJFMpTPZXL5QLJUr1Vq90Wy1O91efzAcjSfT2XyxXK03293+cDydL9fb/fF8vT/f3x+LfRNXARMbCAAAAABJRU5ErkJggg==)}.colorpicker.colorpicker-horizontal .colorpicker-alpha{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAKCAQAAADoFTP1AAAB9ElEQVR4XoWTQW4VMRBEu9qWEimL7DhEMp8NF+ASnJJLcAQgE1bcgBUSkYKUuHCrZ9pjeqSU5Yn9LPu7umJQBIIv+k7vIOrtK66L4lmr3pVOrOv3otp619KZ0/KjdNI79L52Uo09FBQWrU0vfe5trezU+hLsoUKd3Repovte+0vbq/7Lj5XbaHECKasR9G4MPlbp+gzZxd6koPEJCkAYC5SjcOTAIIOK90Dja1IfIZ8Z+zAY9jm3b5Ia+MT5sFcqRJrR2AYYA8Kua5BzYRrFPNmD4PQMegGJMOffJJUsWiI3nCHZZjInNdffLWOufzbc3JaboCAVxwmnRHbhLSPwRJ4wU0BRSc6HkECYYVw95nMKgJOcylxrJttE5Ibzf9Xq9GPvP+WX3MiV/MGHfRu/SentRQrfG1GzsIrytdNXucSRKxQNIGHM9YhGFQJcdjNcBZvfJayuYe4Sia1CzwW+19mWOhe37HsxJWKwbu/jluEU15QzAQjAqCEbhMJc78GYV2E0kooHDubUImWkTOhGpgv8PoT8DJG/bzxna4BZ0eOFSOaLADGeSpFsg5AzeaDZIDQQXjZ4y/8ryfzUXBwdELRjTjCNvOeT0rNlrJz90vwy6N9pXXQEluX0inElpPWokSdiLCfiNJJjMKQ8Qsh8GEKQKMo/eiHrNbI9UksAAAAASUVORK5CYII=)}.colorpicker-right:before{left:auto;right:6px}.colorpicker-right:after{left:auto;right:7px}.colorpicker-no-arrow:before{border-right:0;border-left:0}.colorpicker-no-arrow:after{border-right:0;border-left:0}.colorpicker-alpha.colorpicker-visible,.colorpicker-hue.colorpicker-visible,.colorpicker-saturation.colorpicker-visible,.colorpicker-selectors.colorpicker-visible,.colorpicker.colorpicker-visible{display:block}.colorpicker-alpha.colorpicker-hidden,.colorpicker-hue.colorpicker-hidden,.colorpicker-saturation.colorpicker-hidden,.colorpicker-selectors.colorpicker-hidden,.colorpicker.colorpicker-hidden{display:none}.colorpicker-inline.colorpicker-visible{display:inline-block}
+/*# sourceMappingURL=bootstrap-colorpicker.min.css.map */
\ No newline at end of file
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map
new file mode 100644
index 000000000..82c3ed06a
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["src/less/colorpicker.less"],"names":[],"mappings":";;;;;;;;AAoBA,wBACE,MAAA,MACA,OAAA,MAXA,iBAAsB,g7KAatB,OAAA,UACA,MAAA,KACA,0BACE,QAAA,MACA,OAAA,IACA,MAAA,IACA,OAAA,IAAA,MAAA,KAfF,sBAAA,IACA,mBAAA,IACA,cAAA,IAeE,SAAA,SACA,IAAA,EACA,KAAA,EACA,OAAA,KAAA,EAAA,EAAA,KACA,4BACE,QAAA,MACA,OAAA,IACA,MAAA,IACA,OAAA,IAAA,MAAA,KAzBJ,sBAAA,IACA,mBAAA,IACA,cAAA,IA8BF,mBADA,iBAEE,MAAA,KACA,OAAA,MACA,MAAA,KACA,OAAA,WACA,YAAA,IACA,cAAA,IAIiB,qBADF,mBAEf,QAAA,MACA,OAAA,IACA,WAAA,KACA,WAAA,IAAA,MAAA,KACA,SAAA,SACA,IAAA,EACA,KAAA,EACA,MAAA,KACA,WAAA,KAGF,iBA1DE,iBAAsB,4rBA8DxB,mBA9DE,iBAAsB,wqBAgEtB,QAAA,KAKF,mBADA,iBADA,wBAGE,gBAAA,QAGF,aACE,QAAA,IACA,UAAA,MACA,WAAA,IAxEA,sBAAA,IACA,mBAAA,IACA,cAAA,IAwEA,QAAA,KAIU,mBADA,oBAEV,QAAA,MACA,QAAA,GACA,YAAA,EAGU,mBACV,MAAA,KAGU,oBACV,QAAA,GACA,QAAA,aACA,YAAA,IAAA,MAAA,YACA,aAAA,IAAA,MAAA,YACA,cAAA,IAAA,MAAA,KACA,oBAAA,eACA,SAAA,SACA,IAAA,KACA,KAAA,IAGU,mBACV,QAAA,GACA,QAAA,aACA,YAAA,IAAA,MAAA,YACA,aAAA,IAAA,MAAA,YACA,cAAA,IAAA,MAAA,KACA,SAAA,SACA,IAAA,KACA,KAAA,IAGW,iBACX,SAAA,SAGU,oCACV,UAAA,MAGkC,uDAClC,QAAA,MAGF,mBACE,OAAA,KACA,WAAA,IACA,MAAA,KAlIA,iBAAsB,wqBAoItB,oBAAA,EAAA,KAGiB,uBACjB,OAAA,KAGF,uBACE,QAAA,KACA,OAAA,KACA,WAAA,IACA,MAAA,KAGqB,yBACrB,OAAA,QACA,MAAA,KACA,OAAA,KACA,MAAA,KAGuB,2BACvB,YAAA,IAI2B,+BADW,0CAEtC,QAAA,aACA,OAAA,QACA,OAAA,KACA,eAAA,SACA,MAAA,KAGU,gCACV,SAAA,SACA,QAAA,aACA,MAAA,KACA,QAAA,KAGU,oCACV,MAAA,MACA,UAAA,MACA,OAAA,KAGkC,4DAClC,cAAA,IAGkC,uDAClC,MAAA,MAIkC,uDADA,qDAElC,MAAA,MACA,OAAA,KACA,MAAA,KACA,OAAA,WACA,YAAA,EACA,cAAA,IAIqD,yDADF,uDAEnD,QAAA,MACA,OAAA,KACA,WAAA,KACA,SAAA,SACA,IAAA,EACA,KAAA,EACA,MAAA,IACA,OAAA,KACA,WAAA,EAGkC,qDAlNlC,iBAAsB,4pBAsNY,uDAtNlC,iBAAsB,owBA0NN,0BAChB,KAAA,KACA,MAAA,IAGgB,yBAChB,KAAA,KACA,MAAA,IAGmB,6BACnB,aAAA,EACA,YAAA,EAGmB,4BACnB,aAAA,EACA,YAAA,EAQC,uCAAA,qCAAA,4CAAA,2CAAA,iCACC,QAAA,MASD,sCAAA,oCAAA,2CAAA,0CAAA,gCACC,QAAA,KAIe,wCACjB,QAAA"}
\ No newline at end of file
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
new file mode 100644
index 000000000..f83188951
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
new file mode 100644
index 000000000..2e53a30e7
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
new file mode 100644
index 000000000..3dcd5946a
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
new file mode 100644
index 000000000..6f5ec2e50
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
new file mode 100644
index 000000000..170841cba
Binary files /dev/null and b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png differ
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/js/bootstrap-colorpicker.js b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/js/bootstrap-colorpicker.js
new file mode 100644
index 000000000..b2cdf560c
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/js/bootstrap-colorpicker.js
@@ -0,0 +1,1325 @@
+/*!
+ * Bootstrap Colorpicker v2.5.1
+ * https://itsjavi.com/bootstrap-colorpicker/
+ *
+ * Originally written by (c) 2012 Stefan Petre
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module unless amdModuleId is set
+    define(["jquery"], function(jq) {
+      return (factory(jq));
+    });
+  } else if (typeof exports === 'object') {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    module.exports = factory(require("jquery"));
+  } else if (jQuery && !jQuery.fn.colorpicker) {
+    factory(jQuery);
+  }
+}(this, function($) {
+  'use strict';
+  /**
+   * Color manipulation helper class
+   *
+   * @param {Object|String} [val]
+   * @param {Object} [predefinedColors]
+   * @param {String|null} [fallbackColor]
+   * @param {String|null} [fallbackFormat]
+   * @param {Boolean} [hexNumberSignPrefix]
+   * @constructor
+   */
+  var Color = function(
+    val, predefinedColors, fallbackColor, fallbackFormat, hexNumberSignPrefix) {
+    this.fallbackValue = fallbackColor ?
+      (
+        fallbackColor && (typeof fallbackColor.h !== 'undefined') ?
+        fallbackColor :
+        this.value = {
+          h: 0,
+          s: 0,
+          b: 0,
+          a: 1
+        }
+      ) :
+      null;
+
+    this.fallbackFormat = fallbackFormat ? fallbackFormat : 'rgba';
+
+    this.hexNumberSignPrefix = hexNumberSignPrefix === true;
+
+    this.value = this.fallbackValue;
+
+    this.origFormat = null; // original string format
+
+    this.predefinedColors = predefinedColors ? predefinedColors : {};
+
+    // We don't want to share aliases across instances so we extend new object
+    this.colors = $.extend({}, Color.webColors, this.predefinedColors);
+
+    if (val) {
+      if (typeof val.h !== 'undefined') {
+        this.value = val;
+      } else {
+        this.setColor(String(val));
+      }
+    }
+
+    if (!this.value) {
+      // Initial value is always black if no arguments are passed or val is empty
+      this.value = {
+        h: 0,
+        s: 0,
+        b: 0,
+        a: 1
+      };
+    }
+  };
+
+  Color.webColors = { // 140 predefined colors from the HTML Colors spec
+    "aliceblue": "f0f8ff",
+    "antiquewhite": "faebd7",
+    "aqua": "00ffff",
+    "aquamarine": "7fffd4",
+    "azure": "f0ffff",
+    "beige": "f5f5dc",
+    "bisque": "ffe4c4",
+    "black": "000000",
+    "blanchedalmond": "ffebcd",
+    "blue": "0000ff",
+    "blueviolet": "8a2be2",
+    "brown": "a52a2a",
+    "burlywood": "deb887",
+    "cadetblue": "5f9ea0",
+    "chartreuse": "7fff00",
+    "chocolate": "d2691e",
+    "coral": "ff7f50",
+    "cornflowerblue": "6495ed",
+    "cornsilk": "fff8dc",
+    "crimson": "dc143c",
+    "cyan": "00ffff",
+    "darkblue": "00008b",
+    "darkcyan": "008b8b",
+    "darkgoldenrod": "b8860b",
+    "darkgray": "a9a9a9",
+    "darkgreen": "006400",
+    "darkkhaki": "bdb76b",
+    "darkmagenta": "8b008b",
+    "darkolivegreen": "556b2f",
+    "darkorange": "ff8c00",
+    "darkorchid": "9932cc",
+    "darkred": "8b0000",
+    "darksalmon": "e9967a",
+    "darkseagreen": "8fbc8f",
+    "darkslateblue": "483d8b",
+    "darkslategray": "2f4f4f",
+    "darkturquoise": "00ced1",
+    "darkviolet": "9400d3",
+    "deeppink": "ff1493",
+    "deepskyblue": "00bfff",
+    "dimgray": "696969",
+    "dodgerblue": "1e90ff",
+    "firebrick": "b22222",
+    "floralwhite": "fffaf0",
+    "forestgreen": "228b22",
+    "fuchsia": "ff00ff",
+    "gainsboro": "dcdcdc",
+    "ghostwhite": "f8f8ff",
+    "gold": "ffd700",
+    "goldenrod": "daa520",
+    "gray": "808080",
+    "green": "008000",
+    "greenyellow": "adff2f",
+    "honeydew": "f0fff0",
+    "hotpink": "ff69b4",
+    "indianred": "cd5c5c",
+    "indigo": "4b0082",
+    "ivory": "fffff0",
+    "khaki": "f0e68c",
+    "lavender": "e6e6fa",
+    "lavenderblush": "fff0f5",
+    "lawngreen": "7cfc00",
+    "lemonchiffon": "fffacd",
+    "lightblue": "add8e6",
+    "lightcoral": "f08080",
+    "lightcyan": "e0ffff",
+    "lightgoldenrodyellow": "fafad2",
+    "lightgrey": "d3d3d3",
+    "lightgreen": "90ee90",
+    "lightpink": "ffb6c1",
+    "lightsalmon": "ffa07a",
+    "lightseagreen": "20b2aa",
+    "lightskyblue": "87cefa",
+    "lightslategray": "778899",
+    "lightsteelblue": "b0c4de",
+    "lightyellow": "ffffe0",
+    "lime": "00ff00",
+    "limegreen": "32cd32",
+    "linen": "faf0e6",
+    "magenta": "ff00ff",
+    "maroon": "800000",
+    "mediumaquamarine": "66cdaa",
+    "mediumblue": "0000cd",
+    "mediumorchid": "ba55d3",
+    "mediumpurple": "9370d8",
+    "mediumseagreen": "3cb371",
+    "mediumslateblue": "7b68ee",
+    "mediumspringgreen": "00fa9a",
+    "mediumturquoise": "48d1cc",
+    "mediumvioletred": "c71585",
+    "midnightblue": "191970",
+    "mintcream": "f5fffa",
+    "mistyrose": "ffe4e1",
+    "moccasin": "ffe4b5",
+    "navajowhite": "ffdead",
+    "navy": "000080",
+    "oldlace": "fdf5e6",
+    "olive": "808000",
+    "olivedrab": "6b8e23",
+    "orange": "ffa500",
+    "orangered": "ff4500",
+    "orchid": "da70d6",
+    "palegoldenrod": "eee8aa",
+    "palegreen": "98fb98",
+    "paleturquoise": "afeeee",
+    "palevioletred": "d87093",
+    "papayawhip": "ffefd5",
+    "peachpuff": "ffdab9",
+    "peru": "cd853f",
+    "pink": "ffc0cb",
+    "plum": "dda0dd",
+    "powderblue": "b0e0e6",
+    "purple": "800080",
+    "red": "ff0000",
+    "rosybrown": "bc8f8f",
+    "royalblue": "4169e1",
+    "saddlebrown": "8b4513",
+    "salmon": "fa8072",
+    "sandybrown": "f4a460",
+    "seagreen": "2e8b57",
+    "seashell": "fff5ee",
+    "sienna": "a0522d",
+    "silver": "c0c0c0",
+    "skyblue": "87ceeb",
+    "slateblue": "6a5acd",
+    "slategray": "708090",
+    "snow": "fffafa",
+    "springgreen": "00ff7f",
+    "steelblue": "4682b4",
+    "tan": "d2b48c",
+    "teal": "008080",
+    "thistle": "d8bfd8",
+    "tomato": "ff6347",
+    "turquoise": "40e0d0",
+    "violet": "ee82ee",
+    "wheat": "f5deb3",
+    "white": "ffffff",
+    "whitesmoke": "f5f5f5",
+    "yellow": "ffff00",
+    "yellowgreen": "9acd32",
+    "transparent": "transparent"
+  };
+
+  Color.prototype = {
+    constructor: Color,
+    colors: {}, // merged web and predefined colors
+    predefinedColors: {},
+    /**
+     * @return {Object}
+     */
+    getValue: function() {
+      return this.value;
+    },
+    /**
+     * @param {Object} val
+     */
+    setValue: function(val) {
+      this.value = val;
+    },
+    _sanitizeNumber: function(val) {
+      if (typeof val === 'number') {
+        return val;
+      }
+      if (isNaN(val) || (val === null) || (val === '') || (val === undefined)) {
+        return 1;
+      }
+      if (val === '') {
+        return 0;
+      }
+      if (typeof val.toLowerCase !== 'undefined') {
+        if (val.match(/^\./)) {
+          val = "0" + val;
+        }
+        return Math.ceil(parseFloat(val) * 100) / 100;
+      }
+      return 1;
+    },
+    isTransparent: function(strVal) {
+      if (!strVal || !(typeof strVal === 'string' || strVal instanceof String)) {
+        return false;
+      }
+      strVal = strVal.toLowerCase().trim();
+      return (strVal === 'transparent') || (strVal.match(/#?00000000/)) || (strVal.match(/(rgba|hsla)\(0,0,0,0?\.?0\)/));
+    },
+    rgbaIsTransparent: function(rgba) {
+      return ((rgba.r === 0) && (rgba.g === 0) && (rgba.b === 0) && (rgba.a === 0));
+    },
+    // parse a string to HSB
+    /**
+     * @protected
+     * @param {String} strVal
+     * @returns {boolean} Returns true if it could be parsed, false otherwise
+     */
+    setColor: function(strVal) {
+      strVal = strVal.toLowerCase().trim();
+      if (strVal) {
+        if (this.isTransparent(strVal)) {
+          this.value = {
+            h: 0,
+            s: 0,
+            b: 0,
+            a: 0
+          };
+          return true;
+        } else {
+          var parsedColor = this.parse(strVal);
+          if (parsedColor) {
+            this.value = this.value = {
+              h: parsedColor.h,
+              s: parsedColor.s,
+              b: parsedColor.b,
+              a: parsedColor.a
+            };
+            if (!this.origFormat) {
+              this.origFormat = parsedColor.format;
+            }
+          } else if (this.fallbackValue) {
+            // if parser fails, defaults to fallbackValue if defined, otherwise the value won't be changed
+            this.value = this.fallbackValue;
+          }
+        }
+      }
+      return false;
+    },
+    setHue: function(h) {
+      this.value.h = 1 - h;
+    },
+    setSaturation: function(s) {
+      this.value.s = s;
+    },
+    setBrightness: function(b) {
+      this.value.b = 1 - b;
+    },
+    setAlpha: function(a) {
+      this.value.a = Math.round((parseInt((1 - a) * 100, 10) / 100) * 100) / 100;
+    },
+    toRGB: function(h, s, b, a) {
+      if (arguments.length === 0) {
+        h = this.value.h;
+        s = this.value.s;
+        b = this.value.b;
+        a = this.value.a;
+      }
+
+      h *= 360;
+      var R, G, B, X, C;
+      h = (h % 360) / 60;
+      C = b * s;
+      X = C * (1 - Math.abs(h % 2 - 1));
+      R = G = B = b - C;
+
+      h = ~~h;
+      R += [C, X, 0, 0, X, C][h];
+      G += [X, C, C, X, 0, 0][h];
+      B += [0, 0, X, C, C, X][h];
+
+      return {
+        r: Math.round(R * 255),
+        g: Math.round(G * 255),
+        b: Math.round(B * 255),
+        a: a
+      };
+    },
+    toHex: function(ignoreFormat, h, s, b, a) {
+      if (arguments.length <= 1) {
+        h = this.value.h;
+        s = this.value.s;
+        b = this.value.b;
+        a = this.value.a;
+      }
+
+      var prefix = '#';
+      var rgb = this.toRGB(h, s, b, a);
+
+      if (this.rgbaIsTransparent(rgb)) {
+        return 'transparent';
+      }
+
+      if (!ignoreFormat) {
+        prefix = (this.hexNumberSignPrefix ? '#' : '');
+      }
+
+      var hexStr = prefix + (
+          (1 << 24) +
+          (parseInt(rgb.r) << 16) +
+          (parseInt(rgb.g) << 8) +
+          parseInt(rgb.b))
+        .toString(16)
+        .slice(1);
+
+      return hexStr;
+    },
+    toHSL: function(h, s, b, a) {
+      if (arguments.length === 0) {
+        h = this.value.h;
+        s = this.value.s;
+        b = this.value.b;
+        a = this.value.a;
+      }
+
+      var H = h,
+        L = (2 - s) * b,
+        S = s * b;
+      if (L > 0 && L <= 1) {
+        S /= L;
+      } else {
+        S /= 2 - L;
+      }
+      L /= 2;
+      if (S > 1) {
+        S = 1;
+      }
+      return {
+        h: isNaN(H) ? 0 : H,
+        s: isNaN(S) ? 0 : S,
+        l: isNaN(L) ? 0 : L,
+        a: isNaN(a) ? 0 : a
+      };
+    },
+    toAlias: function(r, g, b, a) {
+      var c, rgb = (arguments.length === 0) ? this.toHex(true) : this.toHex(true, r, g, b, a);
+
+      // support predef. colors in non-hex format too, as defined in the alias itself
+      var original = this.origFormat === 'alias' ? rgb : this.toString(false, this.origFormat);
+
+      for (var alias in this.colors) {
+        c = this.colors[alias].toLowerCase().trim();
+        if ((c === rgb) || (c === original)) {
+          return alias;
+        }
+      }
+      return false;
+    },
+    RGBtoHSB: function(r, g, b, a) {
+      r /= 255;
+      g /= 255;
+      b /= 255;
+
+      var H, S, V, C;
+      V = Math.max(r, g, b);
+      C = V - Math.min(r, g, b);
+      H = (C === 0 ? null :
+        V === r ? (g - b) / C :
+        V === g ? (b - r) / C + 2 :
+        (r - g) / C + 4
+      );
+      H = ((H + 360) % 6) * 60 / 360;
+      S = C === 0 ? 0 : C / V;
+      return {
+        h: this._sanitizeNumber(H),
+        s: S,
+        b: V,
+        a: this._sanitizeNumber(a)
+      };
+    },
+    HueToRGB: function(p, q, h) {
+      if (h < 0) {
+        h += 1;
+      } else if (h > 1) {
+        h -= 1;
+      }
+      if ((h * 6) < 1) {
+        return p + (q - p) * h * 6;
+      } else if ((h * 2) < 1) {
+        return q;
+      } else if ((h * 3) < 2) {
+        return p + (q - p) * ((2 / 3) - h) * 6;
+      } else {
+        return p;
+      }
+    },
+    HSLtoRGB: function(h, s, l, a) {
+      if (s < 0) {
+        s = 0;
+      }
+      var q;
+      if (l <= 0.5) {
+        q = l * (1 + s);
+      } else {
+        q = l + s - (l * s);
+      }
+
+      var p = 2 * l - q;
+
+      var tr = h + (1 / 3);
+      var tg = h;
+      var tb = h - (1 / 3);
+
+      var r = Math.round(this.HueToRGB(p, q, tr) * 255);
+      var g = Math.round(this.HueToRGB(p, q, tg) * 255);
+      var b = Math.round(this.HueToRGB(p, q, tb) * 255);
+      return [r, g, b, this._sanitizeNumber(a)];
+    },
+    /**
+     * @param {String} strVal
+     * @returns {Object} Object containing h,s,b,a,format properties or FALSE if failed to parse
+     */
+    parse: function(strVal) {
+      if (arguments.length === 0) {
+        return false;
+      }
+
+      var that = this,
+        result = false,
+        isAlias = (typeof this.colors[strVal] !== 'undefined'),
+        values, format;
+
+      if (isAlias) {
+        strVal = this.colors[strVal].toLowerCase().trim();
+      }
+
+      $.each(this.stringParsers, function(i, parser) {
+        var match = parser.re.exec(strVal);
+        values = match && parser.parse.apply(that, [match]);
+        if (values) {
+          result = {};
+          format = (isAlias ? 'alias' : (parser.format ? parser.format : that.getValidFallbackFormat()));
+          if (format.match(/hsla?/)) {
+            result = that.RGBtoHSB.apply(that, that.HSLtoRGB.apply(that, values));
+          } else {
+            result = that.RGBtoHSB.apply(that, values);
+          }
+          if (result instanceof Object) {
+            result.format = format;
+          }
+          return false; // stop iterating
+        }
+        return true;
+      });
+      return result;
+    },
+    getValidFallbackFormat: function() {
+      var formats = [
+        'rgba', 'rgb', 'hex', 'hsla', 'hsl'
+      ];
+      if (this.origFormat && (formats.indexOf(this.origFormat) !== -1)) {
+        return this.origFormat;
+      }
+      if (this.fallbackFormat && (formats.indexOf(this.fallbackFormat) !== -1)) {
+        return this.fallbackFormat;
+      }
+
+      return 'rgba'; // By default, return a format that will not lose the alpha info
+    },
+    /**
+     *
+     * @param {string} [format] (default: rgba)
+     * @param {boolean} [translateAlias] Return real color for pre-defined (non-standard) aliases (default: false)
+     * @param {boolean} [forceRawValue] Forces hashtag prefix when getting hex color (default: false)
+     * @returns {String}
+     */
+    toString: function(forceRawValue, format, translateAlias) {
+      format = format || this.origFormat || this.fallbackFormat;
+      translateAlias = translateAlias || false;
+
+      var c = false;
+
+      switch (format) {
+        case 'rgb':
+          {
+            c = this.toRGB();
+            if (this.rgbaIsTransparent(c)) {
+              return 'transparent';
+            }
+            return 'rgb(' + c.r + ',' + c.g + ',' + c.b + ')';
+          }
+          break;
+        case 'rgba':
+          {
+            c = this.toRGB();
+            return 'rgba(' + c.r + ',' + c.g + ',' + c.b + ',' + c.a + ')';
+          }
+          break;
+        case 'hsl':
+          {
+            c = this.toHSL();
+            return 'hsl(' + Math.round(c.h * 360) + ',' + Math.round(c.s * 100) + '%,' + Math.round(c.l * 100) + '%)';
+          }
+          break;
+        case 'hsla':
+          {
+            c = this.toHSL();
+            return 'hsla(' + Math.round(c.h * 360) + ',' + Math.round(c.s * 100) + '%,' + Math.round(c.l * 100) + '%,' + c.a + ')';
+          }
+          break;
+        case 'hex':
+          {
+            return this.toHex(forceRawValue);
+          }
+          break;
+        case 'alias':
+          {
+            c = this.toAlias();
+
+            if (c === false) {
+              return this.toString(forceRawValue, this.getValidFallbackFormat());
+            }
+
+            if (translateAlias && !(c in Color.webColors) && (c in this.predefinedColors)) {
+              return this.predefinedColors[c];
+            }
+
+            return c;
+          }
+        default:
+          {
+            return c;
+          }
+          break;
+      }
+    },
+    // a set of RE's that can match strings and generate color tuples.
+    // from John Resig color plugin
+    // https://github.com/jquery/jquery-color/
+    stringParsers: [{
+      re: /rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*?\)/,
+      format: 'rgb',
+      parse: function(execResult) {
+        return [
+          execResult[1],
+          execResult[2],
+          execResult[3],
+          1
+        ];
+      }
+    }, {
+      re: /rgb\(\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*?\)/,
+      format: 'rgb',
+      parse: function(execResult) {
+        return [
+          2.55 * execResult[1],
+          2.55 * execResult[2],
+          2.55 * execResult[3],
+          1
+        ];
+      }
+    }, {
+      re: /rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d*(?:\.\d+)?)\s*)?\)/,
+      format: 'rgba',
+      parse: function(execResult) {
+        return [
+          execResult[1],
+          execResult[2],
+          execResult[3],
+          execResult[4]
+        ];
+      }
+    }, {
+      re: /rgba\(\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*(?:,\s*(\d*(?:\.\d+)?)\s*)?\)/,
+      format: 'rgba',
+      parse: function(execResult) {
+        return [
+          2.55 * execResult[1],
+          2.55 * execResult[2],
+          2.55 * execResult[3],
+          execResult[4]
+        ];
+      }
+    }, {
+      re: /hsl\(\s*(\d*(?:\.\d+)?)\s*,\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*?\)/,
+      format: 'hsl',
+      parse: function(execResult) {
+        return [
+          execResult[1] / 360,
+          execResult[2] / 100,
+          execResult[3] / 100,
+          execResult[4]
+        ];
+      }
+    }, {
+      re: /hsla\(\s*(\d*(?:\.\d+)?)\s*,\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*(?:,\s*(\d*(?:\.\d+)?)\s*)?\)/,
+      format: 'hsla',
+      parse: function(execResult) {
+        return [
+          execResult[1] / 360,
+          execResult[2] / 100,
+          execResult[3] / 100,
+          execResult[4]
+        ];
+      }
+    }, {
+      re: /#?([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,
+      format: 'hex',
+      parse: function(execResult) {
+        return [
+          parseInt(execResult[1], 16),
+          parseInt(execResult[2], 16),
+          parseInt(execResult[3], 16),
+          1
+        ];
+      }
+    }, {
+      re: /#?([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/,
+      format: 'hex',
+      parse: function(execResult) {
+        return [
+          parseInt(execResult[1] + execResult[1], 16),
+          parseInt(execResult[2] + execResult[2], 16),
+          parseInt(execResult[3] + execResult[3], 16),
+          1
+        ];
+      }
+    }],
+    colorNameToHex: function(name) {
+      if (typeof this.colors[name.toLowerCase()] !== 'undefined') {
+        return this.colors[name.toLowerCase()];
+      }
+      return false;
+    }
+  };
+
+  /*
+   * Default plugin options
+   */
+  var defaults = {
+    horizontal: false, // horizontal mode layout ?
+    inline: false, //forces to show the colorpicker as an inline element
+    color: false, //forces a color
+    format: false, //forces a format
+    input: 'input', // children input selector
+    container: false, // container selector
+    component: '.add-on, .input-group-addon', // children component selector
+    fallbackColor: false, // fallback color value. null = keeps current color.
+    fallbackFormat: 'hex', // fallback color format
+    hexNumberSignPrefix: true, // put a '#' (number sign) before hex strings
+    sliders: {
+      saturation: {
+        maxLeft: 100,
+        maxTop: 100,
+        callLeft: 'setSaturation',
+        callTop: 'setBrightness'
+      },
+      hue: {
+        maxLeft: 0,
+        maxTop: 100,
+        callLeft: false,
+        callTop: 'setHue'
+      },
+      alpha: {
+        maxLeft: 0,
+        maxTop: 100,
+        callLeft: false,
+        callTop: 'setAlpha'
+      }
+    },
+    slidersHorz: {
+      saturation: {
+        maxLeft: 100,
+        maxTop: 100,
+        callLeft: 'setSaturation',
+        callTop: 'setBrightness'
+      },
+      hue: {
+        maxLeft: 100,
+        maxTop: 0,
+        callLeft: 'setHue',
+        callTop: false
+      },
+      alpha: {
+        maxLeft: 100,
+        maxTop: 0,
+        callLeft: 'setAlpha',
+        callTop: false
+      }
+    },
+    template: '<div class="colorpicker dropdown-menu">' +
+      '<div class="colorpicker-saturation"><i><b></b></i></div>' +
+      '<div class="colorpicker-hue"><i></i></div>' +
+      '<div class="colorpicker-alpha"><i></i></div>' +
+      '<div class="colorpicker-color"><div /></div>' +
+      '<div class="colorpicker-selectors"></div>' +
+      '</div>',
+    align: 'right',
+    customClass: null, // custom class added to the colorpicker element
+    colorSelectors: null // custom color aliases
+  };
+
+  /**
+   * Colorpicker component class
+   *
+   * @param {Object|String} element
+   * @param {Object} options
+   * @constructor
+   */
+  var Colorpicker = function(element, options) {
+    this.element = $(element).addClass('colorpicker-element');
+    this.options = $.extend(true, {}, defaults, this.element.data(), options);
+    this.component = this.options.component;
+    this.component = (this.component !== false) ? this.element.find(this.component) : false;
+    if (this.component && (this.component.length === 0)) {
+      this.component = false;
+    }
+    this.container = (this.options.container === true) ? this.element : this.options.container;
+    this.container = (this.container !== false) ? $(this.container) : false;
+
+    // Is the element an input? Should we search inside for any input?
+    this.input = this.element.is('input') ? this.element : (this.options.input ?
+      this.element.find(this.options.input) : false);
+    if (this.input && (this.input.length === 0)) {
+      this.input = false;
+    }
+    // Set HSB color
+    this.color = this.createColor(this.options.color !== false ? this.options.color : this.getValue());
+
+    this.format = this.options.format !== false ? this.options.format : this.color.origFormat;
+
+    if (this.options.color !== false) {
+      this.updateInput(this.color);
+      this.updateData(this.color);
+    }
+
+    // Setup picker
+    var $picker = this.picker = $(this.options.template);
+    if (this.options.customClass) {
+      $picker.addClass(this.options.customClass);
+    }
+    if (this.options.inline) {
+      $picker.addClass('colorpicker-inline colorpicker-visible');
+    } else {
+      $picker.addClass('colorpicker-hidden');
+    }
+    if (this.options.horizontal) {
+      $picker.addClass('colorpicker-horizontal');
+    }
+    if (
+      (['rgba', 'hsla', 'alias'].indexOf(this.format) !== -1) ||
+      this.options.format === false ||
+      this.getValue() === 'transparent'
+    ) {
+      $picker.addClass('colorpicker-with-alpha');
+    }
+    if (this.options.align === 'right') {
+      $picker.addClass('colorpicker-right');
+    }
+    if (this.options.inline === true) {
+      $picker.addClass('colorpicker-no-arrow');
+    }
+    if (this.options.colorSelectors) {
+      var colorpicker = this,
+        selectorsContainer = colorpicker.picker.find('.colorpicker-selectors');
+
+      if (selectorsContainer.length > 0) {
+        $.each(this.options.colorSelectors, function(name, color) {
+          var $btn = $('<i />')
+            .addClass('colorpicker-selectors-color')
+            .css('background-color', color)
+            .data('class', name).data('alias', name);
+
+          $btn.on('mousedown.colorpicker touchstart.colorpicker', function(event) {
+            event.preventDefault();
+            colorpicker.setValue(
+              colorpicker.format === 'alias' ? $(this).data('alias') : $(this).css('background-color')
+            );
+          });
+          selectorsContainer.append($btn);
+        });
+        selectorsContainer.show().addClass('colorpicker-visible');
+      }
+    }
+
+    // Prevent closing the colorpicker when clicking on itself
+    $picker.on('mousedown.colorpicker touchstart.colorpicker', $.proxy(function(e) {
+      if (e.target === e.currentTarget) {
+        e.preventDefault();
+      }
+    }, this));
+
+    // Bind click/tap events on the sliders
+    $picker.find('.colorpicker-saturation, .colorpicker-hue, .colorpicker-alpha')
+      .on('mousedown.colorpicker touchstart.colorpicker', $.proxy(this.mousedown, this));
+
+    $picker.appendTo(this.container ? this.container : $('body'));
+
+    // Bind other events
+    if (this.input !== false) {
+      this.input.on({
+        'keyup.colorpicker': $.proxy(this.keyup, this)
+      });
+      this.input.on({
+        'change.colorpicker': $.proxy(this.change, this)
+      });
+      if (this.component === false) {
+        this.element.on({
+          'focus.colorpicker': $.proxy(this.show, this)
+        });
+      }
+      if (this.options.inline === false) {
+        this.element.on({
+          'focusout.colorpicker': $.proxy(this.hide, this)
+        });
+      }
+    }
+
+    if (this.component !== false) {
+      this.component.on({
+        'click.colorpicker': $.proxy(this.show, this)
+      });
+    }
+
+    if ((this.input === false) && (this.component === false)) {
+      this.element.on({
+        'click.colorpicker': $.proxy(this.show, this)
+      });
+    }
+
+    // for HTML5 input[type='color']
+    if ((this.input !== false) && (this.component !== false) && (this.input.attr('type') === 'color')) {
+
+      this.input.on({
+        'click.colorpicker': $.proxy(this.show, this),
+        'focus.colorpicker': $.proxy(this.show, this)
+      });
+    }
+    this.update();
+
+    $($.proxy(function() {
+      this.element.trigger('create');
+    }, this));
+  };
+
+  Colorpicker.Color = Color;
+
+  Colorpicker.prototype = {
+    constructor: Colorpicker,
+    destroy: function() {
+      this.picker.remove();
+      this.element.removeData('colorpicker', 'color').off('.colorpicker');
+      if (this.input !== false) {
+        this.input.off('.colorpicker');
+      }
+      if (this.component !== false) {
+        this.component.off('.colorpicker');
+      }
+      this.element.removeClass('colorpicker-element');
+      this.element.trigger({
+        type: 'destroy'
+      });
+    },
+    reposition: function() {
+      if (this.options.inline !== false || this.options.container) {
+        return false;
+      }
+      var type = this.container && this.container[0] !== window.document.body ? 'position' : 'offset';
+      var element = this.component || this.element;
+      var offset = element[type]();
+      if (this.options.align === 'right') {
+        offset.left -= this.picker.outerWidth() - element.outerWidth();
+      }
+      this.picker.css({
+        top: offset.top + element.outerHeight(),
+        left: offset.left
+      });
+    },
+    show: function(e) {
+      if (this.isDisabled()) {
+        // Don't show the widget if it's disabled (the input)
+        return;
+      }
+      this.picker.addClass('colorpicker-visible').removeClass('colorpicker-hidden');
+      this.reposition();
+      $(window).on('resize.colorpicker', $.proxy(this.reposition, this));
+      if (e && (!this.hasInput() || this.input.attr('type') === 'color')) {
+        if (e.stopPropagation && e.preventDefault) {
+          e.stopPropagation();
+          e.preventDefault();
+        }
+      }
+      if ((this.component || !this.input) && (this.options.inline === false)) {
+        $(window.document).on({
+          'mousedown.colorpicker': $.proxy(this.hide, this)
+        });
+      }
+      this.element.trigger({
+        type: 'showPicker',
+        color: this.color
+      });
+    },
+    hide: function(e) {
+      if ((typeof e !== 'undefined') && e.target) {
+        // Prevent hide if triggered by an event and an element inside the colorpicker has been clicked/touched
+        if (
+          $(e.currentTarget).parents('.colorpicker').length > 0 ||
+          $(e.target).parents('.colorpicker').length > 0
+        ) {
+          return false;
+        }
+      }
+      this.picker.addClass('colorpicker-hidden').removeClass('colorpicker-visible');
+      $(window).off('resize.colorpicker', this.reposition);
+      $(window.document).off({
+        'mousedown.colorpicker': this.hide
+      });
+      this.update();
+      this.element.trigger({
+        type: 'hidePicker',
+        color: this.color
+      });
+    },
+    updateData: function(val) {
+      val = val || this.color.toString(false, this.format);
+      this.element.data('color', val);
+      return val;
+    },
+    updateInput: function(val) {
+      val = val || this.color.toString(false, this.format);
+      if (this.input !== false) {
+        this.input.prop('value', val);
+        this.input.trigger('change');
+      }
+      return val;
+    },
+    updatePicker: function(val) {
+      if (typeof val !== 'undefined') {
+        this.color = this.createColor(val);
+      }
+      var sl = (this.options.horizontal === false) ? this.options.sliders : this.options.slidersHorz;
+      var icns = this.picker.find('i');
+      if (icns.length === 0) {
+        return;
+      }
+      if (this.options.horizontal === false) {
+        sl = this.options.sliders;
+        icns.eq(1).css('top', sl.hue.maxTop * (1 - this.color.value.h)).end()
+          .eq(2).css('top', sl.alpha.maxTop * (1 - this.color.value.a));
+      } else {
+        sl = this.options.slidersHorz;
+        icns.eq(1).css('left', sl.hue.maxLeft * (1 - this.color.value.h)).end()
+          .eq(2).css('left', sl.alpha.maxLeft * (1 - this.color.value.a));
+      }
+      icns.eq(0).css({
+        'top': sl.saturation.maxTop - this.color.value.b * sl.saturation.maxTop,
+        'left': this.color.value.s * sl.saturation.maxLeft
+      });
+
+      this.picker.find('.colorpicker-saturation')
+        .css('backgroundColor', this.color.toHex(true, this.color.value.h, 1, 1, 1));
+
+      this.picker.find('.colorpicker-alpha')
+        .css('backgroundColor', this.color.toHex(true));
+
+      this.picker.find('.colorpicker-color, .colorpicker-color div')
+        .css('backgroundColor', this.color.toString(true, this.format));
+
+      return val;
+    },
+    updateComponent: function(val) {
+      var color;
+
+      if (typeof val !== 'undefined') {
+        color = this.createColor(val);
+      } else {
+        color = this.color;
+      }
+
+      if (this.component !== false) {
+        var icn = this.component.find('i').eq(0);
+        if (icn.length > 0) {
+          icn.css({
+            'backgroundColor': color.toString(true, this.format)
+          });
+        } else {
+          this.component.css({
+            'backgroundColor': color.toString(true, this.format)
+          });
+        }
+      }
+
+      return color.toString(false, this.format);
+    },
+    update: function(force) {
+      var val;
+      if ((this.getValue(false) !== false) || (force === true)) {
+        // Update input/data only if the current value is not empty
+        val = this.updateComponent();
+        this.updateInput(val);
+        this.updateData(val);
+        this.updatePicker(); // only update picker if value is not empty
+      }
+      return val;
+
+    },
+    setValue: function(val) { // set color manually
+      this.color = this.createColor(val);
+      this.update(true);
+      this.element.trigger({
+        type: 'changeColor',
+        color: this.color,
+        value: val
+      });
+    },
+    /**
+     * Creates a new color using the instance options
+     * @protected
+     * @param {String} val
+     * @returns {Color}
+     */
+    createColor: function(val) {
+      return new Color(
+        val ? val : null,
+        this.options.colorSelectors,
+        this.options.fallbackColor ? this.options.fallbackColor : this.color,
+        this.options.fallbackFormat,
+        this.options.hexNumberSignPrefix
+      );
+    },
+    getValue: function(defaultValue) {
+      defaultValue = (typeof defaultValue === 'undefined') ? this.options.fallbackColor : defaultValue;
+      var val;
+      if (this.hasInput()) {
+        val = this.input.val();
+      } else {
+        val = this.element.data('color');
+      }
+      if ((val === undefined) || (val === '') || (val === null)) {
+        // if not defined or empty, return default
+        val = defaultValue;
+      }
+      return val;
+    },
+    hasInput: function() {
+      return (this.input !== false);
+    },
+    isDisabled: function() {
+      if (this.hasInput()) {
+        return (this.input.prop('disabled') === true);
+      }
+      return false;
+    },
+    disable: function() {
+      if (this.hasInput()) {
+        this.input.prop('disabled', true);
+        this.element.trigger({
+          type: 'disable',
+          color: this.color,
+          value: this.getValue()
+        });
+        return true;
+      }
+      return false;
+    },
+    enable: function() {
+      if (this.hasInput()) {
+        this.input.prop('disabled', false);
+        this.element.trigger({
+          type: 'enable',
+          color: this.color,
+          value: this.getValue()
+        });
+        return true;
+      }
+      return false;
+    },
+    currentSlider: null,
+    mousePointer: {
+      left: 0,
+      top: 0
+    },
+    mousedown: function(e) {
+      if (!e.pageX && !e.pageY && e.originalEvent && e.originalEvent.touches) {
+        e.pageX = e.originalEvent.touches[0].pageX;
+        e.pageY = e.originalEvent.touches[0].pageY;
+      }
+      e.stopPropagation();
+      e.preventDefault();
+
+      var target = $(e.target);
+
+      //detect the slider and set the limits and callbacks
+      var zone = target.closest('div');
+      var sl = this.options.horizontal ? this.options.slidersHorz : this.options.sliders;
+      if (!zone.is('.colorpicker')) {
+        if (zone.is('.colorpicker-saturation')) {
+          this.currentSlider = $.extend({}, sl.saturation);
+        } else if (zone.is('.colorpicker-hue')) {
+          this.currentSlider = $.extend({}, sl.hue);
+        } else if (zone.is('.colorpicker-alpha')) {
+          this.currentSlider = $.extend({}, sl.alpha);
+        } else {
+          return false;
+        }
+        var offset = zone.offset();
+        //reference to guide's style
+        this.currentSlider.guide = zone.find('i')[0].style;
+        this.currentSlider.left = e.pageX - offset.left;
+        this.currentSlider.top = e.pageY - offset.top;
+        this.mousePointer = {
+          left: e.pageX,
+          top: e.pageY
+        };
+        //trigger mousemove to move the guide to the current position
+        $(window.document).on({
+          'mousemove.colorpicker': $.proxy(this.mousemove, this),
+          'touchmove.colorpicker': $.proxy(this.mousemove, this),
+          'mouseup.colorpicker': $.proxy(this.mouseup, this),
+          'touchend.colorpicker': $.proxy(this.mouseup, this)
+        }).trigger('mousemove');
+      }
+      return false;
+    },
+    mousemove: function(e) {
+      if (!e.pageX && !e.pageY && e.originalEvent && e.originalEvent.touches) {
+        e.pageX = e.originalEvent.touches[0].pageX;
+        e.pageY = e.originalEvent.touches[0].pageY;
+      }
+      e.stopPropagation();
+      e.preventDefault();
+      var left = Math.max(
+        0,
+        Math.min(
+          this.currentSlider.maxLeft,
+          this.currentSlider.left + ((e.pageX || this.mousePointer.left) - this.mousePointer.left)
+        )
+      );
+      var top = Math.max(
+        0,
+        Math.min(
+          this.currentSlider.maxTop,
+          this.currentSlider.top + ((e.pageY || this.mousePointer.top) - this.mousePointer.top)
+        )
+      );
+      this.currentSlider.guide.left = left + 'px';
+      this.currentSlider.guide.top = top + 'px';
+      if (this.currentSlider.callLeft) {
+        this.color[this.currentSlider.callLeft].call(this.color, left / this.currentSlider.maxLeft);
+      }
+      if (this.currentSlider.callTop) {
+        this.color[this.currentSlider.callTop].call(this.color, top / this.currentSlider.maxTop);
+      }
+      // Change format dynamically
+      // Only occurs if user choose the dynamic format by
+      // setting option format to false
+      if (
+        this.options.format === false &&
+        (this.currentSlider.callTop === 'setAlpha' ||
+          this.currentSlider.callLeft === 'setAlpha')
+      ) {
+
+        // Converting from hex / rgb to rgba
+        if (this.color.value.a !== 1) {
+          this.format = 'rgba';
+          this.color.origFormat = 'rgba';
+        }
+
+        // Converting from rgba to hex
+        else {
+          this.format = 'hex';
+          this.color.origFormat = 'hex';
+        }
+      }
+      this.update(true);
+
+      this.element.trigger({
+        type: 'changeColor',
+        color: this.color
+      });
+      return false;
+    },
+    mouseup: function(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      $(window.document).off({
+        'mousemove.colorpicker': this.mousemove,
+        'touchmove.colorpicker': this.mousemove,
+        'mouseup.colorpicker': this.mouseup,
+        'touchend.colorpicker': this.mouseup
+      });
+      return false;
+    },
+    change: function(e) {
+      this.keyup(e);
+    },
+    keyup: function(e) {
+      if ((e.keyCode === 38)) {
+        if (this.color.value.a < 1) {
+          this.color.value.a = Math.round((this.color.value.a + 0.01) * 100) / 100;
+        }
+        this.update(true);
+      } else if ((e.keyCode === 40)) {
+        if (this.color.value.a > 0) {
+          this.color.value.a = Math.round((this.color.value.a - 0.01) * 100) / 100;
+        }
+        this.update(true);
+      } else {
+        this.color = this.createColor(this.input.val());
+        // Change format dynamically
+        // Only occurs if user choose the dynamic format by
+        // setting option format to false
+        if (this.color.origFormat && this.options.format === false) {
+          this.format = this.color.origFormat;
+        }
+        if (this.getValue(false) !== false) {
+          this.updateData();
+          this.updateComponent();
+          this.updatePicker();
+        }
+      }
+      this.element.trigger({
+        type: 'changeColor',
+        color: this.color,
+        value: this.input.val()
+      });
+    }
+  };
+
+  $.colorpicker = Colorpicker;
+
+  $.fn.colorpicker = function(option) {
+    var apiArgs = Array.prototype.slice.call(arguments, 1),
+      isSingleElement = (this.length === 1),
+      returnValue = null;
+
+    var $jq = this.each(function() {
+      var $this = $(this),
+        inst = $this.data('colorpicker'),
+        options = ((typeof option === 'object') ? option : {});
+
+      if (!inst) {
+        inst = new Colorpicker(this, options);
+        $this.data('colorpicker', inst);
+      }
+
+      if (typeof option === 'string') {
+        if ($.isFunction(inst[option])) {
+          returnValue = inst[option].apply(inst, apiArgs);
+        } else { // its a property ?
+          if (apiArgs.length) {
+            // set property
+            inst[option] = apiArgs[0];
+          }
+          returnValue = inst[option];
+        }
+      } else {
+        returnValue = $this;
+      }
+    });
+    return isSingleElement ? returnValue : $jq;
+  };
+
+  $.fn.colorpicker.constructor = Colorpicker;
+
+}));
diff --git a/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
new file mode 100644
index 000000000..0271a46f1
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
@@ -0,0 +1,5 @@
+/*!
+ * Bootstrap Colorpicker v2.5.1
+ * https://itsjavi.com/bootstrap-colorpicker/
+ */
+!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],function(a){return b(a)}):"object"==typeof exports?module.exports=b(require("jquery")):jQuery&&!jQuery.fn.colorpicker&&b(jQuery)}(this,function(a){"use strict";var b=function(c,d,e,f,g){this.fallbackValue=e?e&&"undefined"!=typeof e.h?e:this.value={h:0,s:0,b:0,a:1}:null,this.fallbackFormat=f?f:"rgba",this.hexNumberSignPrefix=g===!0,this.value=this.fallbackValue,this.origFormat=null,this.predefinedColors=d?d:{},this.colors=a.extend({},b.webColors,this.predefinedColors),c&&("undefined"!=typeof c.h?this.value=c:this.setColor(String(c))),this.value||(this.value={h:0,s:0,b:0,a:1})};b.webColors={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32",transparent:"transparent"},b.prototype={constructor:b,colors:{},predefinedColors:{},getValue:function(){return this.value},setValue:function(a){this.value=a},_sanitizeNumber:function(a){return"number"==typeof a?a:isNaN(a)||null===a||""===a||void 0===a?1:""===a?0:"undefined"!=typeof a.toLowerCase?(a.match(/^\./)&&(a="0"+a),Math.ceil(100*parseFloat(a))/100):1},isTransparent:function(a){return!(!a||!("string"==typeof a||a instanceof String))&&(a=a.toLowerCase().trim(),"transparent"===a||a.match(/#?00000000/)||a.match(/(rgba|hsla)\(0,0,0,0?\.?0\)/))},rgbaIsTransparent:function(a){return 0===a.r&&0===a.g&&0===a.b&&0===a.a},setColor:function(a){if(a=a.toLowerCase().trim()){if(this.isTransparent(a))return this.value={h:0,s:0,b:0,a:0},!0;var b=this.parse(a);b?(this.value=this.value={h:b.h,s:b.s,b:b.b,a:b.a},this.origFormat||(this.origFormat=b.format)):this.fallbackValue&&(this.value=this.fallbackValue)}return!1},setHue:function(a){this.value.h=1-a},setSaturation:function(a){this.value.s=a},setBrightness:function(a){this.value.b=1-a},setAlpha:function(a){this.value.a=Math.round(parseInt(100*(1-a),10)/100*100)/100},toRGB:function(a,b,c,d){0===arguments.length&&(a=this.value.h,b=this.value.s,c=this.value.b,d=this.value.a),a*=360;var e,f,g,h,i;return a=a%360/60,i=c*b,h=i*(1-Math.abs(a%2-1)),e=f=g=c-i,a=~~a,e+=[i,h,0,0,h,i][a],f+=[h,i,i,h,0,0][a],g+=[0,0,h,i,i,h][a],{r:Math.round(255*e),g:Math.round(255*f),b:Math.round(255*g),a:d}},toHex:function(a,b,c,d,e){arguments.length<=1&&(b=this.value.h,c=this.value.s,d=this.value.b,e=this.value.a);var f="#",g=this.toRGB(b,c,d,e);if(this.rgbaIsTransparent(g))return"transparent";a||(f=this.hexNumberSignPrefix?"#":"");var h=f+((1<<24)+(parseInt(g.r)<<16)+(parseInt(g.g)<<8)+parseInt(g.b)).toString(16).slice(1);return h},toHSL:function(a,b,c,d){0===arguments.length&&(a=this.value.h,b=this.value.s,c=this.value.b,d=this.value.a);var e=a,f=(2-b)*c,g=b*c;return g/=f>0&&f<=1?f:2-f,f/=2,g>1&&(g=1),{h:isNaN(e)?0:e,s:isNaN(g)?0:g,l:isNaN(f)?0:f,a:isNaN(d)?0:d}},toAlias:function(a,b,c,d){var e,f=0===arguments.length?this.toHex(!0):this.toHex(!0,a,b,c,d),g="alias"===this.origFormat?f:this.toString(!1,this.origFormat);for(var h in this.colors)if(e=this.colors[h].toLowerCase().trim(),e===f||e===g)return h;return!1},RGBtoHSB:function(a,b,c,d){a/=255,b/=255,c/=255;var e,f,g,h;return g=Math.max(a,b,c),h=g-Math.min(a,b,c),e=0===h?null:g===a?(b-c)/h:g===b?(c-a)/h+2:(a-b)/h+4,e=(e+360)%6*60/360,f=0===h?0:h/g,{h:this._sanitizeNumber(e),s:f,b:g,a:this._sanitizeNumber(d)}},HueToRGB:function(a,b,c){return c<0?c+=1:c>1&&(c-=1),6*c<1?a+(b-a)*c*6:2*c<1?b:3*c<2?a+(b-a)*(2/3-c)*6:a},HSLtoRGB:function(a,b,c,d){b<0&&(b=0);var e;e=c<=.5?c*(1+b):c+b-c*b;var f=2*c-e,g=a+1/3,h=a,i=a-1/3,j=Math.round(255*this.HueToRGB(f,e,g)),k=Math.round(255*this.HueToRGB(f,e,h)),l=Math.round(255*this.HueToRGB(f,e,i));return[j,k,l,this._sanitizeNumber(d)]},parse:function(b){if(0===arguments.length)return!1;var c,d,e=this,f=!1,g="undefined"!=typeof this.colors[b];return g&&(b=this.colors[b].toLowerCase().trim()),a.each(this.stringParsers,function(a,h){var i=h.re.exec(b);return c=i&&h.parse.apply(e,[i]),!c||(f={},d=g?"alias":h.format?h.format:e.getValidFallbackFormat(),f=d.match(/hsla?/)?e.RGBtoHSB.apply(e,e.HSLtoRGB.apply(e,c)):e.RGBtoHSB.apply(e,c),f instanceof Object&&(f.format=d),!1)}),f},getValidFallbackFormat:function(){var a=["rgba","rgb","hex","hsla","hsl"];return this.origFormat&&a.indexOf(this.origFormat)!==-1?this.origFormat:this.fallbackFormat&&a.indexOf(this.fallbackFormat)!==-1?this.fallbackFormat:"rgba"},toString:function(a,c,d){c=c||this.origFormat||this.fallbackFormat,d=d||!1;var e=!1;switch(c){case"rgb":return e=this.toRGB(),this.rgbaIsTransparent(e)?"transparent":"rgb("+e.r+","+e.g+","+e.b+")";case"rgba":return e=this.toRGB(),"rgba("+e.r+","+e.g+","+e.b+","+e.a+")";case"hsl":return e=this.toHSL(),"hsl("+Math.round(360*e.h)+","+Math.round(100*e.s)+"%,"+Math.round(100*e.l)+"%)";case"hsla":return e=this.toHSL(),"hsla("+Math.round(360*e.h)+","+Math.round(100*e.s)+"%,"+Math.round(100*e.l)+"%,"+e.a+")";case"hex":return this.toHex(a);case"alias":return e=this.toAlias(),e===!1?this.toString(a,this.getValidFallbackFormat()):d&&!(e in b.webColors)&&e in this.predefinedColors?this.predefinedColors[e]:e;default:return e}},stringParsers:[{re:/rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*?\)/,format:"rgb",parse:function(a){return[a[1],a[2],a[3],1]}},{re:/rgb\(\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*?\)/,format:"rgb",parse:function(a){return[2.55*a[1],2.55*a[2],2.55*a[3],1]}},{re:/rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d*(?:\.\d+)?)\s*)?\)/,format:"rgba",parse:function(a){return[a[1],a[2],a[3],a[4]]}},{re:/rgba\(\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*(?:,\s*(\d*(?:\.\d+)?)\s*)?\)/,format:"rgba",parse:function(a){return[2.55*a[1],2.55*a[2],2.55*a[3],a[4]]}},{re:/hsl\(\s*(\d*(?:\.\d+)?)\s*,\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*?\)/,format:"hsl",parse:function(a){return[a[1]/360,a[2]/100,a[3]/100,a[4]]}},{re:/hsla\(\s*(\d*(?:\.\d+)?)\s*,\s*(\d*(?:\.\d+)?)\%\s*,\s*(\d*(?:\.\d+)?)\%\s*(?:,\s*(\d*(?:\.\d+)?)\s*)?\)/,format:"hsla",parse:function(a){return[a[1]/360,a[2]/100,a[3]/100,a[4]]}},{re:/#?([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,format:"hex",parse:function(a){return[parseInt(a[1],16),parseInt(a[2],16),parseInt(a[3],16),1]}},{re:/#?([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/,format:"hex",parse:function(a){return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16),1]}}],colorNameToHex:function(a){return"undefined"!=typeof this.colors[a.toLowerCase()]&&this.colors[a.toLowerCase()]}};var c={horizontal:!1,inline:!1,color:!1,format:!1,input:"input",container:!1,component:".add-on, .input-group-addon",fallbackColor:!1,fallbackFormat:"hex",hexNumberSignPrefix:!0,sliders:{saturation:{maxLeft:100,maxTop:100,callLeft:"setSaturation",callTop:"setBrightness"},hue:{maxLeft:0,maxTop:100,callLeft:!1,callTop:"setHue"},alpha:{maxLeft:0,maxTop:100,callLeft:!1,callTop:"setAlpha"}},slidersHorz:{saturation:{maxLeft:100,maxTop:100,callLeft:"setSaturation",callTop:"setBrightness"},hue:{maxLeft:100,maxTop:0,callLeft:"setHue",callTop:!1},alpha:{maxLeft:100,maxTop:0,callLeft:"setAlpha",callTop:!1}},template:'<div class="colorpicker dropdown-menu"><div class="colorpicker-saturation"><i><b></b></i></div><div class="colorpicker-hue"><i></i></div><div class="colorpicker-alpha"><i></i></div><div class="colorpicker-color"><div /></div><div class="colorpicker-selectors"></div></div>',align:"right",customClass:null,colorSelectors:null},d=function(b,d){this.element=a(b).addClass("colorpicker-element"),this.options=a.extend(!0,{},c,this.element.data(),d),this.component=this.options.component,this.component=this.component!==!1&&this.element.find(this.component),this.component&&0===this.component.length&&(this.component=!1),this.container=this.options.container===!0?this.element:this.options.container,this.container=this.container!==!1&&a(this.container),this.input=this.element.is("input")?this.element:!!this.options.input&&this.element.find(this.options.input),this.input&&0===this.input.length&&(this.input=!1),this.color=this.createColor(this.options.color!==!1?this.options.color:this.getValue()),this.format=this.options.format!==!1?this.options.format:this.color.origFormat,this.options.color!==!1&&(this.updateInput(this.color),this.updateData(this.color));var e=this.picker=a(this.options.template);if(this.options.customClass&&e.addClass(this.options.customClass),this.options.inline?e.addClass("colorpicker-inline colorpicker-visible"):e.addClass("colorpicker-hidden"),this.options.horizontal&&e.addClass("colorpicker-horizontal"),["rgba","hsla","alias"].indexOf(this.format)===-1&&this.options.format!==!1&&"transparent"!==this.getValue()||e.addClass("colorpicker-with-alpha"),"right"===this.options.align&&e.addClass("colorpicker-right"),this.options.inline===!0&&e.addClass("colorpicker-no-arrow"),this.options.colorSelectors){var f=this,g=f.picker.find(".colorpicker-selectors");g.length>0&&(a.each(this.options.colorSelectors,function(b,c){var d=a("<i />").addClass("colorpicker-selectors-color").css("background-color",c).data("class",b).data("alias",b);d.on("mousedown.colorpicker touchstart.colorpicker",function(b){b.preventDefault(),f.setValue("alias"===f.format?a(this).data("alias"):a(this).css("background-color"))}),g.append(d)}),g.show().addClass("colorpicker-visible"))}e.on("mousedown.colorpicker touchstart.colorpicker",a.proxy(function(a){a.target===a.currentTarget&&a.preventDefault()},this)),e.find(".colorpicker-saturation, .colorpicker-hue, .colorpicker-alpha").on("mousedown.colorpicker touchstart.colorpicker",a.proxy(this.mousedown,this)),e.appendTo(this.container?this.container:a("body")),this.input!==!1&&(this.input.on({"keyup.colorpicker":a.proxy(this.keyup,this)}),this.input.on({"change.colorpicker":a.proxy(this.change,this)}),this.component===!1&&this.element.on({"focus.colorpicker":a.proxy(this.show,this)}),this.options.inline===!1&&this.element.on({"focusout.colorpicker":a.proxy(this.hide,this)})),this.component!==!1&&this.component.on({"click.colorpicker":a.proxy(this.show,this)}),this.input===!1&&this.component===!1&&this.element.on({"click.colorpicker":a.proxy(this.show,this)}),this.input!==!1&&this.component!==!1&&"color"===this.input.attr("type")&&this.input.on({"click.colorpicker":a.proxy(this.show,this),"focus.colorpicker":a.proxy(this.show,this)}),this.update(),a(a.proxy(function(){this.element.trigger("create")},this))};d.Color=b,d.prototype={constructor:d,destroy:function(){this.picker.remove(),this.element.removeData("colorpicker","color").off(".colorpicker"),this.input!==!1&&this.input.off(".colorpicker"),this.component!==!1&&this.component.off(".colorpicker"),this.element.removeClass("colorpicker-element"),this.element.trigger({type:"destroy"})},reposition:function(){if(this.options.inline!==!1||this.options.container)return!1;var a=this.container&&this.container[0]!==window.document.body?"position":"offset",b=this.component||this.element,c=b[a]();"right"===this.options.align&&(c.left-=this.picker.outerWidth()-b.outerWidth()),this.picker.css({top:c.top+b.outerHeight(),left:c.left})},show:function(b){this.isDisabled()||(this.picker.addClass("colorpicker-visible").removeClass("colorpicker-hidden"),this.reposition(),a(window).on("resize.colorpicker",a.proxy(this.reposition,this)),!b||this.hasInput()&&"color"!==this.input.attr("type")||b.stopPropagation&&b.preventDefault&&(b.stopPropagation(),b.preventDefault()),!this.component&&this.input||this.options.inline!==!1||a(window.document).on({"mousedown.colorpicker":a.proxy(this.hide,this)}),this.element.trigger({type:"showPicker",color:this.color}))},hide:function(b){return("undefined"==typeof b||!b.target||!(a(b.currentTarget).parents(".colorpicker").length>0||a(b.target).parents(".colorpicker").length>0))&&(this.picker.addClass("colorpicker-hidden").removeClass("colorpicker-visible"),a(window).off("resize.colorpicker",this.reposition),a(window.document).off({"mousedown.colorpicker":this.hide}),this.update(),void this.element.trigger({type:"hidePicker",color:this.color}))},updateData:function(a){return a=a||this.color.toString(!1,this.format),this.element.data("color",a),a},updateInput:function(a){return a=a||this.color.toString(!1,this.format),this.input!==!1&&(this.input.prop("value",a),this.input.trigger("change")),a},updatePicker:function(a){"undefined"!=typeof a&&(this.color=this.createColor(a));var b=this.options.horizontal===!1?this.options.sliders:this.options.slidersHorz,c=this.picker.find("i");if(0!==c.length)return this.options.horizontal===!1?(b=this.options.sliders,c.eq(1).css("top",b.hue.maxTop*(1-this.color.value.h)).end().eq(2).css("top",b.alpha.maxTop*(1-this.color.value.a))):(b=this.options.slidersHorz,c.eq(1).css("left",b.hue.maxLeft*(1-this.color.value.h)).end().eq(2).css("left",b.alpha.maxLeft*(1-this.color.value.a))),c.eq(0).css({top:b.saturation.maxTop-this.color.value.b*b.saturation.maxTop,left:this.color.value.s*b.saturation.maxLeft}),this.picker.find(".colorpicker-saturation").css("backgroundColor",this.color.toHex(!0,this.color.value.h,1,1,1)),this.picker.find(".colorpicker-alpha").css("backgroundColor",this.color.toHex(!0)),this.picker.find(".colorpicker-color, .colorpicker-color div").css("backgroundColor",this.color.toString(!0,this.format)),a},updateComponent:function(a){var b;if(b="undefined"!=typeof a?this.createColor(a):this.color,this.component!==!1){var c=this.component.find("i").eq(0);c.length>0?c.css({backgroundColor:b.toString(!0,this.format)}):this.component.css({backgroundColor:b.toString(!0,this.format)})}return b.toString(!1,this.format)},update:function(a){var b;return this.getValue(!1)===!1&&a!==!0||(b=this.updateComponent(),this.updateInput(b),this.updateData(b),this.updatePicker()),b},setValue:function(a){this.color=this.createColor(a),this.update(!0),this.element.trigger({type:"changeColor",color:this.color,value:a})},createColor:function(a){return new b(a?a:null,this.options.colorSelectors,this.options.fallbackColor?this.options.fallbackColor:this.color,this.options.fallbackFormat,this.options.hexNumberSignPrefix)},getValue:function(a){a="undefined"==typeof a?this.options.fallbackColor:a;var b;return b=this.hasInput()?this.input.val():this.element.data("color"),void 0!==b&&""!==b&&null!==b||(b=a),b},hasInput:function(){return this.input!==!1},isDisabled:function(){return!!this.hasInput()&&this.input.prop("disabled")===!0},disable:function(){return!!this.hasInput()&&(this.input.prop("disabled",!0),this.element.trigger({type:"disable",color:this.color,value:this.getValue()}),!0)},enable:function(){return!!this.hasInput()&&(this.input.prop("disabled",!1),this.element.trigger({type:"enable",color:this.color,value:this.getValue()}),!0)},currentSlider:null,mousePointer:{left:0,top:0},mousedown:function(b){!b.pageX&&!b.pageY&&b.originalEvent&&b.originalEvent.touches&&(b.pageX=b.originalEvent.touches[0].pageX,b.pageY=b.originalEvent.touches[0].pageY),b.stopPropagation(),b.preventDefault();var c=a(b.target),d=c.closest("div"),e=this.options.horizontal?this.options.slidersHorz:this.options.sliders;if(!d.is(".colorpicker")){if(d.is(".colorpicker-saturation"))this.currentSlider=a.extend({},e.saturation);else if(d.is(".colorpicker-hue"))this.currentSlider=a.extend({},e.hue);else{if(!d.is(".colorpicker-alpha"))return!1;this.currentSlider=a.extend({},e.alpha)}var f=d.offset();this.currentSlider.guide=d.find("i")[0].style,this.currentSlider.left=b.pageX-f.left,this.currentSlider.top=b.pageY-f.top,this.mousePointer={left:b.pageX,top:b.pageY},a(window.document).on({"mousemove.colorpicker":a.proxy(this.mousemove,this),"touchmove.colorpicker":a.proxy(this.mousemove,this),"mouseup.colorpicker":a.proxy(this.mouseup,this),"touchend.colorpicker":a.proxy(this.mouseup,this)}).trigger("mousemove")}return!1},mousemove:function(a){!a.pageX&&!a.pageY&&a.originalEvent&&a.originalEvent.touches&&(a.pageX=a.originalEvent.touches[0].pageX,a.pageY=a.originalEvent.touches[0].pageY),a.stopPropagation(),a.preventDefault();var b=Math.max(0,Math.min(this.currentSlider.maxLeft,this.currentSlider.left+((a.pageX||this.mousePointer.left)-this.mousePointer.left))),c=Math.max(0,Math.min(this.currentSlider.maxTop,this.currentSlider.top+((a.pageY||this.mousePointer.top)-this.mousePointer.top)));return this.currentSlider.guide.left=b+"px",this.currentSlider.guide.top=c+"px",this.currentSlider.callLeft&&this.color[this.currentSlider.callLeft].call(this.color,b/this.currentSlider.maxLeft),this.currentSlider.callTop&&this.color[this.currentSlider.callTop].call(this.color,c/this.currentSlider.maxTop),this.options.format!==!1||"setAlpha"!==this.currentSlider.callTop&&"setAlpha"!==this.currentSlider.callLeft||(1!==this.color.value.a?(this.format="rgba",this.color.origFormat="rgba"):(this.format="hex",this.color.origFormat="hex")),this.update(!0),this.element.trigger({type:"changeColor",color:this.color}),!1},mouseup:function(b){return b.stopPropagation(),b.preventDefault(),a(window.document).off({"mousemove.colorpicker":this.mousemove,"touchmove.colorpicker":this.mousemove,"mouseup.colorpicker":this.mouseup,"touchend.colorpicker":this.mouseup}),!1},change:function(a){this.keyup(a)},keyup:function(a){38===a.keyCode?(this.color.value.a<1&&(this.color.value.a=Math.round(100*(this.color.value.a+.01))/100),this.update(!0)):40===a.keyCode?(this.color.value.a>0&&(this.color.value.a=Math.round(100*(this.color.value.a-.01))/100),this.update(!0)):(this.color=this.createColor(this.input.val()),this.color.origFormat&&this.options.format===!1&&(this.format=this.color.origFormat),this.getValue(!1)!==!1&&(this.updateData(),this.updateComponent(),this.updatePicker())),this.element.trigger({type:"changeColor",color:this.color,value:this.input.val()})}},a.colorpicker=d,a.fn.colorpicker=function(b){var c=Array.prototype.slice.call(arguments,1),e=1===this.length,f=null,g=this.each(function(){var e=a(this),g=e.data("colorpicker"),h="object"==typeof b?b:{};g||(g=new d(this,h),e.data("colorpicker",g)),"string"==typeof b?a.isFunction(g[b])?f=g[b].apply(g,c):(c.length&&(g[b]=c[0]),f=g[b]):f=e});return e?f:g},a.fn.colorpicker.constructor=d});
\ No newline at end of file
diff --git a/odex25_project/web_widget_colorpicker/static/src/xml/widget.xml b/odex25_project/web_widget_colorpicker/static/src/xml/widget.xml
new file mode 100644
index 000000000..14f1a8003
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/static/src/xml/widget.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+    <t t-name="FieldColorPicker">
+
+            <span t-if="widget.mode !== 'readonly'">
+                <div class="input-group colorpicker-component">
+                    <input type="text"
+                           t-att-id="widget.id_for_label"
+                           t-att-tabindex="widget.attrs.tabindex"
+                           t-att-autofocus="widget.attrs.autofocus"
+                           t-att-placeholder="widget.attrs.placeholder"
+                           t-att-maxlength="widget.field.size"
+                           class="colorpickerg form-control"
+                            />
+                    <span class="input-group-addon"><i></i></span>
+                </div>
+
+            </span>
+            <span t-if="widget.mode === 'readonly'"/>
+
+    </t>
+
+</templates>
+
diff --git a/odex25_project/web_widget_colorpicker/view/web_widget_colorpicker_view.xml b/odex25_project/web_widget_colorpicker/view/web_widget_colorpicker_view.xml
new file mode 100644
index 000000000..b9169e773
--- /dev/null
+++ b/odex25_project/web_widget_colorpicker/view/web_widget_colorpicker_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <template id="assets_backend" name="web_widget_time_delta assets" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <link rel="stylesheet" href="/web_widget_colorpicker/static/src/css/widget.css"/>
+
+            <link rel="stylesheet" href="/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/css/bootstrap-colorpicker.css"/>
+
+
+
+            <script type="text/javascript" src="/web_widget_colorpicker/static/src/js/widget.js"></script>
+            <script type="text/javascript" src="/web_widget_colorpicker/static/src/lib/bootstrap-colorpicker/js/bootstrap-colorpicker.js"></script>
+
+
+        </xpath>
+    </template>
+</odoo>
diff --git a/odex25_project/web_widget_time_delta/README.rst b/odex25_project/web_widget_time_delta/README.rst
new file mode 100644
index 000000000..c015fd14c
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/README.rst
@@ -0,0 +1,51 @@
+Timedelta widget for Odoo web client
+================================
+
+
+Features
+========
+
+
+* Display the time on form view
+
+  |formview|
+
+* Display the time on list view
+
+  |listview|
+
+
+Usage
+=====
+
+You need to declare a integer field Default set second.
+
+    duration = fields.integer(
+        string="Duration",
+        help="Set Duration",
+        default="60"
+    )
+
+
+In the view declaration, put widget='time_delta' for Form and  widget='time_delta_list' for List
+
+    ...
+    <field name="arch" type="xml">
+        <tree string="View name">
+            ...
+            <field name="duration" widget="time_delta_list"/>
+            ...
+        </tree>
+    </field>
+    ...
+
+    ...
+    <field name="arch" type="xml">
+        <form string="View name">
+            ...
+            <field name="duration" widget="time_delta"/>
+            ...
+        </rom>
+    </field>
+    ...
+
diff --git a/odex25_project/web_widget_time_delta/__init__.py b/odex25_project/web_widget_time_delta/__init__.py
new file mode 100644
index 000000000..ec51c5a2b
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+#
diff --git a/odex25_project/web_widget_time_delta/__manifest__.py b/odex25_project/web_widget_time_delta/__manifest__.py
new file mode 100644
index 000000000..b395c2036
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/__manifest__.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+{
+    "name": """Web Widget Time Delta""",
+    "summary": """Added Time Delta Human friedly for From and List""",
+    "category": "Odex25-Project/Odex25-Project",
+    "images": ['static/description/icon.png'],
+    "version": "14.21.05.28.0",
+    "description": """
+    
+            update: round True
+            update: fix for bootstrap hide 
+            
+            XML string:
+            For Form View - added = widget="time_delta"
+            For List View - added = widget="time_delta"
+            
+            <field name="duration" widget="time_delta" options="{'mask_humanize_string': 'h,m',  'mask_picker_field' : ''}" />
+            
+            XML field:
+            <field 
+                    name="duration" widget="time_delta" 
+                    options="{'mask_humanize_field': 'duration_scale', 'mask_picker_field' : 'duration_picker'}" 
+                    class="oe_inline"
+            />
+            
+            PYTHON
+            duration = fields.Integer(string='Plan Duration') store in seconds.
+            
+            duration_scale = fields.Char(string='Duration Scale', related="project_id.duration_scale", readonly=True, )
+            duration_picker = fields.Selection(string='Duration Picker', related="project_id.duration_picker", readonly=True, )
+
+            
+            Selection 
+            @api.model
+            def _get_duration_picker(self):
+                value = [
+                    ('day', _('Day')),
+                    ('second', _('Second')),
+                    ('day_second', _('Day Second'))
+                ]
+            return value
+
+
+    """,
+
+    "author": "Viktor Vorobjov",
+    "license": "LGPL-3",
+    "website": "https://straga.github.io",
+    "support": "vostraga@gmail.com",
+    "price": 0.00,
+    "currency": "EUR",
+
+    "depends": [
+        "web"
+    ],
+    "external_dependencies": {"python": [], "bin": []},
+    "data": [
+        'view/web_widget_time_delta_view.xml'
+    ],
+    "qweb": [
+        'static/src/xml/widget.xml',
+
+    ],
+    "demo": [],
+
+    "post_load": None,
+    "pre_init_hook": None,
+    "post_init_hook": None,
+    "installable": True,
+    "auto_install": False,
+    "application": False,
+}
diff --git a/odex25_project/web_widget_time_delta/i18n/ar_001.po b/odex25_project/web_widget_time_delta/i18n/ar_001.po
new file mode 100644
index 000000000..c12f60ba7
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/i18n/ar_001.po
@@ -0,0 +1,71 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* web_widget_time_delta
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-12 10:23+0000\n"
+"PO-Revision-Date: 2024-06-12 10:23+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: web_widget_time_delta
+#: code:addons/web_widget_time_delta/static/src/js/widget.js:0
+#, python-format
+msgid "day"
+msgstr "يوم"
+
+#. module: web_widget_time_delta
+#. openerp-web
+#: code:addons/web_widget_time_delta/static/src/js/widget.js:0
+#, python-format
+msgid "days"
+msgstr "ايام"
+
+#. module: web_widget_time_delta
+#. openerp-web
+#: code:addons/web_widget_time_delta/static/src/js/widget.js:0
+#, python-format
+msgid "hour"
+msgstr "ساعة"
+
+#. module: web_widget_time_delta
+#. openerp-web
+#: code:addons/web_widget_time_delta/static/src/js/widget.js:0
+#, python-format
+msgid "hours"
+msgstr "ساعات"
+
+#. module: web_widget_time_delta
+#. openerp-web
+#: code:addons/web_widget_time_delta/static/src/js/widget.js:0
+#, python-format
+msgid "minute"
+msgstr "دقيقة"
+
+#. module: web_widget_time_delta
+#. openerp-web
+#: code:addons/web_widget_time_delta/static/src/js/widget.js:0
+#, python-format
+msgid "minutes"
+msgstr "دقائق"
+
+#. module: web_widget_time_delta
+#. openerp-web
+#: code:addons/web_widget_time_delta/static/src/js/widget.js:0
+#, python-format
+msgid "second"
+msgstr "ثانية"
+
+#. module: web_widget_time_delta
+#. openerp-web
+#: code:addons/web_widget_time_delta/static/src/js/widget.js:0
+#, python-format
+msgid "seconds"
+msgstr "ثواني"
diff --git a/odex25_project/web_widget_time_delta/images/form_view.png b/odex25_project/web_widget_time_delta/images/form_view.png
new file mode 100644
index 000000000..9f063c6f7
Binary files /dev/null and b/odex25_project/web_widget_time_delta/images/form_view.png differ
diff --git a/odex25_project/web_widget_time_delta/images/list_view.png b/odex25_project/web_widget_time_delta/images/list_view.png
new file mode 100644
index 000000000..3b36268cf
Binary files /dev/null and b/odex25_project/web_widget_time_delta/images/list_view.png differ
diff --git a/odex25_project/web_widget_time_delta/static/description/form_view.png b/odex25_project/web_widget_time_delta/static/description/form_view.png
new file mode 100644
index 000000000..9f063c6f7
Binary files /dev/null and b/odex25_project/web_widget_time_delta/static/description/form_view.png differ
diff --git a/odex25_project/web_widget_time_delta/static/description/icon.png b/odex25_project/web_widget_time_delta/static/description/icon.png
new file mode 100644
index 000000000..9f063c6f7
Binary files /dev/null and b/odex25_project/web_widget_time_delta/static/description/icon.png differ
diff --git a/odex25_project/web_widget_time_delta/static/description/index.html b/odex25_project/web_widget_time_delta/static/description/index.html
new file mode 100644
index 000000000..1491e6c72
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/description/index.html
@@ -0,0 +1,80 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">Web Widget field for Form and List</h2>
+        <h3 class="oe_slogan">Humanize duration</h3>
+        <div class="oe_demo oe_picture oe_screenshot">
+            <img src="icon.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>More Info</h2>
+            <p class="oe_mt32">YouTube Video PlayList <a href="https://www.youtube.com/watch?v=9MCIs_-VDmc">Odoo Gantt Native - web widget time delta</a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Demo</h2>
+            <p class="oe_mt32">Live:https://demo14.garage12.eu/ </p>
+            <p class="oe_mt32">user: demo Password:demog </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>The module is used in: </h2>
+            <p class="oe_mt32"> Gantt Project native. <a href="https://apps.odoo.com/apps/modules/14.0/project_native/">Gantt Native view for Projects </a>
+            <p class="oe_mt32"> Gantt MRP. <a href="https://apps.odoo.com/apps/modules/14.0/project_native/">Gantt Native view for MRP - Manufacture </a>
+            <p class="oe_mt32"> Gantt Web View Framework <a href="https://apps.odoo.com/apps/modules/14.0/web_gantt_native/">Gantt Native view for MRP - Manufacture</a>
+            <p class="oe_mt32"> Gantt Leave <a href="https://apps.odoo.com/apps/modules/14.0/hr_holidays_gantt_native/">Gantt Native view for Leave </a>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan" style="color:#875A7B;">in Action</h2>
+
+        <div class="oe_span6">
+            <p class="oe_mt32 oe_mb32 text-justify">
+                Form View
+            </p>
+            <img class="oe_picture oe_screenshot" src="form_view.png"/>
+        </div>
+
+        <div class="oe_span6">
+                        <p class="oe_mt32 oe_mb32 text-justify">
+             List View
+            </p>
+            <img class="oe_picture oe_screenshot" src="list_view.png"/>
+        </div>
+
+
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2>Need our service?</h2>
+            <p class="oe_mt32">Contact us by <a href="mailto:vostraga@gmail.com">email</a>
+            <ul>
+                <li><a href="mailto:vostraga@gmail.com">vostraga@gmail.com <i class="fa fa-envelope-o"></i></a></li>
+            </ul>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_separator">
+</section>
diff --git a/odex25_project/web_widget_time_delta/static/description/list_view.png b/odex25_project/web_widget_time_delta/static/description/list_view.png
new file mode 100644
index 000000000..3b36268cf
Binary files /dev/null and b/odex25_project/web_widget_time_delta/static/description/list_view.png differ
diff --git a/odex25_project/web_widget_time_delta/static/src/css/widget.css b/odex25_project/web_widget_time_delta/static/src/css/widget.css
new file mode 100644
index 000000000..0d6de10ab
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/src/css/widget.css
@@ -0,0 +1,48 @@
+.openerp .oe_form .oe_form_field_time_delta input {
+    width: 100%;
+}
+
+.openerp .oe_form .oe_form_field_delta div {
+    border: 1px solid;
+    display: inline-block;
+    height: 14px;
+    margin-right: 10px;
+    position: relative;
+    top: 3px;
+    width: 40px;
+}
+
+.oe_list_field_time_delta div {
+    border: 1px solid;
+    display: inline-block;
+    height: 14px;
+    margin-right: 10px;
+    position: relative;
+    top: 3px;
+    width: 40px;
+}
+
+.time_delta_box {
+    width: 10px;
+    height: 10px;
+    display: inline-block;
+    margin-right: 5px;
+}
+
+/*.oe_form_field_time_delta .bdp-input input {*/
+    /*display: inline-block;*/
+    /*margin-bottom: 3px;*/
+    /*width: 45px;*/
+/*}*/
+
+.oe_form_field_time_delta .bdp-input .input-sm {
+    height: 30px;
+    padding: 3px 3px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+    display: inline-block;
+    margin-bottom: 3px;
+    width: 50px;
+}
+
diff --git a/odex25_project/web_widget_time_delta/static/src/js/widget.js b/odex25_project/web_widget_time_delta/static/src/js/widget.js
new file mode 100644
index 000000000..2db2bcdef
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/src/js/widget.js
@@ -0,0 +1,171 @@
+odoo.define('web_widget_time_delta.TimeDelta', function (require) {
+    "use strict";
+    var field_registry = require('web.field_registry');
+    var fields = require('web.basic_fields');
+    var FieldProgressBar = fields.FieldProgressBar
+    var utils = require('web.utils');
+
+    var core = require('web.core');
+    var _t = core._t;
+
+    var FieldTimeDelta = fields.FieldChar.extend({
+
+        template: 'FieldTimeDelta',
+        widget_class: 'oe_form_field_time_delta',
+
+        init: function () {
+
+            this._super.apply(this, arguments);
+            this.mask_humanize = undefined;
+            this.showDays = false;
+            this.showSeconds = false;
+
+            if ("mask_humanize_string" in this.nodeOptions) {
+                this.mask_humanize = this.nodeOptions["mask_humanize_string"];
+            }
+
+            if ("mask_humanize_field" in this.nodeOptions) {
+                this.mask_humanize = this.recordData[this.nodeOptions["mask_humanize_field"]];
+            }
+
+            var mask_picker = "";
+            if ("mask_picker_string" in this.nodeOptions) {
+                mask_picker = this.nodeOptions["mask_picker_string"];
+
+                if (mask_picker === "day_second") {
+                    this.showDays = true;
+                    this.showSeconds = true;
+                }
+                if (mask_picker === "day") {
+                    this.showDays = true;
+                }
+                if (mask_picker === "second") {
+                    this.showSeconds = true;
+                }
+            }
+
+            if ("mask_picker_field" in this.nodeOptions) {
+                mask_picker = this.recordData[this.nodeOptions["mask_picker_field"]];
+
+                if (mask_picker === "day_second") {
+                    this.showDays = true;
+                    this.showSeconds = true;
+                }
+                if (mask_picker === "day") {
+                    this.showDays = true;
+                }
+                if (mask_picker === "second") {
+                    this.showSeconds = true;
+                }
+            }
+
+        },
+
+        _renderReadonlyValue: function (value) {
+
+            if (this.mask_humanize) {
+                return humanizeDuration(value * 1000, { units: this.mask_humanize.split(","), round: true });
+            }
+            else {
+                return humanizeDuration(value * 1000);
+            }
+        },
+
+        _renderReadonly: function () {
+            var total = parseInt(this.value, 10);
+            this.$el.text(this._renderReadonlyValue(total));
+        },
+
+        _getValue: function () {
+            var $input = this.$el.find('input');
+            return $input.val();
+        },
+
+        _renderEdit: function () {
+
+            var show_value = parseInt(this.value, 10);
+
+            if (this.hasOwnProperty('$input') && this.$input.data('durationPicker')) {
+                var is_duration = this.$input.data('durationPicker')
+                is_duration.setValue(show_value)
+            }
+            else {
+
+                var $input = this.$el.find('input');
+                $input.val(show_value);
+                var self = this;
+                $input.durationPicker({
+                    translations: {
+                        day: _t('day'),
+                        hour: _t('hour'),
+                        minute: _t('minute'),
+                        second: _t('second'),
+                        days: _t('days'),
+                        hours: _t('hours'),
+                        minutes: _t('minutes'),
+                        seconds: _t('seconds')
+                    },
+
+                    showSeconds: self.showSeconds,
+                    showDays: self.showDays,
+                    onChanged: function (newVal) {
+                        $input.val(newVal);
+                    }
+                });
+                this.$input = $input;
+
+            }
+        },
+
+    });
+
+    field_registry
+        .add('time_delta_list', FieldTimeDelta)
+        .add('time_delta', FieldTimeDelta);
+
+    FieldProgressBar.include({
+        _render_value: function (v) {
+            var value = this.value;
+            var max_value = this.max_value;
+            if (!isNaN(v)) {
+                if (this.edit_max_value) {
+                    max_value = v;
+                } else {
+                    value = v;
+                }
+            }
+            value = value || 0;
+            max_value = max_value || 0;
+
+            var widthComplete;
+            if (value <= max_value) {
+                widthComplete = value / max_value * 100;
+            } else {
+                widthComplete = 100;
+            }
+
+            this.$('.o_progress').toggleClass('o_progress_overflow', value > max_value)
+                .attr('aria-valuemin', '0')
+                .attr('aria-valuemax', max_value)
+                .attr('aria-valuenow', value);
+            this.$('.o_progressbar_complete').css('width', widthComplete + '%');
+
+            if (!this.write_mode) {
+                if (max_value !== 100) {
+                    this.$('.o_progressbar_value').text((value) + " / " + (max_value));
+                } else {
+                    this.$('.o_progressbar_value').text((value) + "%");
+                }
+            } else if (isNaN(v)) {
+                this.$('.o_progressbar_value').val(this.edit_max_value ? max_value : value);
+                this.$('.o_progressbar_value').focus().select();
+            }
+        },
+    });
+    return {
+        FieldTimeDelta: FieldTimeDelta,
+        FieldProgressBar: FieldProgressBar
+    };
+
+
+});
diff --git a/odex25_project/web_widget_time_delta/static/src/lib/duration-humanize/README.md b/odex25_project/web_widget_time_delta/static/src/lib/duration-humanize/README.md
new file mode 100644
index 000000000..c98573ad8
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/src/lib/duration-humanize/README.md
@@ -0,0 +1,280 @@
+Humanize Duration
+=================
+[![npm version](https://badge.fury.io/js/humanize-duration.svg)](https://npmjs.org/package/humanize-duration)
+[![build status](https://travis-ci.org/EvanHahn/HumanizeDuration.js.svg?branch=master)](https://travis-ci.org/EvanHahn/HumanizeDuration.js)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+
+I have the time in milliseconds and I want it to become "30 minutes" or "3 days, 1 hour". Enter Humanize Duration!
+
+**This library is in maintenance mode. New languages and bug fixes will be added but no new features will be. If you're interested in helping out by taking over the project, please see [this GitHub issue](https://github.com/EvanHahn/HumanizeDuration.js/issues/120).**
+
+Basic usage
+-----------
+
+This package is available as *humanize-duration* on [npm](https://www.npmjs.com/package/humanize-duration) and Bower. You can also include the JavaScript file in the browser.
+
+In the browser:
+
+```html
+<script src="humanize-duration.js"></script>
+<script>
+humanizeDuration(12000)
+</script>
+```
+
+In Node (or Browserify or Webpack or anywhere with CommonJS):
+
+```js
+var humanizeDuration = require('humanize-duration')
+humanizeDuration(12000) // '12 seconds'
+```
+
+Usage
+-----
+
+By default, Humanize Duration will humanize down to the second, and will return a decimal for the smallest unit. It will humanize in English by default.
+
+```js
+humanizeDuration(3000)      // '3 seconds'
+humanizeDuration(2250)      // '2.25 seconds'
+humanizeDuration(97320000)  // '1 day, 3 hours, 2 minutes'
+```
+
+### Options
+
+You can change the settings by passing options as the second argument:
+
+**language**
+
+Language for unit display (accepts an [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) from one of the [supported languages](#supported-languages)).
+
+```js
+humanizeDuration(3000, { language: 'es' })  // '3 segundos'
+humanizeDuration(5000, { language: 'ko' })  // '5 초'
+```
+
+**delimiter**
+
+String to display between the previous unit and the next value.
+
+```js
+humanizeDuration(22140000, { delimiter: ' and ' })  // '6 hours and 9 minutes'
+humanizeDuration(22140000, { delimiter: '--' })     // '6 hours--9 minutes'
+```
+
+**spacer**
+
+String to display between each value and unit.
+
+```js
+humanizeDuration(260040000, { spacer: ' whole ' })  // '3 whole days, 14 whole minutes'
+humanizeDuration(260040000, { spacer: '' })         // '3days, 14minutes'
+```
+
+**largest**
+
+Number representing the maximum number of units to display for the duration.
+
+```js
+humanizeDuration(1000000000000)                  // '31 years, 8 months, 1 week, 19 hours, 46 minutes, 40 seconds'
+humanizeDuration(1000000000000, { largest: 2 })  // '31 years, 8 month'
+```
+
+**units**
+
+Array of strings to define which units are used to display the duration (if needed). Can be one, or a combination of any, of the following: `['y', 'mo', 'w', 'd', 'h', 'm', 's', 'ms']`
+
+```js
+humanizeDuration(3600000, { units: ['h'] })       // '1 hour'
+humanizeDuration(3600000, { units: ['m'] })       // '60 minutes'
+humanizeDuration(3600000, { units: ['d', 'h'] })  // '1 hour'
+```
+
+**round**
+
+Boolean value. Use `true` to [round](https://en.wikipedia.org/wiki/Rounding#Round_half_up) the smallest unit displayed (can be combined with `largest` and `units`).
+
+```js
+humanizeDuration(1200)                   // '1.2 seconds'
+humanizeDuration(1200, { round: true })  // '1 second'
+humanizeDuration(1600, { round: true })  // '2 seconds'
+```
+
+**decimal**
+
+String to substitute for the decimal point in a decimal fraction.
+
+```js
+humanizeDuration(1200)                          // '1.2 seconds'
+humanizeDuration(1200, { decimal: ' point ' })  // '1 point 2 seconds'
+```
+
+**conjunction**
+
+String to include before the final unit. You can also set `serialComma` to `false` to eliminate the final comma.
+
+```js
+humanizeDuration(22140000, { conjunction: ' and ' })                      // '6 hours and 9 minutes'
+humanizeDuration(22141000, { conjunction: ' and ' })                      // '6 hours, 9 minutes, and 1 second'
+humanizeDuration(22140000, { conjunction: ' and ', serialComma: false })  // '6 hours and 9 minutes'
+humanizeDuration(22141000, { conjunction: ' and ', serialComma: false })  // '6 hours, 9 minutes and 1 second'
+```
+
+**unitMeasures**
+
+Customize the value used to calculate each unit of time.
+
+```js
+humanizeDuration(400)    // '0.4 seconds'
+humanizeDuration(400, {  // '1 year, 1 month, 5 days'
+  unitMeasures: {
+    y: 365,
+    mo: 30,
+    w: 7,
+    d: 1
+  }
+})
+```
+
+**Combined example**
+
+```js
+humanizeDuration(3602000, {
+  language: 'es',
+  round: true,
+  spacer: ' glorioso ',
+  units: ['m']
+}) // '60 glorioso minutos'
+```
+
+### Humanizers
+
+If you find yourself setting same options over and over again, you can create a *humanizer* that changes the defaults, which you can still override later.
+
+```js
+var spanishHumanizer = humanizeDuration.humanizer({
+  language: 'es',
+  units: ['y', 'mo', 'd']
+})
+
+spanishHumanizer(71177400000)  // '2 años, 3 meses, 2 días'
+spanishHumanizer(71177400000, { units: ['d', 'h'] })  // '823 días, 19.5 horas'
+```
+
+You can also add new languages to humanizers. For example:
+
+```js
+var shortEnglishHumanizer = humanizeDuration.humanizer({
+  language: 'shortEn',
+  languages: {
+    shortEn: {
+      y: function() { return 'y' },
+      mo: function() { return 'mo' },
+      w: function() { return 'w' },
+      d: function() { return 'd' },
+      h: function() { return 'h' },
+      m: function() { return 'm' },
+      s: function() { return 's' },
+      ms: function() { return 'ms' },
+    }
+  }
+})
+
+shortEnglishHumanizer(15600000)  // '4 h, 20 m'
+```
+
+You can also add languages after initializing:
+
+```js
+var humanizer = humanizeDuration.humanizer()
+
+humanizer.languages.shortEn = {
+  y: function(c) { return c + 'y' },
+  // ...
+```
+
+Internally, the main `humanizeDuration` function is just a wrapper around a humanizer.
+
+Supported languages
+-------------------
+
+Humanize Duration supports the following languages:
+
+| Language             | Code    |
+|----------------------|---------|
+| Arabic               | `ar`    |
+| Bulgarian            | `bg`    |
+| Catalan              | `ca`    |
+| Chinese, simplified  | `zh_CN` |
+| Chinese, traditional | `zh_TW` |
+| Czech                | `cs`    |
+| Danish               | `da`    |
+| Dutch                | `nl`    |
+| English              | `en`    |
+| Farsi/Persian        | `fa`    |
+| Finnish              | `fi`    |
+| French               | `fr`    |
+| German               | `de`    |
+| Greek                | `gr`    |
+| Hungarian            | `hu`    |
+| Icelandic            | `is`    |
+| Indonesian           | `id`    |
+| Italian              | `it`    |
+| Japanese             | `ja`    |
+| Korean               | `ko`    |
+| Lithuanian           | `lt`    |
+| Malay                | `ms`    |
+| Norwegian            | `no`    |
+| Polish               | `pl`    |
+| Portuguese           | `pt`    |
+| Russian              | `ru`    |
+| Spanish              | `es`    |
+| Swedish              | `sv`    |
+| Turkish              | `tr`    |
+| Ukrainian            | `uk`    |
+| Vietnamese           | `vi`    |
+
+For a list of supported languages, you can use the `getSupportedLanguages` function.
+
+```js
+humanizeDuration.getSupportedLanguages()
+// ['ar', 'bg', 'ca', 'cs', da', 'de', ...]
+```
+
+This function won't return any new languages you define; it will only return the defaults supported by the library.
+
+Credits
+-------
+
+Lovingly made by [Evan Hahn](http://evanhahn.com/) with help from:
+
+* [Martin Prins](https://github.com/magarcia) for language support
+* [Filipi Siqueira](https://github.com/filipi777) for Portuguese support
+* [Peter Rekdal Sunde](https://github.com/peters) for Norwegian support
+* [Michał Janiec](https://github.com/mjjaniec) for Polish support
+* [Eileen Li](https://github.com/eileen3) for Chinese support
+* [Tommy Brunn](https://github.com/Nevon) for Swedish support
+* [Giovanni Pellerano](https://github.com/evilaliv3) for Italian support
+* [Rahma Sghaier](https://twitter.com/sghaierrahma) for Arabic support
+* [Evgenios Kastanias](https://github.com/evgenios) for Greek support
+* [Oleksii Mylotskyi](https://github.com/spalax) for Ukrainian support
+* [Patrik Simek](https://github.com/patriksimek) for Czech support
+* [Toni Helminen](https://github.com/tonihelminen) for Finnish support
+* [Vidmantas Drasutis](https://github.com/Drasius2) for Lithuanian support
+* [Manh Tuan](https://github.com/J2TeaM) for Vietnamese support
+* [Leonard Lee](https://github.com/sheeeng) for Indonesian & Malay support
+* [Jesse Jackson](https://github.com/jsejcksn) for documentation help
+* [Óli Tómas Freysson](https://github.com/olitomas) for Icelandic support
+* [Saeed Ganji](https://github.com/shahabganji) for Farsi/Persian support
+* [Caner Elci](https://github.com/canerelci) for Bulgarian support
+
+Licensed under the permissive [Unlicense](https://unlicense.org/). Enjoy!
+
+Related modules
+---------------
+
+* [pretty-ms](https://github.com/sindresorhus/pretty-ms)
+* [angularjs-humanize-duration](https://github.com/sebastianhaas/angularjs-humanize-duration)
+* [millisec](https://github.com/sungwoncho/millisec)
+* [HumanizeDuration.ts](https://github.com/Nightapes/HumanizeDuration.ts), a TypeScript version of this module
+* [aurelia-time](https://github.com/shahabganji/aurelia-time)
diff --git a/odex25_project/web_widget_time_delta/static/src/lib/duration-humanize/humanize-duration.js b/odex25_project/web_widget_time_delta/static/src/lib/duration-humanize/humanize-duration.js
new file mode 100644
index 000000000..8c7d2bbd1
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/src/lib/duration-humanize/humanize-duration.js
@@ -0,0 +1,736 @@
+// HumanizeDuration.js - https://git.io/j0HgmQ
+
+;(function () {
+  // This has to be defined separately because of a bug: we want to alias
+  // `gr` and `el` for backwards-compatiblity. In a breaking change, we can
+  // remove `gr` entirely.
+  // See https://github.com/EvanHahn/HumanizeDuration.js/issues/143 for more.
+  var greek = {
+    y: function (c) { return c === 1 ? 'χρόνος' : 'χρόνια' },
+    mo: function (c) { return c === 1 ? 'μήνας' : 'μήνες' },
+    w: function (c) { return c === 1 ? 'εβδομάδα' : 'εβδομάδες' },
+    d: function (c) { return c === 1 ? 'μέρα' : 'μέρες' },
+    h: function (c) { return c === 1 ? 'ώρα' : 'ώρες' },
+    m: function (c) { return c === 1 ? 'λεπτό' : 'λεπτά' },
+    s: function (c) { return c === 1 ? 'δευτερόλεπτο' : 'δευτερόλεπτα' },
+    ms: function (c) { return c === 1 ? 'χιλιοστό του δευτερολέπτου' : 'χιλιοστά του δευτερολέπτου' },
+    decimal: ','
+  }
+
+  var languages = {
+    ar: {
+      y: function (c) { return c === 1 ? 'سنة' : 'سنوات' },
+      mo: function (c) { return c === 1 ? 'شهر' : 'أشهر' },
+      w: function (c) { return c === 1 ? 'أسبوع' : 'أسابيع' },
+      d: function (c) { return c === 1 ? 'يوم' : 'أيام' },
+      h: function (c) { return c === 1 ? 'ساعة' : 'ساعات' },
+      m: function (c) {
+        return ['دقيقة', 'دقائق'][getArabicForm(c)]
+      },
+      s: function (c) { return c === 1 ? 'ثانية' : 'ثواني' },
+      ms: function (c) { return c === 1 ? 'جزء من الثانية' : 'أجزاء من الثانية' },
+      decimal: ','
+    },
+    bg: {
+      y: function (c) { return ['години', 'година', 'години'][getSlavicForm(c)] },
+      mo: function (c) { return ['месеца', 'месец', 'месеца'][getSlavicForm(c)] },
+      w: function (c) { return ['седмици', 'седмица', 'седмици'][getSlavicForm(c)] },
+      d: function (c) { return ['дни', 'ден', 'дни'][getSlavicForm(c)] },
+      h: function (c) { return ['часа', 'час', 'часа'][getSlavicForm(c)] },
+      m: function (c) { return ['минути', 'минута', 'минути'][getSlavicForm(c)] },
+      s: function (c) { return ['секунди', 'секунда', 'секунди'][getSlavicForm(c)] },
+      ms: function (c) { return ['милисекунди', 'милисекунда', 'милисекунди'][getSlavicForm(c)] },
+      decimal: ','
+    },
+    ca: {
+      y: function (c) { return 'any' + (c === 1 ? '' : 's') },
+      mo: function (c) { return 'mes' + (c === 1 ? '' : 'os') },
+      w: function (c) { return 'setman' + (c === 1 ? 'a' : 'es') },
+      d: function (c) { return 'di' + (c === 1 ? 'a' : 'es') },
+      h: function (c) { return 'hor' + (c === 1 ? 'a' : 'es') },
+      m: function (c) { return 'minut' + (c === 1 ? '' : 's') },
+      s: function (c) { return 'segon' + (c === 1 ? '' : 's') },
+      ms: function (c) { return 'milisegon' + (c === 1 ? '' : 's') },
+      decimal: ','
+    },
+    cs: {
+      y: function (c) { return ['rok', 'roku', 'roky', 'let'][getCzechOrSlovakForm(c)] },
+      mo: function (c) { return ['měsíc', 'měsíce', 'měsíce', 'měsíců'][getCzechOrSlovakForm(c)] },
+      w: function (c) { return ['týden', 'týdne', 'týdny', 'týdnů'][getCzechOrSlovakForm(c)] },
+      d: function (c) { return ['den', 'dne', 'dny', 'dní'][getCzechOrSlovakForm(c)] },
+      h: function (c) { return ['hodina', 'hodiny', 'hodiny', 'hodin'][getCzechOrSlovakForm(c)] },
+      m: function (c) { return ['minuta', 'minuty', 'minuty', 'minut'][getCzechOrSlovakForm(c)] },
+      s: function (c) { return ['sekunda', 'sekundy', 'sekundy', 'sekund'][getCzechOrSlovakForm(c)] },
+      ms: function (c) { return ['milisekunda', 'milisekundy', 'milisekundy', 'milisekund'][getCzechOrSlovakForm(c)] },
+      decimal: ','
+    },
+    da: {
+      y: 'år',
+      mo: function (c) { return 'måned' + (c === 1 ? '' : 'er') },
+      w: function (c) { return 'uge' + (c === 1 ? '' : 'r') },
+      d: function (c) { return 'dag' + (c === 1 ? '' : 'e') },
+      h: function (c) { return 'time' + (c === 1 ? '' : 'r') },
+      m: function (c) { return 'minut' + (c === 1 ? '' : 'ter') },
+      s: function (c) { return 'sekund' + (c === 1 ? '' : 'er') },
+      ms: function (c) { return 'millisekund' + (c === 1 ? '' : 'er') },
+      decimal: ','
+    },
+    de: {
+      y: function (c) { return 'Jahr' + (c === 1 ? '' : 'e') },
+      mo: function (c) { return 'Monat' + (c === 1 ? '' : 'e') },
+      w: function (c) { return 'Woche' + (c === 1 ? '' : 'n') },
+      d: function (c) { return 'Tag' + (c === 1 ? '' : 'e') },
+      h: function (c) { return 'Stunde' + (c === 1 ? '' : 'n') },
+      m: function (c) { return 'Minute' + (c === 1 ? '' : 'n') },
+      s: function (c) { return 'Sekunde' + (c === 1 ? '' : 'n') },
+      ms: function (c) { return 'Millisekunde' + (c === 1 ? '' : 'n') },
+      decimal: ','
+    },
+    el: greek,
+    en: {
+      y: function (c) { return 'year' + (c === 1 ? '' : 's') },
+      mo: function (c) { return 'month' + (c === 1 ? '' : 's') },
+      w: function (c) { return 'week' + (c === 1 ? '' : 's') },
+      d: function (c) { return 'day' + (c === 1 ? '' : 's') },
+      h: function (c) { return 'hour' + (c === 1 ? '' : 's') },
+      m: function (c) { return 'minute' + (c === 1 ? '' : 's') },
+      s: function (c) { return 'second' + (c === 1 ? '' : 's') },
+      ms: function (c) { return 'millisecond' + (c === 1 ? '' : 's') },
+      decimal: '.'
+    },
+    es: {
+      y: function (c) { return 'año' + (c === 1 ? '' : 's') },
+      mo: function (c) { return 'mes' + (c === 1 ? '' : 'es') },
+      w: function (c) { return 'semana' + (c === 1 ? '' : 's') },
+      d: function (c) { return 'día' + (c === 1 ? '' : 's') },
+      h: function (c) { return 'hora' + (c === 1 ? '' : 's') },
+      m: function (c) { return 'minuto' + (c === 1 ? '' : 's') },
+      s: function (c) { return 'segundo' + (c === 1 ? '' : 's') },
+      ms: function (c) { return 'milisegundo' + (c === 1 ? '' : 's') },
+      decimal: ','
+    },
+    fa: {
+      y: 'سال',
+      mo: 'ماه',
+      w: 'هفته',
+      d: 'روز',
+      h: 'ساعت',
+      m: 'دقیقه',
+      s: 'ثانیه',
+      ms: 'میلی ثانیه',
+      decimal: '.'
+    },
+    fi: {
+      y: function (c) { return c === 1 ? 'vuosi' : 'vuotta' },
+      mo: function (c) { return c === 1 ? 'kuukausi' : 'kuukautta' },
+      w: function (c) { return 'viikko' + (c === 1 ? '' : 'a') },
+      d: function (c) { return 'päivä' + (c === 1 ? '' : 'ä') },
+      h: function (c) { return 'tunti' + (c === 1 ? '' : 'a') },
+      m: function (c) { return 'minuutti' + (c === 1 ? '' : 'a') },
+      s: function (c) { return 'sekunti' + (c === 1 ? '' : 'a') },
+      ms: function (c) { return 'millisekunti' + (c === 1 ? '' : 'a') },
+      decimal: ','
+    },
+    fr: {
+      y: function (c) { return 'an' + (c >= 2 ? 's' : '') },
+      mo: 'mois',
+      w: function (c) { return 'semaine' + (c >= 2 ? 's' : '') },
+      d: function (c) { return 'jour' + (c >= 2 ? 's' : '') },
+      h: function (c) { return 'heure' + (c >= 2 ? 's' : '') },
+      m: function (c) { return 'minute' + (c >= 2 ? 's' : '') },
+      s: function (c) { return 'seconde' + (c >= 2 ? 's' : '') },
+      ms: function (c) { return 'milliseconde' + (c >= 2 ? 's' : '') },
+      decimal: ','
+    },
+    gr: greek,
+    hr: {
+      y: function (c) {
+        if (c % 10 === 2 || c % 10 === 3 || c % 10 === 4) {
+          return 'godine'
+        }
+        return 'godina'
+      },
+      mo: function (c) {
+        if (c === 1) {
+          return 'mjesec'
+        } else if (c === 2 || c === 3 || c === 4) {
+          return 'mjeseca'
+        }
+        return 'mjeseci'
+      },
+      w: function (c) {
+        if (c % 10 === 1 && c !== 11) {
+          return 'tjedan'
+        }
+        return 'tjedna'
+      },
+      d: function (c) { return c === 1 ? 'dan' : 'dana' },
+      h: function (c) {
+        if (c === 1) {
+          return 'sat'
+        } else if (c === 2 || c === 3 || c === 4) {
+          return 'sata'
+        }
+        return 'sati'
+      },
+      m: function (c) {
+        var mod10 = c % 10
+        if ((mod10 === 2 || mod10 === 3 || mod10 === 4) && (c < 10 || c > 14)) {
+          return 'minute'
+        }
+        return 'minuta'
+      },
+      s: function (c) {
+        if ((c === 10 || c === 11 || c === 12 || c === 13 || c === 14 || c === 16 || c === 17 || c === 18 || c === 19) || (c % 10 === 5)) {
+          return 'sekundi'
+        } else if (c % 10 === 1) {
+          return 'sekunda'
+        } else if (c % 10 === 2 || c % 10 === 3 || c % 10 === 4) {
+          return 'sekunde'
+        }
+        return 'sekundi'
+      },
+      ms: function (c) {
+        if (c === 1) {
+          return 'milisekunda'
+        } else if (c % 10 === 2 || c % 10 === 3 || c % 10 === 4) {
+          return 'milisekunde'
+        }
+        return 'milisekundi'
+      },
+      decimal: ','
+    },
+    hu: {
+      y: 'év',
+      mo: 'hónap',
+      w: 'hét',
+      d: 'nap',
+      h: 'óra',
+      m: 'perc',
+      s: 'másodperc',
+      ms: 'ezredmásodperc',
+      decimal: ','
+    },
+    id: {
+      y: 'tahun',
+      mo: 'bulan',
+      w: 'minggu',
+      d: 'hari',
+      h: 'jam',
+      m: 'menit',
+      s: 'detik',
+      ms: 'milidetik',
+      decimal: '.'
+    },
+    is: {
+      y: 'ár',
+      mo: function (c) { return 'mánuð' + (c === 1 ? 'ur' : 'ir') },
+      w: function (c) { return 'vik' + (c === 1 ? 'a' : 'ur') },
+      d: function (c) { return 'dag' + (c === 1 ? 'ur' : 'ar') },
+      h: function (c) { return 'klukkutím' + (c === 1 ? 'i' : 'ar') },
+      m: function (c) { return 'mínút' + (c === 1 ? 'a' : 'ur') },
+      s: function (c) { return 'sekúnd' + (c === 1 ? 'a' : 'ur') },
+      ms: function (c) { return 'millisekúnd' + (c === 1 ? 'a' : 'ur') },
+      decimal: '.'
+    },
+    it: {
+      y: function (c) { return 'ann' + (c === 1 ? 'o' : 'i') },
+      mo: function (c) { return 'mes' + (c === 1 ? 'e' : 'i') },
+      w: function (c) { return 'settiman' + (c === 1 ? 'a' : 'e') },
+      d: function (c) { return 'giorn' + (c === 1 ? 'o' : 'i') },
+      h: function (c) { return 'or' + (c === 1 ? 'a' : 'e') },
+      m: function (c) { return 'minut' + (c === 1 ? 'o' : 'i') },
+      s: function (c) { return 'second' + (c === 1 ? 'o' : 'i') },
+      ms: function (c) { return 'millisecond' + (c === 1 ? 'o' : 'i') },
+      decimal: ','
+    },
+    ja: {
+      y: '年',
+      mo: '月',
+      w: '週',
+      d: '日',
+      h: '時間',
+      m: '分',
+      s: '秒',
+      ms: 'ミリ秒',
+      decimal: '.'
+    },
+    ko: {
+      y: '년',
+      mo: '개월',
+      w: '주일',
+      d: '일',
+      h: '시간',
+      m: '분',
+      s: '초',
+      ms: '밀리 초',
+      decimal: '.'
+    },
+    lo: {
+      y: 'ປີ',
+      mo: 'ເດືອນ',
+      w: 'ອາທິດ',
+      d: 'ມື້',
+      h: 'ຊົ່ວໂມງ',
+      m: 'ນາທີ',
+      s: 'ວິນາທີ',
+      ms: 'ມິນລິວິນາທີ',
+      decimal: ','
+    },
+    lt: {
+      y: function (c) { return ((c % 10 === 0) || (c % 100 >= 10 && c % 100 <= 20)) ? 'metų' : 'metai' },
+      mo: function (c) { return ['mėnuo', 'mėnesiai', 'mėnesių'][getLithuanianForm(c)] },
+      w: function (c) { return ['savaitė', 'savaitės', 'savaičių'][getLithuanianForm(c)] },
+      d: function (c) { return ['diena', 'dienos', 'dienų'][getLithuanianForm(c)] },
+      h: function (c) { return ['valanda', 'valandos', 'valandų'][getLithuanianForm(c)] },
+      m: function (c) { return ['minutė', 'minutės', 'minučių'][getLithuanianForm(c)] },
+      s: function (c) { return ['sekundė', 'sekundės', 'sekundžių'][getLithuanianForm(c)] },
+      ms: function (c) { return ['milisekundė', 'milisekundės', 'milisekundžių'][getLithuanianForm(c)] },
+      decimal: ','
+    },
+    ms: {
+      y: 'tahun',
+      mo: 'bulan',
+      w: 'minggu',
+      d: 'hari',
+      h: 'jam',
+      m: 'minit',
+      s: 'saat',
+      ms: 'milisaat',
+      decimal: '.'
+    },
+    nl: {
+      y: 'jaar',
+      mo: function (c) { return c === 1 ? 'maand' : 'maanden' },
+      w: function (c) { return c === 1 ? 'week' : 'weken' },
+      d: function (c) { return c === 1 ? 'dag' : 'dagen' },
+      h: 'uur',
+      m: function (c) { return c === 1 ? 'minuut' : 'minuten' },
+      s: function (c) { return c === 1 ? 'seconde' : 'seconden' },
+      ms: function (c) { return c === 1 ? 'milliseconde' : 'milliseconden' },
+      decimal: ','
+    },
+    no: {
+      y: 'år',
+      mo: function (c) { return 'måned' + (c === 1 ? '' : 'er') },
+      w: function (c) { return 'uke' + (c === 1 ? '' : 'r') },
+      d: function (c) { return 'dag' + (c === 1 ? '' : 'er') },
+      h: function (c) { return 'time' + (c === 1 ? '' : 'r') },
+      m: function (c) { return 'minutt' + (c === 1 ? '' : 'er') },
+      s: function (c) { return 'sekund' + (c === 1 ? '' : 'er') },
+      ms: function (c) { return 'millisekund' + (c === 1 ? '' : 'er') },
+      decimal: ','
+    },
+    pl: {
+      y: function (c) { return ['rok', 'roku', 'lata', 'lat'][getPolishForm(c)] },
+      mo: function (c) { return ['miesiąc', 'miesiąca', 'miesiące', 'miesięcy'][getPolishForm(c)] },
+      w: function (c) { return ['tydzień', 'tygodnia', 'tygodnie', 'tygodni'][getPolishForm(c)] },
+      d: function (c) { return ['dzień', 'dnia', 'dni', 'dni'][getPolishForm(c)] },
+      h: function (c) { return ['godzina', 'godziny', 'godziny', 'godzin'][getPolishForm(c)] },
+      m: function (c) { return ['minuta', 'minuty', 'minuty', 'minut'][getPolishForm(c)] },
+      s: function (c) { return ['sekunda', 'sekundy', 'sekundy', 'sekund'][getPolishForm(c)] },
+      ms: function (c) { return ['milisekunda', 'milisekundy', 'milisekundy', 'milisekund'][getPolishForm(c)] },
+      decimal: ','
+    },
+    pt: {
+      y: function (c) { return 'ano' + (c === 1 ? '' : 's') },
+      mo: function (c) { return c === 1 ? 'mês' : 'meses' },
+      w: function (c) { return 'semana' + (c === 1 ? '' : 's') },
+      d: function (c) { return 'dia' + (c === 1 ? '' : 's') },
+      h: function (c) { return 'hora' + (c === 1 ? '' : 's') },
+      m: function (c) { return 'minuto' + (c === 1 ? '' : 's') },
+      s: function (c) { return 'segundo' + (c === 1 ? '' : 's') },
+      ms: function (c) { return 'milissegundo' + (c === 1 ? '' : 's') },
+      decimal: ','
+    },
+    ro: {
+      y: function (c) { return c === 1 ? 'an' : 'ani' },
+      mo: function (c) { return c === 1 ? 'lună' : 'luni' },
+      w: function (c) { return c === 1 ? 'săptămână' : 'săptămâni' },
+      d: function (c) { return c === 1 ? 'zi' : 'zile' },
+      h: function (c) { return c === 1 ? 'oră' : 'ore' },
+      m: function (c) { return c === 1 ? 'minut' : 'minute' },
+      s: function (c) { return c === 1 ? 'secundă' : 'secunde' },
+      ms: function (c) { return c === 1 ? 'milisecundă' : 'milisecunde' },
+      decimal: ','
+    },
+    ru: {
+      y: function (c) { return ['лет', 'год', 'года'][getSlavicForm(c)] },
+      mo: function (c) { return ['месяцев', 'месяц', 'месяца'][getSlavicForm(c)] },
+      w: function (c) { return ['недель', 'неделя', 'недели'][getSlavicForm(c)] },
+      d: function (c) { return ['дней', 'день', 'дня'][getSlavicForm(c)] },
+      h: function (c) { return ['часов', 'час', 'часа'][getSlavicForm(c)] },
+      m: function (c) { return ['минут', 'минута', 'минуты'][getSlavicForm(c)] },
+      s: function (c) { return ['секунд', 'секунда', 'секунды'][getSlavicForm(c)] },
+      ms: function (c) { return ['миллисекунд', 'миллисекунда', 'миллисекунды'][getSlavicForm(c)] },
+      decimal: ','
+    },
+    uk: {
+      y: function (c) { return ['років', 'рік', 'роки'][getSlavicForm(c)] },
+      mo: function (c) { return ['місяців', 'місяць', 'місяці'][getSlavicForm(c)] },
+      w: function (c) { return ['тижнів', 'тиждень', 'тижні'][getSlavicForm(c)] },
+      d: function (c) { return ['днів', 'день', 'дні'][getSlavicForm(c)] },
+      h: function (c) { return ['годин', 'година', 'години'][getSlavicForm(c)] },
+      m: function (c) { return ['хвилин', 'хвилина', 'хвилини'][getSlavicForm(c)] },
+      s: function (c) { return ['секунд', 'секунда', 'секунди'][getSlavicForm(c)] },
+      ms: function (c) { return ['мілісекунд', 'мілісекунда', 'мілісекунди'][getSlavicForm(c)] },
+      decimal: ','
+    },
+    ur: {
+      y: 'سال',
+      mo: function (c) { return c === 1 ? 'مہینہ' : 'مہینے' },
+      w: function (c) { return c === 1 ? 'ہفتہ' : 'ہفتے' },
+      d: 'دن',
+      h: function (c) { return c === 1 ? 'گھنٹہ' : 'گھنٹے' },
+      m: 'منٹ',
+      s: 'سیکنڈ',
+      ms: 'ملی سیکنڈ',
+      decimal: '.'
+    },
+    sk: {
+      y: function (c) { return ['rok', 'roky', 'roky', 'rokov'][getCzechOrSlovakForm(c)] },
+      mo: function (c) { return ['mesiac', 'mesiace', 'mesiace', 'mesiacov'][getCzechOrSlovakForm(c)] },
+      w: function (c) { return ['týždeň', 'týždne', 'týždne', 'týždňov'][getCzechOrSlovakForm(c)] },
+      d: function (c) { return ['deň', 'dni', 'dni', 'dní'][getCzechOrSlovakForm(c)] },
+      h: function (c) { return ['hodina', 'hodiny', 'hodiny', 'hodín'][getCzechOrSlovakForm(c)] },
+      m: function (c) { return ['minúta', 'minúty', 'minúty', 'minút'][getCzechOrSlovakForm(c)] },
+      s: function (c) { return ['sekunda', 'sekundy', 'sekundy', 'sekúnd'][getCzechOrSlovakForm(c)] },
+      ms: function (c) { return ['milisekunda', 'milisekundy', 'milisekundy', 'milisekúnd'][getCzechOrSlovakForm(c)] },
+      decimal: ','
+    },
+    sv: {
+      y: 'år',
+      mo: function (c) { return 'månad' + (c === 1 ? '' : 'er') },
+      w: function (c) { return 'veck' + (c === 1 ? 'a' : 'or') },
+      d: function (c) { return 'dag' + (c === 1 ? '' : 'ar') },
+      h: function (c) { return 'timm' + (c === 1 ? 'e' : 'ar') },
+      m: function (c) { return 'minut' + (c === 1 ? '' : 'er') },
+      s: function (c) { return 'sekund' + (c === 1 ? '' : 'er') },
+      ms: function (c) { return 'millisekund' + (c === 1 ? '' : 'er') },
+      decimal: ','
+    },
+    tr: {
+      y: 'yıl',
+      mo: 'ay',
+      w: 'hafta',
+      d: 'gün',
+      h: 'saat',
+      m: 'dakika',
+      s: 'saniye',
+      ms: 'milisaniye',
+      decimal: ','
+    },
+    th: {
+      y: 'ปี',
+      mo: 'เดือน',
+      w: 'อาทิตย์',
+      d: 'วัน',
+      h: 'ชั่วโมง',
+      m: 'นาที',
+      s: 'วินาที',
+      ms: 'มิลลิวินาที',
+      decimal: '.'
+    },
+    vi: {
+      y: 'năm',
+      mo: 'tháng',
+      w: 'tuần',
+      d: 'ngày',
+      h: 'giờ',
+      m: 'phút',
+      s: 'giây',
+      ms: 'mili giây',
+      decimal: ','
+    },
+    zh_CN: {
+      y: '年',
+      mo: '个月',
+      w: '周',
+      d: '天',
+      h: '小时',
+      m: '分钟',
+      s: '秒',
+      ms: '毫秒',
+      decimal: '.'
+    },
+    zh_TW: {
+      y: '年',
+      mo: '個月',
+      w: '周',
+      d: '天',
+      h: '小時',
+      m: '分鐘',
+      s: '秒',
+      ms: '毫秒',
+      decimal: '.'
+    }
+  }
+
+  // You can create a humanizer, which returns a function with default
+  // parameters.
+  function humanizer (passedOptions) {
+    var result = function humanizer (ms, humanizerOptions) {
+      var options = extend({}, result, humanizerOptions || {})
+      return doHumanization(ms, options)
+    }
+
+    return extend(result, {
+      language: 'en',
+      delimiter: ', ',
+      spacer: ' ',
+      conjunction: '',
+      serialComma: true,
+      units: ['y', 'mo', 'w', 'd', 'h', 'm', 's'],
+      languages: {},
+      round: false,
+      unitMeasures: {
+        y: 31557600000,
+        mo: 2629800000,
+        w: 604800000,
+        d: 86400000,
+        h: 3600000,
+        m: 60000,
+        s: 1000,
+        ms: 1
+      }
+    }, passedOptions)
+  }
+
+  // The main function is just a wrapper around a default humanizer.
+  var humanizeDuration = humanizer({})
+
+  // Build dictionary from options
+  function getDictionary (options) {
+    var languagesFromOptions = [options.language]
+
+    if (options.hasOwnProperty('fallbacks')) {
+      if (isArray(options.fallbacks) && options.fallbacks.length) {
+        languagesFromOptions = languagesFromOptions.concat(options.fallbacks)
+      } else {
+        throw new Error('fallbacks must be an array with at least one element')
+      }
+    }
+
+    for (var i = 0; i < languagesFromOptions.length; i++) {
+      var languageToTry = languagesFromOptions[i]
+      if (options.languages.hasOwnProperty(languageToTry)) {
+        return options.languages[languageToTry]
+      } else if (languages.hasOwnProperty(languageToTry)) {
+        return languages[languageToTry]
+      }
+    }
+
+    throw new Error('No language found.')
+  }
+
+  // doHumanization does the bulk of the work.
+  function doHumanization (ms, options) {
+    var i, len, piece
+
+    // Make sure we have a positive number.
+    // Has the nice sideffect of turning Number objects into primitives.
+    ms = Math.abs(ms)
+
+    var dictionary = getDictionary(options)
+    var pieces = []
+
+    // Start at the top and keep removing units, bit by bit.
+    var unitName, unitMS, unitCount
+    for (i = 0, len = options.units.length; i < len; i++) {
+      unitName = options.units[i]
+      unitMS = options.unitMeasures[unitName]
+
+      // What's the number of full units we can fit?
+      if (i + 1 === len) {
+        if (options.hasOwnProperty('maxDecimalPoints')) {
+          // We need to use this expValue to avoid rounding functionality of toFixed call
+          var expValue = Math.pow(10, options.maxDecimalPoints)
+          var unitCountFloat = (ms / unitMS)
+          unitCount = parseFloat((Math.floor(expValue * unitCountFloat) / expValue).toFixed(options.maxDecimalPoints))
+        } else {
+          unitCount = ms / unitMS
+        }
+      } else {
+        unitCount = Math.floor(ms / unitMS)
+      }
+
+      // Add the string.
+      pieces.push({
+        unitCount: unitCount,
+        unitName: unitName
+      })
+
+      // Remove what we just figured out.
+      ms -= unitCount * unitMS
+    }
+
+    var firstOccupiedUnitIndex = 0
+    for (i = 0; i < pieces.length; i++) {
+      if (pieces[i].unitCount) {
+        firstOccupiedUnitIndex = i
+        break
+      }
+    }
+
+    if (options.round) {
+      var ratioToLargerUnit, previousPiece
+      for (i = pieces.length - 1; i >= 0; i--) {
+        piece = pieces[i]
+        piece.unitCount = Math.round(piece.unitCount)
+
+        if (i === 0) { break }
+
+        previousPiece = pieces[i - 1]
+
+        ratioToLargerUnit = options.unitMeasures[previousPiece.unitName] / options.unitMeasures[piece.unitName]
+        if ((piece.unitCount % ratioToLargerUnit) === 0 || (options.largest && ((options.largest - 1) < (i - firstOccupiedUnitIndex)))) {
+          previousPiece.unitCount += piece.unitCount / ratioToLargerUnit
+          piece.unitCount = 0
+        }
+      }
+    }
+
+    var result = []
+    for (i = 0, pieces.length; i < len; i++) {
+      piece = pieces[i]
+      if (piece.unitCount) {
+        result.push(render(piece.unitCount, piece.unitName, dictionary, options))
+      }
+
+      if (result.length === options.largest) { break }
+    }
+
+    if (result.length) {
+      if (!options.conjunction || result.length === 1) {
+        return result.join(options.delimiter)
+      } else if (result.length === 2) {
+        return result.join(options.conjunction)
+      } else if (result.length > 2) {
+        return result.slice(0, -1).join(options.delimiter) + (options.serialComma ? ',' : '') + options.conjunction + result.slice(-1)
+      }
+    } else {
+      return render(0, options.units[options.units.length - 1], dictionary, options)
+    }
+  }
+
+  function render (count, type, dictionary, options) {
+    var decimal
+    if (options.decimal === void 0) {
+      decimal = dictionary.decimal
+    } else {
+      decimal = options.decimal
+    }
+
+    var countStr = count.toString().replace('.', decimal)
+
+    var dictionaryValue = dictionary[type]
+    var word
+    if (typeof dictionaryValue === 'function') {
+      word = dictionaryValue(count)
+    } else {
+      word = dictionaryValue
+    }
+
+    return countStr + options.spacer + word
+  }
+
+  function extend (destination) {
+    var source
+    for (var i = 1; i < arguments.length; i++) {
+      source = arguments[i]
+      for (var prop in source) {
+        if (source.hasOwnProperty(prop)) {
+          destination[prop] = source[prop]
+        }
+      }
+    }
+    return destination
+  }
+
+  // Internal helper function for Polish language.
+  function getPolishForm (c) {
+    if (c === 1) {
+      return 0
+    } else if (Math.floor(c) !== c) {
+      return 1
+    } else if (c % 10 >= 2 && c % 10 <= 4 && !(c % 100 > 10 && c % 100 < 20)) {
+      return 2
+    } else {
+      return 3
+    }
+  }
+
+  // Internal helper function for Russian and Ukranian languages.
+  function getSlavicForm (c) {
+    if (Math.floor(c) !== c) {
+      return 2
+    } else if ((c % 100 >= 5 && c % 100 <= 20) || (c % 10 >= 5 && c % 10 <= 9) || c % 10 === 0) {
+      return 0
+    } else if (c % 10 === 1) {
+      return 1
+    } else if (c > 1) {
+      return 2
+    } else {
+      return 0
+    }
+  }
+
+  // Internal helper function for Slovak language.
+  function getCzechOrSlovakForm (c) {
+    if (c === 1) {
+      return 0
+    } else if (Math.floor(c) !== c) {
+      return 1
+    } else if (c % 10 >= 2 && c % 10 <= 4 && c % 100 < 10) {
+      return 2
+    } else {
+      return 3
+    }
+  }
+
+  // Internal helper function for Lithuanian language.
+  function getLithuanianForm (c) {
+    if (c === 1 || (c % 10 === 1 && c % 100 > 20)) {
+      return 0
+    } else if (Math.floor(c) !== c || (c % 10 >= 2 && c % 100 > 20) || (c % 10 >= 2 && c % 100 < 10)) {
+      return 1
+    } else {
+      return 2
+    }
+  }
+
+  // Internal helper function for Arabic language.
+  function getArabicForm (c) {
+    if (c <= 2) { return 0 }
+    if (c > 2 && c < 11) { return 1 }
+    return 0
+  }
+
+  // We need to make sure we support browsers that don't have
+  // `Array.isArray`, so we define a fallback here.
+  var isArray = Array.isArray || function (arg) {
+    return Object.prototype.toString.call(arg) === '[object Array]'
+  }
+
+  humanizeDuration.getSupportedLanguages = function getSupportedLanguages () {
+    var result = []
+    for (var language in languages) {
+      if (languages.hasOwnProperty(language) && language !== 'gr') {
+        result.push(language)
+      }
+    }
+    return result
+  }
+
+  humanizeDuration.humanizer = humanizer
+
+  if (typeof define === 'function' && define.amd) {
+    define(function () {
+      return humanizeDuration
+    })
+  } else if (typeof module !== 'undefined' && module.exports) {
+    module.exports = humanizeDuration
+  } else {
+    this.humanizeDuration = humanizeDuration
+  }
+})(); // eslint-disable-line semi
\ No newline at end of file
diff --git a/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/README.md b/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/README.md
new file mode 100644
index 000000000..ce90303df
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/README.md
@@ -0,0 +1,56 @@
+# duration-picker
+copy `bootstrap-duration-picker.css` and `bootstrap-duration-picker.js` files to your project.
+## Dependencies
+
+- jQuery 1.*
+- Bootstrap 3.* (for styling only)
+
+## Usage
+
+```js
+$('.duration-picker').durationPicker();
+
+// or
+
+$('.duration-picker').durationPicker({
+    
+    // optional object with translations (English is used by default)
+    translations: {
+        day: 'dia',
+        hour: 'hora',
+        minute: 'minuto',
+        second: 'segundo',
+        days: 'dias',
+        hours: 'horas',
+        minutes: 'minutos',
+        seconds: 'segundos',
+    },
+
+    // defines whether to show seconds or not
+    showSeconds: false,
+
+    // defines whether to show days or not
+    showDays: true,
+
+    // callback function that is passed value in seconds every time duration is changed
+    onChanged: function (value) {
+        console.log(value);
+    }
+});
+```
+
+## Public methods
+
+<table>
+  <tr>
+    <th>Method</th>
+    <th>Example</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td><b>setValue</b></td>
+    <td><code>$('#selector').data('durationPicker').setValue(0);</code></td>
+    <td>Allows to reinitialize duration picker value after it's been created. Accepts new number of seconds</td>
+  </tr>  
+</table>
+
diff --git a/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/jquery-duration-picker.css b/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/jquery-duration-picker.css
new file mode 100644
index 000000000..ec782cccd
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/jquery-duration-picker.css
@@ -0,0 +1,19 @@
+
+.bdp-input input[disabled]{
+
+    background-color: #fff;
+}
+
+.bdp-input input {
+    display: inline-block;
+    margin-bottom: 3px;
+    width: 40px;
+}
+
+
+.bdp-block {
+    display: inline-block;
+    line-height: 1;
+    text-align: center;
+    padding: 5px 3px;
+}
\ No newline at end of file
diff --git a/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/jquery-duration-picker.js b/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/jquery-duration-picker.js
new file mode 100644
index 000000000..4f0577030
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/src/lib/duration-picker/jquery-duration-picker.js
@@ -0,0 +1,164 @@
+'use strict';
+
+(function iife($) {
+
+  $.DurationPicker = function DurationPicker(mainElement, options) {
+
+    var defaults = {
+      translations: {
+        day: 'day',
+        hour: 'hour',
+        minute: 'minute',
+        second: 'second',
+        days: 'days',
+        hours: 'hours',
+        minutes: 'minutes',
+        seconds: 'seconds'
+      },
+      showSeconds: false,
+      showDays: true
+    };
+
+    var plugin = this;
+
+    plugin.settings = {};
+
+    var mainInput = $(mainElement);
+
+    plugin.init = function init() {
+      plugin.settings = $.extend({}, defaults, options);
+
+      var mainInputReplacer = $('<div>', {
+        class: 'bdp-input',
+        html: [buildDisplayBlock('days', !plugin.settings.showDays), buildDisplayBlock('hours', false, plugin.settings.showDays ? 23 : 99999), buildDisplayBlock('minutes', false, 59), buildDisplayBlock('seconds', !plugin.settings.showSeconds, 59)]
+      });
+
+      mainInput.after(mainInputReplacer).hide();
+
+      if (mainInput.val() === '') mainInput.val(0);
+      plugin.setValue(mainInput.val());
+    };
+
+    var inputs = [];
+    var labels = [];
+    var disabled = mainInput.hasClass('readonly') || mainInput.attr('readonly') === 'readonly';
+
+    var days = 0;
+    var hours = 0;
+    var minutes = 0;
+    var seconds = 0;
+
+    //
+    // private methods
+    //
+    function translate(key) {
+      return plugin.settings.translations[key];
+    }
+
+    function updateWordLabel(value, label) {
+      var text = value === 1 ? label.substring(0, label.length - 1) : label;
+      labels[label].text(translate(text));
+    }
+
+    function updateUI() {
+      var total = seconds + minutes * 60 + hours * 60 * 60 + days * 24 * 60 * 60;
+      mainInput.val(total);
+      mainInput.change();
+
+      updateWordLabel(days, 'days');
+      updateWordLabel(hours, 'hours');
+      updateWordLabel(minutes, 'minutes');
+      updateWordLabel(seconds, 'seconds');
+
+      inputs.days.val(days);
+      inputs.hours.val(hours);
+      inputs.minutes.val(minutes);
+      inputs.seconds.val(seconds);
+
+      if (typeof plugin.settings.onChanged === 'function') {
+        plugin.settings.onChanged(mainInput.val());
+      }
+    }
+
+    function durationPickerChanged() {
+      days = parseInt(inputs.days.val(), 10) || 0;
+      hours = parseInt(inputs.hours.val(), 10) || 0;
+      minutes = parseInt(inputs.minutes.val(), 10) || 0;
+      seconds = parseInt(inputs.seconds.val(), 10) || 0;
+      updateUI();
+    }
+
+    function buildDisplayBlock(id, hidden, max) {
+      var input = $('<input>', {
+        class: 'form-control input-sm',
+        type: 'number',
+        min: 0,
+        value: 0,
+        disabled: disabled
+      }).change(durationPickerChanged);
+
+      if (max) {
+        input.attr('max', max);
+      }
+      inputs[id] = input;
+
+      var label = $('<div>', {
+        id: 'bdp-' + id + '-label',
+        text: translate(id)
+      });
+      labels[id] = label;
+
+      return $('<div>', {
+        class: 'bdp-block ' + (hidden ? 'd-none' : ''),
+        html: [input, label]
+      });
+    }
+
+    //
+    // public methods
+    //
+
+    function getValue() { return mainInput.val(); }
+
+    plugin.getValue = function() {
+      return getValue();
+    };
+
+    plugin.setValue = function setValue(value) {
+      mainInput.val(value);
+
+      var total = parseInt(value, 10);
+      seconds = total % 60;
+      total = Math.floor(total / 60);
+      minutes = total % 60;
+      total = Math.floor(total / 60);
+
+      if (plugin.settings.showDays) {
+        hours = total % 24;
+        days = Math.floor(total / 24);
+      } else {
+        hours = total;
+        days = 0;
+      }
+
+      updateUI();
+    };
+
+    plugin.destroy = function () {
+      mainInput.next('.bdp-input').remove();
+      mainInput.data('durationPicker', null).show();
+    };
+
+    plugin.init();
+  };
+
+  // eslint-disable-next-line no-param-reassign
+  $.fn.durationPicker = function durationPicker(options) {
+    return this.each(function () {
+      if (undefined === $(this).data('durationPicker')) {
+        var plugin = new $.DurationPicker(this, options);
+        $(this).data('durationPicker', plugin);
+      }
+    });
+  };
+})(jQuery); // eslint-disable-line no-undef
\ No newline at end of file
diff --git a/odex25_project/web_widget_time_delta/static/src/xml/widget.xml b/odex25_project/web_widget_time_delta/static/src/xml/widget.xml
new file mode 100644
index 000000000..99280279b
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/static/src/xml/widget.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+    <t t-name="FieldTimeDelta">
+        <span t-att-class="'oe_form_field '+widget.widget_class" t-att-style="widget.attrs.style">
+            <t t-if="widget.mode !== 'readonly'">
+                <input type="text"
+                       t-att-id="widget.id_for_label"
+                       t-att-tabindex="widget.attrs.tabindex"
+                       t-att-autofocus="widget.attrs.autofocus"
+                       t-att-placeholder="widget.attrs.placeholder"
+                       t-att-maxlength="widget.field.size"
+                       class="timedelta"
+                        />
+            </t>
+            <t t-if="widget.mode === 'readonly'">
+                <div/>
+                <span class="oe_form_char_content"></span>
+            </t>
+        </span>
+    </t>
+
+</templates>
+
diff --git a/odex25_project/web_widget_time_delta/view/web_widget_time_delta_view.xml b/odex25_project/web_widget_time_delta/view/web_widget_time_delta_view.xml
new file mode 100644
index 000000000..98e91611d
--- /dev/null
+++ b/odex25_project/web_widget_time_delta/view/web_widget_time_delta_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <template id="assets_backend" name="web_widget_time_delta assets" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <link rel="stylesheet" href="/web_widget_time_delta/static/src/css/widget.css"/>
+            <link rel="stylesheet" href="/web_widget_time_delta/static/src/lib/duration-picker/jquery-duration-picker.css"/>
+
+
+            <script type="text/javascript" src="/web_widget_time_delta/static/src/js/widget.js"></script>
+
+            <script type="text/javascript" src="/web_widget_time_delta/static/src/lib/duration-humanize/humanize-duration.js"></script>
+            <script type="text/javascript" src="/web_widget_time_delta/static/src/lib/duration-picker/jquery-duration-picker.js"></script>
+
+        </xpath>
+    </template>
+</odoo>