[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

4 files changed, 148 insertions, 14 deletions

diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index f7e50110784..a146056e921 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -26,7 +26,7 @@
     "images": ["images/project_message.jpeg"],
     "depends": ["project"],
     "author": "OpenERP SA",
-    "category": 'Hidden',
+    "category": "Project Management",
     'complexity': "easy",
     "description": """
 This module provides the functionality to send messages within a project.
diff --git a/addons/project_messages/i18n/hr.po b/addons/project_messages/i18n/hr.po
new file mode 100644
index 00000000000..d12926319b0
--- /dev/null
+++ b/addons/project_messages/i18n/hr.po
@@ -0,0 +1,144 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-12-12 08:50+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: Croatian <hr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Za"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "Od"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+msgid "Communication Messages"
+msgstr "Komunikacijske poruke"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Danas"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr ""
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messaging system allows for an efficient and trackable "
+"communication between project members. The messages are stored in the system "
+"and can be used for post analysis."
+msgstr ""
+"Sustav poruka unutar projekta omogućava efikasnu i slijedivu komunikaciju "
+"između članova projekta. Poruke se čuvaju u sustavu i mogu se koristiti za "
+"kasniju analizu."
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+"    This module provides the functionality to send messages within a "
+"project.\n"
+"    A user can send messages individually to other user. He can even "
+"broadcast\n"
+"    it to all the users.\n"
+"    "
+msgstr ""
+"\n"
+"    Modul omogućava funkcionalnost slanja poruka unutar projekta.\n"
+"    Korisnik može slati pojedinačne poruke drugom korisniku. Može čak i "
+"obavjestiti\n"
+"    sve korisnike.\n"
+"    "
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Poruka za"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Poruka od"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Poruke projekta"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "Interni sustav poruka projekta"
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index f8c98d15785..85e2c02f8ff 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -15,15 +15,6 @@
 		                     	<field name="from_id"/>
 		                     	<field name="to_id"/>
                    			</tree>
-                   			<form>
-                   				<group>
-	                   				<field name="from_id"/>
-			                        <field name="to_id"/>
-			                        <newline/>
-			                        <separator colspan="4" string="Message"/>
-			                     	<field nolabel="1" name="message" colspan="4"/>
-		                     	</group>
-                   			</form>
                    		</field>
                    	</page>
                	</xpath>
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index 5756a7456bb..1792f1ea840 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,4 +1,3 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
-"access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1
-"access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_project_messages,project.messages,model_project_messages,project.group_project_user,1,1,1,1

+access_project_message_project_user,project.project.user,model_project_project,project.group_project_user,1,0,0,0