Merge branch 'cor_cr' of https://gitlab.sunarctechnologies.com/prakash.jain/cor-odoo into cor_cr

cor_custom/views/project_view.xml

@@ -6,6 +6,12 @@
         <field name="model">project.project</field>
         <field name="inherit_id" ref="sale_timesheet.project_project_view_form"/>
         <field name="arch" type="xml">
+
+            <xpath expr="//button[@name='%(portal.portal_share_action)d']" position="replace">
+                <button name="%(portal.portal_share_action)d" string="Share" type="action" invisible="1"
+                        class="oe_highlight oe_read_only"/>
+            </xpath>
+
             <xpath expr="//div[@name='options_active']/div" position="after">
                 <div name="creation_div" attrs="{'invisible': [('id', '=', False)]}"
                      groups="project.group_project_manager">
@@ -100,7 +106,8 @@
                             <field name="consultant_cost"/>
                             <field name="actual_revenue"/>
                             <field name="budgeted_hour_week" invisible="1"/>
-                            <button type="object" name="edit_sale_line_employee_record" string="Edit" class="oe_highlight"/>
+                            <button type="object" name="edit_sale_line_employee_record" string="Edit"
+                                    class="oe_highlight"/>
                             <!--<button name="unlink" type="object" icon="fa-trash-o"/>-->
                         </tree>
                     </field>
@@ -163,23 +170,23 @@
                 <field name="date_start" groups="project.group_project_manager" required="1"/>
                 <field name="date" groups="project.group_project_manager" required="1"/>
             </xpath>
-           <!-- <xpath expr="//page[@name='settings']" position="after">
-                <page string="Consultant Allocation" groups="project.group_project_manager"
-                      attrs="{'invisible':['|',('pricing_type','!=','employee_rate'),('project_type','!=','hours_in_consultant')]}">
-                    <field name="project_cons_hrs">
-                        <tree editable="top">
-                            <field name="project_id" invisible="1"/>
-                            <field name="employee_id" options="{'no_create_edit': True, 'no_quick_create': True}"/>
-                            <field name="start_date"/>
-                            <field name="end_date"/>
-                            <field name="percentage"/>
-                            <field name="budgeted_hours"/>
-                            <field name="actual_percentage"/>
-                            <field name="actual_hours"/>
-                        </tree>
-                    </field>
-                </page>
-            </xpath> -->
+            <!-- <xpath expr="//page[@name='settings']" position="after">
+                 <page string="Consultant Allocation" groups="project.group_project_manager"
+                       attrs="{'invisible':['|',('pricing_type','!=','employee_rate'),('project_type','!=','hours_in_consultant')]}">
+                     <field name="project_cons_hrs">
+                         <tree editable="top">
+                             <field name="project_id" invisible="1"/>
+                             <field name="employee_id" options="{'no_create_edit': True, 'no_quick_create': True}"/>
+                             <field name="start_date"/>
+                             <field name="end_date"/>
+                             <field name="percentage"/>
+                             <field name="budgeted_hours"/>
+                             <field name="actual_percentage"/>
+                             <field name="actual_hours"/>
+                         </tree>
+                     </field>
+                 </page>
+             </xpath> -->
             <xpath expr="//field[@name='privacy_visibility']" position="replace">
                 <field name="privacy_visibility" widget="radio" groups="project.group_project_manager"/>
             </xpath>
@@ -273,7 +280,7 @@
     </record>
 
     <record id="view_project_sale_line_employee_map" model="ir.ui.view">
-        <field name="name">	project.sale.line.employee.map.lines</field>
+        <field name="name">project.sale.line.employee.map.lines</field>
         <field name="model">project.sale.line.employee.map</field>
         <field name="arch" type="xml">
             <form string="Project Sale Employee Lines">

timesheet_block/views/res_config_settings.xml

@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="hr_timesheet.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='section_leaves']" position="after">
-                <div name="timesheet_block_limit" groups="base.group_no_one">
+                <div name="timesheet_block_limit">
                         <h2>Timesheet Create/Edit Configuration </h2>
                         <div class="row mt16 o_settings_container" name="timesheet_control">
                             <div class="col-12 col-lg-6 o_setting_box" id="timesheet_block_validation_setting">