Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch

cor_custom/models/crm_lead.py

@@ -8,9 +8,20 @@ class Lead(models.Model):
     _inherit = 'crm.lead'
 
     lead_no = fields.Char(string='Lead ID')
+    scope = fields.Char(string='Scope (NIS)')
     professional_support = fields.Char(string='Professional Support')
     ref_summary_status = fields.Char(string='Referral Summary status')
+    contract = fields.Selection([('Yes','Yes'),('No','No')], string='Contract')
+    project_name = fields.Char(string='Project Name')
     project_scope = fields.Char(string='The scope of the project')
+    #act_project_manager_id = fields.Many2one('res.users', string='Actual Project Manager')
+    #project_manager_id = fields.Many2one('res.users', string='Project Manager')
     client_folder = fields.Char(string='Client Folder')
     start_date = fields.Date(string='Start Date')
     close_date = fields.Date(string='Close Date')
+
+    _sql_constraints = [
+        ('phone_uniq', 'unique(phone)', "Phone No already exists !"),
+        ('email_from_uniq', 'unique(email_from)', "Email ID already exists !"),
+    ]
+

cor_custom/views/crm_view.xml

@@ -6,16 +6,19 @@
             <field name="model">crm.lead</field>
             <field name="inherit_id" ref="crm.crm_lead_view_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='partner_id']" position="before">
-                    <field name="lead_no"/>
-                </xpath>
                 <xpath expr="//group[@name='Misc']//field[@name='referred']" position="after">
+                    <field name="lead_no"/>
+                    <field name="scope"/>
                     <field name="professional_support"/>
                     <field name="ref_summary_status"/>
-                    <field name="project_scope"/>
+                    <field name="contract"/>
                     <field name="client_folder"/>
                     <field name="start_date"/>
                     <field name="close_date"/>
+                     <field name="project_name"/>
+                    <field name="project_scope"/>
+                    <!--  <field name="act_project_manager_id"/>
+                    <field name="project_manager_id"/> -->
                 </xpath>
             </field>
         </record>