diff --git a/cor_custom/__init__.py b/cor_custom/__init__.py
old mode 100644
new mode 100755
diff --git a/cor_custom/__manifest__.py b/cor_custom/__manifest__.py
old mode 100644
new mode 100755
diff --git a/cor_custom/__pycache__/__init__.cpython-36.pyc b/cor_custom/__pycache__/__init__.cpython-36.pyc
new file mode 100755
index 0000000..a2ca7f5
Binary files /dev/null and b/cor_custom/__pycache__/__init__.cpython-36.pyc differ
diff --git a/cor_custom/controllers/__init__.py b/cor_custom/controllers/__init__.py
old mode 100644
new mode 100755
diff --git a/cor_custom/controllers/__pycache__/__init__.cpython-36.pyc b/cor_custom/controllers/__pycache__/__init__.cpython-36.pyc
new file mode 100755
index 0000000..a4434d0
Binary files /dev/null and b/cor_custom/controllers/__pycache__/__init__.cpython-36.pyc differ
diff --git a/cor_custom/controllers/__pycache__/controllers.cpython-36.pyc b/cor_custom/controllers/__pycache__/controllers.cpython-36.pyc
new file mode 100755
index 0000000..38c46b7
Binary files /dev/null and b/cor_custom/controllers/__pycache__/controllers.cpython-36.pyc differ
diff --git a/cor_custom/controllers/controllers.py b/cor_custom/controllers/controllers.py
old mode 100644
new mode 100755
diff --git a/cor_custom/demo/demo.xml b/cor_custom/demo/demo.xml
old mode 100644
new mode 100755
diff --git a/cor_custom/models/__init__.py b/cor_custom/models/__init__.py
old mode 100644
new mode 100755
diff --git a/cor_custom/models/__pycache__/__init__.cpython-36.pyc b/cor_custom/models/__pycache__/__init__.cpython-36.pyc
new file mode 100755
index 0000000..87a3f96
Binary files /dev/null and b/cor_custom/models/__pycache__/__init__.cpython-36.pyc differ
diff --git a/cor_custom/models/__pycache__/analytic.cpython-36.pyc b/cor_custom/models/__pycache__/analytic.cpython-36.pyc
new file mode 100755
index 0000000..c0f8be2
Binary files /dev/null and b/cor_custom/models/__pycache__/analytic.cpython-36.pyc differ
diff --git a/cor_custom/models/__pycache__/crm_lead.cpython-36.pyc b/cor_custom/models/__pycache__/crm_lead.cpython-36.pyc
new file mode 100755
index 0000000..ebeacfd
Binary files /dev/null and b/cor_custom/models/__pycache__/crm_lead.cpython-36.pyc differ
diff --git a/cor_custom/models/__pycache__/models.cpython-36.pyc b/cor_custom/models/__pycache__/models.cpython-36.pyc
new file mode 100755
index 0000000..18206e2
Binary files /dev/null and b/cor_custom/models/__pycache__/models.cpython-36.pyc differ
diff --git a/cor_custom/models/__pycache__/project.cpython-36.pyc b/cor_custom/models/__pycache__/project.cpython-36.pyc
new file mode 100755
index 0000000..1292587
Binary files /dev/null and b/cor_custom/models/__pycache__/project.cpython-36.pyc differ
diff --git a/cor_custom/models/__pycache__/project_overview.cpython-36.pyc b/cor_custom/models/__pycache__/project_overview.cpython-36.pyc
new file mode 100755
index 0000000..8831012
Binary files /dev/null and b/cor_custom/models/__pycache__/project_overview.cpython-36.pyc differ
diff --git a/cor_custom/models/analytic.py b/cor_custom/models/analytic.py
old mode 100644
new mode 100755
diff --git a/cor_custom/models/crm_lead.py b/cor_custom/models/crm_lead.py
old mode 100644
new mode 100755
diff --git a/cor_custom/models/models.py b/cor_custom/models/models.py
old mode 100644
new mode 100755
diff --git a/cor_custom/security/ir.model.access.csv b/cor_custom/security/ir.model.access.csv
old mode 100644
new mode 100755
diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml
index 4f88986..71bdbea 100755
--- a/cor_custom/views/project_view.xml
+++ b/cor_custom/views/project_view.xml
@@ -6,10 +6,14 @@
         <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="object"  name="action_view_account_analytic_line" icon="fa-usd" attrs="{'invisible': [('allow_billable','=',False)]}" string="Cost/Revenue" widget="statinfo">
