deisy преди 6 години
родител
ревизия
6354bdac7f
променени са 8 файла, в които са добавени 38 реда и са изтрити 5 реда
  1. 5 1
      __openerp__.py
  2. 18 0
      datas/task_type_data.xml
  3. BIN
      models/crm_task.pyc
  4. 1 1
      models/eiru_crm.py
  5. BIN
      models/eiru_crm.pyc
  6. 5 0
      security/ir.model.access.csv
  7. 8 2
      views/crm_task_view.xml
  8. 1 1
      views/eiru_crm_view.xml

+ 5 - 1
__openerp__.py

@@ -3,6 +3,7 @@
 {
 'name':'Eiru CRM',
 'author':'Deisy',
+'description':'',
 'data':[
     'views/crm_task_view.xml',
     'views/eiru_crm_view.xml',
@@ -10,10 +11,13 @@
     'views/partner_view.xml',
     'views/menus_view.xml',
     'views/task_type_view.xml',
-    'views/assets_view.xml'],
+    'views/assets_view.xml',
+    'datas/task_type_data.xml',
+    'security/ir.model.access.csv',],
 'depends':[
     'crm',
     'base',
+    'partner_social_fields3',
     'web_widget_color'],
 'application':True,
 "images": [

+ 18 - 0
datas/task_type_data.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<openerp>
+  <data noupdate="1">
+    <!-- Task Types -->
+    <record model="crm.task.type" id="type1">
+      <field name="name">Llamada</field>
+    </record>
+    <record model="crm.task.type" id="type2">
+      <field name="name">Reunión</field>
+    </record>
+    <record model="crm.task.type" id="type3">
+      <field name="name">Whatsapp</field>
+    </record>
+    <record model="crm.task.type" id="type4">
+      <field name="name">Correo</field>
+    </record>
+  </data>
+</openerp>

BIN
models/crm_task.pyc


+ 1 - 1
models/eiru_crm.py

@@ -65,7 +65,7 @@ class EiruCrm(models.Model):
                 'zip': partner.zip,
                 'function': partner.function,
                 'facebook': partner.facebook,
-                'instagram':instagram
+                'instagram':partner.instagram
             }
         return {'value': values}
 

BIN
models/eiru_crm.pyc


+ 5 - 0
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_crm_task_user,crm.task user,model_crm_task,base.group_sale_salesman,1,1,1,1
+access_crm_task_type_user,crm.task.type user,model_crm_task_type,base.group_sale_salesman,1,1,1,1
+access_crm_task_manager,crm.task manager,model_crm_task,base.group_sale_manager,1,1,1,1
+access_crm_task_type_manager,crm.task.type manager,model_crm_task_type,base.group_sale_manager,1,1,1,1

+ 8 - 2
views/crm_task_view.xml

@@ -40,11 +40,17 @@
           <field name="partner_id" string="Cliente" filter_domain="[('partner_id','ilike',self)]"/>
           <field name="opportunity_id" string="Oportunidad"/>
           <field name="state" string="Estado"/>
-          <field name="user_id" string="Vendedor"/>
+          <field name="user_id" string="Responsable"/>
           <field string="Tipo de Tarea" name="task_type_id"/>
           <filter string="Mis Tareas" name="assigned_to_me"
                           domain="[('user_id', '=', uid)]"
                           help="Tasks that are assigned to me"/>
+          <group expand="0" string="Group By">
+           <filter name="group_by_customer" string="Cliente" context="{'group_by':'partner_id'}"/>
+           <filter name="group_by_seller" string="Responsable" context="{'group_by':'user_id'}"/>
+           <filter name="group_by_type" string="Tipo de Tarea" context="{'group_by':'task_type_id'}"/>
+           <filter name="group_by_state" string="Estado" context="{'group_by':'state'}"/>
+         </group>
         </search>
       </field>
     </record>
@@ -122,7 +128,7 @@
   </record>
 
   <record id="action_tree_wizard" model="ir.actions.act_window">
-    <field name="name">Tareas2</field>
+    <field name="name">Tareas</field>
     <field name="res_model">crm.task</field>
     <field name="view_type">form</field>
     <field name="view_mode">tree</field>

+ 1 - 1
views/eiru_crm_view.xml

@@ -54,7 +54,7 @@
                   <field name="priority" widget="priority"/>
                 </group>
                 <group>
-                  <field name="user_id" string="Vendedor" on_change="on_change_user(user_id, context)" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
+                  <field name="user_id" string="Responsable" on_change="on_change_user(user_id, context)" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
                   <label for="section_id" groups="base.group_multi_salesteams"/>
                   <div groups="base.group_multi_salesteams">
                     <field name="section_id" widget="selection"/>