[IMP]Changed demo data,Changed the dependencies,removed knowledge from dependency...

bzr revid: dhr@tinyerp.com-20130306094720-7r5awynvi799yvjk

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 85752d1..70b186a 100644 (file)
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -698,22 +698,6 @@ Andrew</field>
             eval="[ ref('msg_case18_1'), ref('msg_case18_2')], True, {}"
         />
 
-<!-- filter demo  -->    
-      <record id="filter_crm" model="ir.filters">
-          <field name="name">Sales Team</field>
-          <field name="user_id" ref="base.user_root"/>
-          <field name="model_id">crm.lead</field>
-          <field name="is_default">False</field>
-          <field name="domain">[['section_id', 'ilike', 'sales department']]</field>
-          <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels', 'uid': 1}</field>
-      </record>       
-
-<!-- template demo -->
-      <record id="template_crm" model="google.docs.config">
-          <field name="model_id" ref="crm.model_crm_lead"/>
-          <field name="filter_id" ref="filter_crm"/>
-          <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
-          <field name="name_template">Plan to attend meeting_Leads_Agrolait_gdoc</field>
-      </record>
+
     </data>
 </openerp>

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 12ee469..91ea392 100644 (file)
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -33,7 +33,10 @@
         'security/ir.model.access.csv',
         'res_config_user_view.xml'
     ],
-    'depends': ['google_base_account','document'],
+    'demo': [
+        'google_docs_demo.xml'
+    ],
+    'depends': ['google_base_account','crm'],
     'description': """
 Module to attach a google document to any model.
 ================================================

diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index c41f1b5..20a88e0 100644 (file)
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -231,7 +231,6 @@ class config(osv.osv):
             # as it is a new record, we do not consider the actions that have a prefilter
             action_dom = [('model_id', '=', model)]
             config_ids = self.search(cr, uid, action_dom, context=context)
-#
 #            # check postconditions, and execute actions on the records that satisfy them
             for action in self.browse(cr, uid, config_ids, context=context):
                 if self._filter(cr, uid, action, action.filter_id, [new_id], context=context):

diff --git a/addons/google_docs/google_docs_demo.xml b/addons/google_docs/google_docs_demo.xml
new file mode 100644 (file)
index 0000000..d41f755
--- /dev/null
+++ b/addons/google_docs/google_docs_demo.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+<!-- filter demo  -->    
+      <record id="filter_crm" model="ir.filters">
+          <field name="name">Sales Team</field>
+          <field name="model_id">crm.lead</field>
+          <field name="is_default">False</field>
+          <field name="domain">[['section_id', 'ilike', 'sales department']]</field>
+          <field name="context">{'lang': 'en_US', 'tz': 'Europe/Brussels', 'uid': 1}</field>
+      </record>    
+
+<!-- template demo -->
+      <record id="template_crm" model="google.docs.config">
+          <field name="model_id" ref="crm.model_crm_lead"/>
+          <field name="filter_id" ref="filter_crm"/>
+          <field name="gdocs_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
+          <field name="name_template">lead_sales-department_%(name)s_review</field>
+      </record>
+      
+    </data>
+</openerp>
+

diff --git a/addons/google_docs/security/ir.model.access.csv b/addons/google_docs/security/ir.model.access.csv
index 9393d58..1a20407 100644 (file)
--- a/addons/google_docs/security/ir.model.access.csv
+++ b/addons/google_docs/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_google_docs,google.docs.config,model_google_docs_config,,1,0,0,0
+access_google_docs_all,google.docs.config,model_google_docs_config,,1,0,0,0
 access_google_docs,google.docs.config,model_google_docs_config,base.group_system,1,1,1,1
\ No newline at end of file