+            <div name="button_box" position="inside">
+                <button class="oe_stat_button" type="object" name="action_view_account_analytic_line" icon="fa-usd"
+                        attrs="{'invisible': [('allow_billable','=',False)]}" string="Cost/Revenue" widget="statinfo">
                 </button>
             </div>
+            <xpath expr="//field[@name='partner_id']" position="replace">
+                <field name="partner_id" string="Client"/>
+            </xpath>
         </field>
     </record>
 
@@ -20,29 +24,44 @@
         <field name="inherit_id" ref="sale_timesheet.project_project_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//page[@name='billing_employee_rate']" position="replace">
-                <page name="billing_employee_rate" string="Invoicing" attrs="{'invisible': [('allow_billable', '=', False)]}">
+                <page name="billing_employee_rate" string="Invoicing"
+                      attrs="{'invisible': [('allow_billable', '=', False)]}">
                     <group>
                         <field name="display_create_order" invisible="1"/>
                         <field name="bill_type" widget="radio"/>
-                        <field name="pricing_type" attrs="{'invisible': ['|', ('allow_billable', '=', False), ('bill_type', '!=', 'customer_project')], 'required': ['&amp;', ('allow_billable', '=', True), ('allow_timesheets', '=', True)]}" widget="radio"/>
-                        <div class="o_td_label"  attrs="{'invisible': ['|', '|', ('allow_timesheets', '=', False), ('sale_order_id', '!=', False), '&amp;', ('pricing_type', '!=', 'fixed_rate'), ('bill_type', '!=', 'customer_task')]}">
-                            <label for="timesheet_product_id" string="Default Service" attrs="{'invisible': [('bill_type', '!=', 'customer_task')]}"/>
-                            <label for="timesheet_product_id" string="Service" attrs="{'invisible': [('bill_type', '=', 'customer_task')]}"/>
+                        <field name="pricing_type"
+                               attrs="{'invisible': ['|', ('allow_billable', '=', False), ('bill_type', '!=', 'customer_project')], 'required': ['&amp;', ('allow_billable', '=', True), ('allow_timesheets', '=', True)]}"
+                               widget="radio"/>
+                        <div class="o_td_label"
+                             attrs="{'invisible': ['|', '|', ('allow_timesheets', '=', False), ('sale_order_id', '!=', False), '&amp;', ('pricing_type', '!=', 'fixed_rate'), ('bill_type', '!=', 'customer_task')]}">
+                            <label for="timesheet_product_id" string="Default Service"
+                                   attrs="{'invisible': [('bill_type', '!=', 'customer_task')]}"/>
+                            <label for="timesheet_product_id" string="Service"
+                                   attrs="{'invisible': [('bill_type', '=', 'customer_task')]}"/>
                         </div>
-                        <field name="timesheet_product_id" nolabel="1" attrs="{'invisible': ['|', '|', ('allow_timesheets', '=', False), ('sale_order_id', '!=', False), '&amp;', ('pricing_type', '!=', 'fixed_rate'), ('bill_type', '!=', 'customer_task')], 'required': ['&amp;', ('allow_billable', '=', True), ('allow_timesheets', '=', True)]}" context="{'default_type': 'service', 'default_service_policy': 'delivered_timesheet', 'default_service_type': 'timesheet'}"/>
+                        <field name="timesheet_product_id" nolabel="1"
+                               attrs="{'invisible': ['|', '|', ('allow_timesheets', '=', False), ('sale_order_id', '!=', False), '&amp;', ('pricing_type', '!=', 'fixed_rate'), ('bill_type', '!=', 'customer_task')], 'required': ['&amp;', ('allow_billable', '=', True), ('allow_timesheets', '=', True)]}"
+                               context="{'default_type': 'service', 'default_service_policy': 'delivered_timesheet', 'default_service_type': 'timesheet'}"/>
                         <field name="sale_order_id" invisible="1"/>
-                        <field name="sale_line_id" string="Default Sales Order Item" attrs="{'invisible': ['|', '|', ('sale_order_id', '=', False), ('bill_type', '!=', 'customer_project'), ('pricing_type', '!=', 'fixed_rate')], 'readonly': [('sale_order_id', '=', False)]}" options="{'no_create': True, 'no_edit': True, 'delete': False}"/>
+                        <field name="sale_line_id" string="Default Sales Order Item"
+                               attrs="{'invisible': ['|', '|', ('sale_order_id', '=', False), ('bill_type', '!=', 'customer_project'), ('pricing_type', '!=', 'fixed_rate')], 'readonly': [('sale_order_id', '=', False)]}"
+                               options="{'no_create': True, 'no_edit': True, 'delete': False}"/>
                     </group>
