[MERGE] merged with trunk-development-branch

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

3 files changed, 77 insertions, 58 deletions

diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index f1e020215a6..c8b60448c75 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Resource",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Hidden",
+    "category" : "Hidden/Dependency",
     "website" : "http://www.openerp.com",
     "description": """
 Module for resource management.
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index 4e113fd9f49..8f18314bc61 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-09-10 16:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-11 19:39+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-11-05 05:45+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -23,27 +23,29 @@ msgid ""
 "If empty, this is a generic holiday for the company. If a resource is set, "
 "the holiday/leave is only for this resource"
 msgstr ""
+"Ako je prazno, ovo je generički praznik za organizaciju. Ako je resurs "
+"postavljen, praznik/odsustvo je samo za taj resurs."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Friday"
-msgstr ""
+msgstr "petak"
 
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
-msgstr ""
+msgstr "Tip resursa"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_leaves
 #: view:resource.calendar.leaves:0
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detalji o odsustvu"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
 msgid "Resources Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
@@ -51,59 +53,60 @@ msgstr ""
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 msgid "Working Time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
-msgstr ""
+msgstr "četvrtak"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Sunday"
-msgstr ""
+msgstr "Nedelja"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
-msgstr ""
+msgstr "Pretraži resurse"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_resource_tree
 #: view:resource.resource:0
 msgid "Resources"
-msgstr ""
+msgstr "Resursi"
 
 #. module: resource
 #: field:resource.calendar,manager:0
 msgid "Workgroup manager"
-msgstr ""
+msgstr "Voditelj radne grupe"
 
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Working time will start from"
-msgstr ""
+msgstr "Radno vrijeme počinje od"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Greška! Datum početka odsustva mora biti manji od završnog datuma odsustva"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
 msgid "Resource Calendar"
-msgstr ""
+msgstr "Kalendar resursa"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -112,48 +115,48 @@ msgstr ""
 #: view:resource.resource:0
 #: field:resource.resource,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Material"
-msgstr ""
+msgstr "Materijal"
 
 #. module: resource
 #: field:resource.calendar.attendance,dayofweek:0
 msgid "Day of week"
-msgstr ""
+msgstr "Dan u tjednu"
 
 #. module: resource
 #: help:resource.calendar.attendance,hour_to:0
 msgid "Working time will end at"
-msgstr ""
+msgstr "Radno vrijeme će završiti u"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Pretraži radno vrijeme"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
-msgstr ""
+msgstr "Razlog"
 
 #. module: resource
 #: view:resource.resource:0
 #: field:resource.resource,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -163,7 +166,7 @@ msgstr ""
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni datum"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
@@ -177,7 +180,7 @@ msgstr ""
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurs"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -186,7 +189,7 @@ msgstr ""
 #: field:resource.calendar.leaves,name:0
 #: field:resource.resource,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: resource
 #: model:ir.module.module,description:resource.module_meta_information
@@ -200,11 +203,21 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Module for resource management\n"
+"    Modul za upravljanje resursima\n"
+"     Resurs predstavlja nešto što može biti dodjeljeno\n"
+"     (programer na zadataku ili proizvodni centar na radnom nalogu "
+"proizvodnje).\n"
+"     Ovaj modul upravlja kalendarom resursa dodjeljenom svakom resursu.\n"
+"     Također upravlja odsustvima svih resursa.\n"
+"\n"
+"    "
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Srijeda"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -216,12 +229,12 @@ msgstr ""
 #. module: resource
 #: model:ir.model,name:resource.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Detalji resursa"
 
 #. module: resource
 #: field:resource.resource,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: resource
 #: help:resource.resource,active:0
@@ -229,11 +242,12 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Ako je ovo polje postavljeno na NE, moežte sakriti resurs bez da ga uklonite."
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Kalendar resursa"
 
 #. module: resource
 #: help:resource.resource,user_id:0
@@ -253,17 +267,17 @@ msgstr ""
 #. module: resource
 #: field:resource.resource,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Monday"
-msgstr ""
+msgstr "Ponedjeljak"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Radi do"
 
 #. module: resource
 #: help:resource.resource,time_efficiency:0
@@ -273,27 +287,31 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"Ovo polje prikazuje efikasnost svakog resursa u izvršavanju zadataka. Npr. "
+"resurs se ostavi sam na 5 dana, sa 5 dodjeljenih zadataka. Predefinirano se "
+"prikazuje opterećenje od 100%, ali ako stavimo efikasnost od 200%, tada je "
+"njegovo opterećenje samo 50%."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Utorak"
 
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 msgid "Working time"
-msgstr ""
+msgstr "Radno vrijeme"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
 #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: resource
 #: view:resource.resource:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -302,45 +320,48 @@ msgid ""
 "in a specific project phase. You can also set their efficiency level and "
 "workload based on their weekly working hours."
 msgstr ""
+"Resursi vam omogućuju kreiranje i upravljanje resursima koji trebaju biti "
+"uključeni u neku fazu projekta. Također možete postaviti njihovu razinu "
+"efikasnosti i opterećenje na osnovi njihovih tjednih radnih sati."
 
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
-msgstr ""
+msgstr "Neaktivan"
 
 #. module: resource
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "(odmor)"
 
 #. module: resource
 #: field:resource.resource,time_efficiency:0
 msgid "Efficiency factor"
-msgstr ""
+msgstr "Faktor efikasnosti"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Human"
-msgstr ""
+msgstr "Čovjek"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
 msgid "Work Detail"
-msgstr ""
+msgstr "Detalj posla"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: resource
 #: code:addons/resource/resource.py:246
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopija)"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
-msgstr ""
+msgstr "Subota"
diff --git a/addons/resource/security/ir.model.access.csv b/addons/resource/security/ir.model.access.csv
index 576ee965121..533ad419274 100644
--- a/addons/resource/security/ir.model.access.csv
+++ b/addons/resource/security/ir.model.access.csv
@@ -1,8 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_resource_calendar","resource.calendar","model_resource_calendar","base.group_system",1,1,1,1
-"access_resource_calendar_attendance","resource.calendar.attendance","model_resource_calendar_attendance","base.group_system",1,1,1,1
-"access_resource_resource","resource.resource","model_resource_resource","base.group_system",1,0,0,0
-"access_resource_resource_all","resource.resource all","model_resource_resource",,1,0,0,0
-"access_resource_calendar_leaves","resource.calendar.leaves","model_resource_calendar_leaves","base.group_system",1,1,1,1
-
-
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_resource_calendar,resource.calendar,model_resource_calendar,base.group_system,1,1,1,1

+access_resource_calendar_attendance,resource.calendar.attendance,model_resource_calendar_attendance,base.group_system,1,1,1,1

+access_resource_resource,resource.resource,model_resource_resource,base.group_system,1,0,0,0

+access_resource_resource_all,resource.resource all,model_resource_resource,,1,0,0,0

+access_resource_calendar_leaves,resource.calendar.leaves,model_resource_calendar_leaves,base.group_system,1,1,1,1