[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q

23 files changed, 15 insertions, 3 deletions

diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 943fba35329..8280eb4b805 100644
--- a/addons/thunderbird/plugin/openerp_plugin.xpi
+++ b/addons/thunderbird/plugin/openerp_plugin.xpi
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 92bb3602292..b6f05eb6df2 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png
index b13f2b0f523..01ebf3f448f 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Account.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png
index 5aa6a958d37..a2000121f88 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png
index 9b950b8ea9d..8be68620e07 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Case.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png
index 9bd6f9f6059..a0cc2cf0b56 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Contact.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png
index 1ab240c32cb..44b5213b203 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png
index 4551107ec3b..d4c977731ac 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Invoice.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png
index 3761ff1e747..666ee49a452 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png
index 031d7532673..6b7f01c996a 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png
index 373464bd53e..023d9f84b48 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png
index 2daac224a51..813342bdbe0 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/NEWT1.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png
index c661339598e..07724103a56 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Partner.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png
index 51451e422ae..1903bf6a9e2 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Product.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png
index 0f8ea2af8f5..c99badabbe3 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Project.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png
index 1b0b44f890e..e594cd5a18d 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Sale.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png
index 52056b1e713..dfdbff2b1e5 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Task.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png
index 54dc465b421..d770eda704a 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png
index bdbe31c4bff..1dd63b98787 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/document-new.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png
index e2b45b52211..cb20b0bdfc4 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp-icon.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png
index b8f4a0f380b..f4450323c93 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/partner_icon.png
diff --git a/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
index 950f5c0139e..90d73d94caf 100755
--- a/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
+++ b/addons/thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
@@ -24,9 +24,9 @@ pref("extensions.tiny.partnername","");
 pref("extensions.tiny.officeno","");
 pref("extensions.tiny.phoneno","");
 pref("extensions.tiny.address","");
-pref("extensions.tiny.listobject","Partner,Partner Address,Accout Invoice,Project,Product,Account,Sale Order,Project Task");
-pref("extensions.tiny.object","res.partner,res.partner.address,account.invoice,project.project,product.product,account.account,sale.order,project.task");
-pref("extensions.tiny.imagename","chrome://openerp_plugin/skin/Partner.png,chrome://openerp_plugin/skin/Contact.png,chrome://openerp_plugin/skin/Invoice.png,chrome://openerp_plugin/skin/Project.png,chrome://openerp_plugin/skin/Product.png,chrome://openerp_plugin/skin/Account.png,chrome://openerp_plugin/skin/Sale.png,chrome://openerp_plugin/skin/Case.png,chrome://openerp_plugin/skin/Task.png");
+pref("extensions.tiny.listobject","Partner,Accout Invoice,Product,Sale Order,Lead and opportunities");
+pref("extensions.tiny.object","res.partner,account.invoice,product.product,sale.order,crm.lead");
+pref("extensions.tiny.imagename","chrome://openerp_plugin/skin/Partner.png,chrome://openerp_plugin/skin/Invoice.png,chrome://openerp_plugin/skin/Product.png,chrome://openerp_plugin/skin/Sale.png,chrome://openerp_plugin/skin/Case.png");
 pref("extensions.tiny.attachmentlength","");
 pref("extensions.tiny.attachment","");
 pref("extensions.tiny.db_list","false");
diff --git a/addons/thunderbird/plugin/openerp_plugin/packaging.sh b/addons/thunderbird/plugin/openerp_plugin/packaging.sh
new file mode 100755
index 00000000000..5c1f48a9050
--- /dev/null
+++ b/addons/thunderbird/plugin/openerp_plugin/packaging.sh
@@ -0,0 +1,12 @@
+# Use this Shell Script for Cleaning & Compressing  the chnages in Plugin 
+# Run this script using jar command.
+
+rm chrome/openerp_plugin.jar
+rm ../openerp_plugin.xpi 
+cd chrome/openerp_plugin/
+jar cvf openerp_plugin.jar *
+cd ..
+mv openerp_plugin/openerp_plugin.jar openerp_plugin.jar
+cd ..
+zip -r ../openerp_plugin.xpi *
+