-                    <field name="sale_line_employee_ids" attrs="{'invisible': ['|', ('bill_type', '!=', 'customer_project'), ('pricing_type', '!=', 'employee_rate')]}">
+                    <field name="sale_line_employee_ids"
+                           attrs="{'invisible': ['|', ('bill_type', '!=', 'customer_project'), ('pricing_type', '!=', 'employee_rate')]}">
                         <tree editable="top">
                             <field name="company_id" invisible="1"/>
                             <field name="project_id" invisible="1"/>
                             <field name="employee_id" options="{'no_create': True}"/>
                             <field name="budgeted_qty"/>
                             <field name="budgeted_uom"/>
-                            <field name="timesheet_product_id" attrs="{'column_invisible': [('parent.sale_order_id', '!=', False)]}"/>
-                            <field name="sale_line_id" options="{'no_create': True}" attrs="{'column_invisible': [('parent.sale_order_id', '=', False)]}" domain="[('order_id','=',parent.sale_order_id), ('is_service', '=', True)]"/>
-                            <field name="price_unit" widget="monetary" options="{'currency_field': 'currency_id'}" attrs="{'readonly': [('parent.sale_order_id', '!=', False)]}"/>
+                            <field name="timesheet_product_id"
+                                   attrs="{'column_invisible': [('parent.sale_order_id', '!=', False)]}"/>
+                            <field name="sale_line_id" options="{'no_create': True}"
+                                   attrs="{'column_invisible': [('parent.sale_order_id', '=', False)]}"
+                                   domain="[('order_id','=',parent.sale_order_id), ('is_service', '=', True)]"/>
+                            <field name="price_unit" widget="monetary" options="{'currency_field': 'currency_id'}"
+                                   attrs="{'readonly': [('parent.sale_order_id', '!=', False)]}"/>
                             <field name="employee_price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             <field name="currency_id" invisible="1" readonly="1"/>
                         </tree>
diff --git a/cor_custom/views/templates.xml b/cor_custom/views/templates.xml
old mode 100644
new mode 100755
diff --git a/cor_custom/views/views.xml b/cor_custom/views/views.xml
old mode 100644
new mode 100755
diff --git a/sub_project/__init__.py b/sub_project/__init__.py
old mode 100644
new mode 100755
diff --git a/sub_project/__manifest__.py b/sub_project/__manifest__.py
old mode 100644
new mode 100755
diff --git a/sub_project/__pycache__/__init__.cpython-36.pyc b/sub_project/__pycache__/__init__.cpython-36.pyc
new file mode 100755
index 0000000..07b288b
Binary files /dev/null and b/sub_project/__pycache__/__init__.cpython-36.pyc differ
diff --git a/sub_project/models/__init__.py b/sub_project/models/__init__.py
old mode 100644
new mode 100755
diff --git a/sub_project/models/__pycache__/__init__.cpython-36.pyc b/sub_project/models/__pycache__/__init__.cpython-36.pyc
new file mode 100755
index 0000000..db5f834
Binary files /dev/null and b/sub_project/models/__pycache__/__init__.cpython-36.pyc differ
diff --git a/sub_project/models/__pycache__/sub_project.cpython-36.pyc b/sub_project/models/__pycache__/sub_project.cpython-36.pyc
new file mode 100755
index 0000000..04b8db2
Binary files /dev/null and b/sub_project/models/__pycache__/sub_project.cpython-36.pyc differ
diff --git a/sub_project/models/sub_project.py b/sub_project/models/sub_project.py
old mode 100644
new mode 100755
diff --git a/sub_project/views/sub_project.xml b/sub_project/views/sub_project.xml
old mode 100644
new mode 100755
index 51a8219..3c1506b
--- a/sub_project/views/sub_project.xml
+++ b/sub_project/views/sub_project.xml
@@ -14,7 +14,7 @@
                                 <field name="is_sub_project"/>
                             </group>
                             <group>
-                                <field name="parent_project"
+                                <field name="parent_project" attrs="{'invisible': [('is_sub_project', '=', False)], 'required': [('is_sub_project', '=', True)]}"
                                        options="{'no_open': True, 'no_create': True, 'no_create_edit': True}"/>
                             </group>
                         </page>