[MERGE] merge with trunk-addons

bzr revid: hmo@tinyerp.com-20100329080947-lojccpq7zwynyg6v

3 files changed, 18 insertions, 17 deletions

diff --git a/addons/document/document.py b/addons/document/document.py
index 86f02e85269..f6cbddebae7 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -165,7 +165,7 @@ class document_file(osv.osv):
             vals['res_model'] = context.get('default_res_model', False)
         if vals.get('res_id', False) and vals.get('res_model', False):
             obj_model = self.pool.get(vals['res_model'])
-            result = obj_model.read(cr, uid, [vals['res_id']], context=context)
+            result = obj_model.read(cr, uid, [vals['res_id']], ['name', 'partner_id', 'address_id'], context=context)
             if len(result):
                 obj = result[0]
                 if obj.get('name', False):
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index a04bfce7231..270f2d9353f 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -64,7 +64,7 @@ class document_directory(osv.osv):
     def _get_root_directory(self, cr,uid, context=None):
         objid=self.pool.get('ir.model.data')
         try:
-            mid = objid._get_id(cr, uid, 'document', 'dir_root')
+            mid = objid._get_id(cr, uid, 'document', 'dir_root')            
             if not mid:
                 return False
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index 7f599d3c91a..c397d2e6aab 100644
--- a/addons/document/i18n/hr.po
+++ b/addons/document/i18n/hr.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* document
-#
+# * document
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-21 01:41+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-24 10:09+0000\n"
+"Last-Translator: Drazen Bosak <Unknown>\n"
+"Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
 
 #. module: document
 #: field:document.directory,create_date:0
@@ -29,7 +30,7 @@ msgstr "ID resursa"
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr "Uključi naziv stavke"
+msgstr "Uključi naziv zapisa"
 
 #. module: document
 #: constraint:ir.model:0
@@ -56,7 +57,7 @@ msgstr "Postavke dokumenta"
 #. module: document
 #: view:ir.attachment:0
 msgid "Preview"
-msgstr "Pretpregled"
+msgstr "Pregled"
 
 #. module: document
 #: field:ir.attachment,store_method:0
@@ -66,7 +67,7 @@ msgstr "Metoda pohrane"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr "Automatski konfiguriraj mapu"
+msgstr "Automatski podesi mapu"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -79,7 +80,7 @@ msgid ""
 "Check this field if you want that the name of the file start by the record "
 "name."
 msgstr ""
-"Uključite ovu opciju ako želite da naziv datoteke počinje s nazivom stavke"
+"Uključite ovu opciju ako želite da naziv datoteke počinje s nazivom zapisa"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -89,7 +90,7 @@ msgstr "Drugi resursi"
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr "Model roditelj"
+msgstr "Ishodni Model"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -147,7 +148,7 @@ msgstr "Struktura mape"
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr "Roditelj"
+msgstr "Ishodna stavka"
 
 #. module: document
 #: view:ir.attachment:0
@@ -174,7 +175,7 @@ msgstr "Korisnik posljednje promjene"
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Configure"
-msgstr "Postavi"
+msgstr "Podesi"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -267,7 +268,7 @@ msgstr "Bilješke"
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr "Indeksirani dokument"
+msgstr "Indeksirani sadržaj"
 
 #. module: document
 #: view:document.directory:0
@@ -482,7 +483,7 @@ msgstr "Vrsta dokumenta"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr "Djeca"
+msgstr "Slijedne stavke"
 
 #. module: document
 #: view:document.directory:0