From 406c37c2f8842797683957690c976ae8b773e065 Mon Sep 17 00:00:00 2001
From: "AMP(Open ERP)" <>
Date: Tue, 27 Jul 2010 15:06:48 +0530
Subject: [PATCH] [MOD] Configuration wizard : small changes
bzr revid: vir@tinyerp.com-20100727093648-fneruqalpbvoxxum
---
addons/base_contact/base_contact_installer.py | 57 ++++++++++---------
.../base_contact_installer_view.xml | 8 ++-
addons/base_setup/base_setup_todo.xml | 2 +-
addons/crm/crm_installer_view.xml | 2 +-
addons/hr/hr_installer.xml | 2 +-
addons/knowledge/knowledge_installer.xml | 2 +-
addons/marketing/marketing_view.xml | 2 +-
addons/profile_tools/misc_tools_installer.xml | 2 +-
addons/project/project_installer.xml | 2 +-
addons/thunderbird/installer.py | 6 +-
10 files changed, 46 insertions(+), 39 deletions(-)
diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py
index 3cb32017111..e1ed709dd11 100644
--- a/addons/base_contact/base_contact_installer.py
+++ b/addons/base_contact/base_contact_installer.py
@@ -25,41 +25,44 @@ from osv import fields, osv
class base_contact_installer(osv.osv_memory):
_name = 'base.contact.installer'
_inherit = 'res.config.installer'
-
+
_columns = {
- 'name': fields.char('Name', size=64),
- 'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."),
+ 'name': fields.char('Name', size=64),
+ 'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."),
+ 'nomigrate': fields.boolean('NoMigrate', help="If you select this, all addresses will be not migrated."),
}
def execute(self, cr, uid, ids, context=None):
"""
- This function is used to create contact and address from existing partner address
+ This function is used to create contact and address from existing partner address
"""
- cr.execute("""DROP TRIGGER IF EXISTS contactjob on res_partner_contact;
- DROP LANGUAGE IF EXISTS plpgsql CASCADE;
- CREATE LANGUAGE plpgsql ;
- CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
- DECLARE
- new_name varchar;
- new_phonenum varchar;
- BEGIN
- IF(TG_OP='INSERT') THEN
- INSERT INTO res_partner_job(contact_id, address_id, function, state) VALUES(NEW.id, NEW.website::integer,NEW.first_name, 'current');
- UPDATE res_partner_contact set first_name=Null, website=Null, active=True where id=NEW.id;
- END IF;
- RETURN NEW;
- END;
- $contactjob$ LANGUAGE plpgsql;
- CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
- cr.commit()
+ obj = self.pool.get("base.contact.installer").browse(cr, uid, uid)
+ if obj.migrate:
+ cr.execute("""DROP TRIGGER IF EXISTS contactjob on res_partner_contact;
+ DROP LANGUAGE IF EXISTS plpgsql CASCADE;
+ CREATE LANGUAGE plpgsql ;
+ CREATE OR REPLACE FUNCTION add_to_job() RETURNS TRIGGER AS $contactjob$
+ DECLARE
+ new_name varchar;
+ new_phonenum varchar;
+ BEGIN
+ IF(TG_OP='INSERT') THEN
+ INSERT INTO res_partner_job(contact_id, address_id, function, state) VALUES(NEW.id, NEW.website::integer,NEW.first_name, 'current');
+ UPDATE res_partner_contact set first_name=Null, website=Null, active=True where id=NEW.id;
+ END IF;
+ RETURN NEW;
+ END;
+ $contactjob$ LANGUAGE plpgsql;
+ CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""")
+ cr.commit()
- cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website) (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
- cr.commit()
+ cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website) (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)")
+ cr.commit()
- cr.execute("DROP TRIGGER IF EXISTS contactjob on res_partner_contact")
- cr.execute("DROP LANGUAGE IF EXISTS plpgsql CASCADE;")
- cr.execute("DROP FUNCTION IF EXISTS add_to_job()")
- cr.commit()
+ cr.execute("DROP TRIGGER IF EXISTS contactjob on res_partner_contact")
+ cr.execute("DROP LANGUAGE IF EXISTS plpgsql CASCADE;")
+ cr.execute("DROP FUNCTION IF EXISTS add_to_job()")
+ cr.commit()
base_contact_installer()
diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml
index 3d93faa5728..646d3918e9f 100644
--- a/addons/base_contact/base_contact_installer_view.xml
+++ b/addons/base_contact/base_contact_installer_view.xml
@@ -23,14 +23,18 @@
- Migrate
+ Configure
-
+
+
+
+
+
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index cfe815fb94e..ceb915e1212 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,7 +11,7 @@
Main Company Setup
- Information of your company will be used to custiomise your documents like Invoices, Sale Orders and many more.
+ Information of your company will be used to customize your documents like Invoices, Sale Orders and many more.Configure Your Company
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 20e430b5e88..322f9425122 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -8,7 +8,7 @@
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index dc985f97d8a..a81954bc51b 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -10,7 +10,7 @@
Select Human Resources Modules To Install
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index fb5d14e6e75..081d0734005 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -8,7 +8,7 @@
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index a3288fb471f..1b144a14729 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -13,7 +13,7 @@
Select Marketing Modules to Install
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 84b47128fff..69250f0dcf1 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -8,7 +8,7 @@
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 6c760bc65d1..320b3302241 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -9,7 +9,7 @@
Project Management
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 2c9140fa767..b2284a02c5c 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -33,7 +33,7 @@ class thunderbird_installer(osv.osv_memory):
data = super(thunderbird_installer, self).default_get(cr, uid, fields, context)
pdf_file = open(config['addons_path'] + "/thunderbird/doc/Installation Guide to OpenERP Thunderbid Plug-in.pdf", 'r')
data['pdf_file'] = base64.encodestring(pdf_file.read())
- file = open(config['addons_path'] + "/thunderbird/plugin/tiny_plugin-2.0.xpi", 'r')
+ file = open(config['addons_path'] + "/thunderbird/plugin/OpenERP_plugin-2.0.xpi", 'r')
data['plugin_file'] = base64.encodestring(file.read())
return data
@@ -48,9 +48,9 @@ class thunderbird_installer(osv.osv_memory):
_defaults = {
'thunderbird' : True,
- 'name' : 'tiny_plugin-2.0.xpi',
+ 'name' : 'OpenERP_plugin-2.0.xpi',
'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf',
- 'description' : """ * Save the Thunderbird plugin. \n * Follows the step to install Thunderbird plugin. \n -> 1.From Menu Bar of Thunderbird, open Tools > Add ons. \n -> 2. Click on install button and a browser window appears. \n -> 3. Select the plug-in(.xpi file) and click Ok. \n -> 4. Software installation window appears and within a short time “Install Now” button will be enabled \n -> 5. Click "Install Now". \n -> 6. Restart Thunderbird."""
+ 'description' : """ * Save the Thunderbird plugin. \n * Follow the Steps to configure OpenERP in Thunderbird. \n -> 1. Go to Tools > OpenERP Synchronization. \n -> 2. check data (configured by default). \n -> 3. Click Test Connection. \n -> 4. A message appears with state of your connection. \n -> 5. If your connection failed, check if your database is open, and check your data. \n -> 6. If you have a good connection, click Ok and start to archive mail in OpenERP.
}
thunderbird_installer()