merged with trunk

bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv

25 files changed, 1 insertions, 0 deletions

diff --git a/addons/knowledge/__init__.py b/addons/knowledge/__init__.py
index 3511d091ecb..3511d091ecb 100644..100755
--- a/addons/knowledge/__init__.py
+++ b/addons/knowledge/__init__.py
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 58ccecfa375..58ccecfa375 100644..100755
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
diff --git a/addons/knowledge/i18n/de.po b/addons/knowledge/i18n/de.po
index 5af596a3702..5af596a3702 100644..100755
--- a/addons/knowledge/i18n/de.po
+++ b/addons/knowledge/i18n/de.po
diff --git a/addons/knowledge/i18n/en_US.po b/addons/knowledge/i18n/en_US.po
index 3e04f4f08f0..3e04f4f08f0 100644..100755
--- a/addons/knowledge/i18n/en_US.po
+++ b/addons/knowledge/i18n/en_US.po
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index ed4285f37f5..ed4285f37f5 100644..100755
--- a/addons/knowledge/i18n/es.po
+++ b/addons/knowledge/i18n/es.po
diff --git a/addons/knowledge/i18n/et.po b/addons/knowledge/i18n/et.po
index c30c88ef78f..c30c88ef78f 100644..100755
--- a/addons/knowledge/i18n/et.po
+++ b/addons/knowledge/i18n/et.po
diff --git a/addons/knowledge/i18n/fr.po b/addons/knowledge/i18n/fr.po
index 3776dcc25c3..3776dcc25c3 100644..100755
--- a/addons/knowledge/i18n/fr.po
+++ b/addons/knowledge/i18n/fr.po
diff --git a/addons/knowledge/i18n/hi.po b/addons/knowledge/i18n/hi.po
index 50dff057748..50dff057748 100644..100755
--- a/addons/knowledge/i18n/hi.po
+++ b/addons/knowledge/i18n/hi.po
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index 8adb4c8e133..8adb4c8e133 100644..100755
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
diff --git a/addons/knowledge/i18n/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index e934613de1a..e934613de1a 100644..100755
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.pot
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index 0d11f1aaa2f..0d11f1aaa2f 100644..100755
--- a/addons/knowledge/i18n/mn.po
+++ b/addons/knowledge/i18n/mn.po
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index 776bde81369..776bde81369 100644..100755
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
diff --git a/addons/knowledge/i18n/pl.po b/addons/knowledge/i18n/pl.po
index 5d033485411..5d033485411 100644..100755
--- a/addons/knowledge/i18n/pl.po
+++ b/addons/knowledge/i18n/pl.po
diff --git a/addons/knowledge/i18n/pt.po b/addons/knowledge/i18n/pt.po
index c3a79a996e0..c3a79a996e0 100644..100755
--- a/addons/knowledge/i18n/pt.po
+++ b/addons/knowledge/i18n/pt.po
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index 15dc4c242c6..15dc4c242c6 100644..100755
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/i18n/pt_BR.po
diff --git a/addons/knowledge/i18n/ru.po b/addons/knowledge/i18n/ru.po
index 4513e62ab01..4513e62ab01 100644..100755
--- a/addons/knowledge/i18n/ru.po
+++ b/addons/knowledge/i18n/ru.po
diff --git a/addons/knowledge/i18n/sr.po b/addons/knowledge/i18n/sr.po
index 57a37deabd6..57a37deabd6 100644..100755
--- a/addons/knowledge/i18n/sr.po
+++ b/addons/knowledge/i18n/sr.po
diff --git a/addons/knowledge/i18n/sr@latin.po b/addons/knowledge/i18n/sr@latin.po
index 6118967f792..6118967f792 100644..100755
--- a/addons/knowledge/i18n/sr@latin.po
+++ b/addons/knowledge/i18n/sr@latin.po
diff --git a/addons/knowledge/i18n/sv.po b/addons/knowledge/i18n/sv.po
index 5cd577456b6..5cd577456b6 100644..100755
--- a/addons/knowledge/i18n/sv.po
+++ b/addons/knowledge/i18n/sv.po
diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
index e74c37f80d0..e74c37f80d0 100644..100755
--- a/addons/knowledge/installer.py
+++ b/addons/knowledge/installer.py
diff --git a/addons/knowledge/knowledge_demo.xml b/addons/knowledge/knowledge_demo.xml
index 93b2413bbd2..93b2413bbd2 100644..100755
--- a/addons/knowledge/knowledge_demo.xml
+++ b/addons/knowledge/knowledge_demo.xml
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 068fa9b413b..068fa9b413b 100644..100755
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index cdc176b347f..cdc176b347f 100644..100755
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index d111677a4d3..7a057fcfcbe 100644..100755
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_ir_attachment_sale_manager","ir_attachment manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
 "access_ir_attachment_partner_manager","ir_attachment_partner manager","base.model_ir_attachment","base.group_partner_manager",1,1,1,1
+
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index b4c7bb99c1b..b4c7bb99c1b 100644..100755
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml