[MERGE] merged with trunk-development-branch

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

4 files changed, 79 insertions, 63 deletions

diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index 581d54c9c4b..a58d4453665 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Recurring Documents',
     'version': '1.0',
-    'category': 'Hidden',
+    'category': 'Tools',
     'description': """
 Create recurring documents.
 ===========================
diff --git a/addons/subscription/i18n/hr.po b/addons/subscription/i18n/hr.po
index 6c34ec2fc9c..424b81722e2 100644
--- a/addons/subscription/i18n/hr.po
+++ b/addons/subscription/i18n/hr.po
@@ -7,89 +7,89 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2009-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-08 16:32+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \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 04:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-09 04:45+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
 #: field:subscription.subscription.history,document_id:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: subscription
 #: field:subscription.document,model:0
 msgid "Object"
-msgstr ""
+msgstr "Objekt"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
-msgstr ""
+msgstr "Ovaj tjedan"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "Pretraži pretplate"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
 msgid "First Date"
-msgstr ""
+msgstr "Početak"
 
 #. module: subscription
 #: field:subscription.document.fields,field:0
 msgid "Field"
-msgstr ""
+msgstr "Polje"
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: field:subscription.subscription,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
 msgid "Subscription history"
-msgstr ""
+msgstr "Povjest pretplate"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "Current Date"
-msgstr ""
+msgstr "Trenutni datum"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Weeks"
-msgstr ""
+msgstr "Tjedana"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Today"
-msgstr ""
+msgstr "Danas"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:44
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Greška !"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
 #: model:ir.ui.menu,name:subscription.menu_action_subscription_form
 #: view:subscription.subscription:0
 msgid "Subscriptions"
-msgstr ""
+msgstr "Pretplate"
 
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
@@ -99,50 +99,52 @@ msgstr ""
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Stop"
-msgstr ""
+msgstr "Zaustavi"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi kao nacrt"
 
 #. module: subscription
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
 msgstr ""
+"Modul dozvoljava kreiranje novih dokumenata i dodavanje pretplate na taj "
+"dokument."
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: selection:subscription.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "Pokrenuto"
 
 #. module: subscription
 #: view:subscription.subscription.history:0
 msgid "Subscription History"
-msgstr ""
+msgstr "Povjest pretplate"
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: field:subscription.subscription,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: subscription
 #: field:subscription.subscription,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Jedinica intervala"
 
 #. module: subscription
 #: field:subscription.subscription.history,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: subscription
 #: field:subscription.subscription,exec_init:0
 msgid "Number of documents"
-msgstr ""
+msgstr "Broj dokumenata"
 
 #. module: subscription
 #: help:subscription.document,active:0
@@ -150,17 +152,21 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription document without removing it."
 msgstr ""
+"If the active field is set to False, it will allow you to hide the "
+"subscription document without removing it.\r\n"
+"Ako je aktivno polje postavljeno na NE, možete sakriti dokument pretplate "
+"bez da ga uklonite."
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #. module: subscription
 #: field:subscription.document,name:0
 #: field:subscription.subscription,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:44
@@ -169,79 +175,81 @@ msgid ""
 "You cannot modify the Object linked to the Document Type!\n"
 "Create another Document instead !"
 msgstr ""
+"Ne možete promjeniti objekt povezan s tipom dokumenta!\n"
+"Kreirajte novi dokument!"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
 msgid "Fields"
-msgstr ""
+msgstr "Polja"
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: field:subscription.subscription,note:0
 #: field:subscription.subscription,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Months"
-msgstr ""
+msgstr "Mjeseci"
 
 #. module: subscription
 #: selection:subscription.subscription,interval_type:0
 msgid "Days"
-msgstr ""
+msgstr "Dani"
 
 #. module: subscription
 #: field:subscription.document,active:0
 #: field:subscription.subscription,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
-msgstr ""
+msgstr "Zakazani zadatak"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription
 #: field:subscription.subscription.history,subscription_id:0
 msgid "Subscription"
-msgstr ""
+msgstr "Pretplata"
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: field:subscription.subscription,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: subscription
 #: help:subscription.subscription,cron_id:0
 msgid "Scheduler which runs on subscription"
-msgstr ""
+msgstr "Upravitelj zakazivanja zadataka kod pretplata"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.config_recuuring_event
 #: model:ir.ui.menu,name:subscription.next_id_45
 msgid "Recurring Events"
-msgstr ""
+msgstr "Ponavljajući događaji"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Subsription Data"
-msgstr ""
+msgstr "Podaci o pretplati"
 
 #. module: subscription
 #: help:subscription.subscription,note:0
 msgid "Description or Summary of Subscription"
-msgstr ""
+msgstr "Opis ili sažetak pretplate"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
 msgid "Subscription Document"
-msgstr ""
+msgstr "Dokument pretplate"
 
 #. module: subscription
 #: help:subscription.subscription,active:0
@@ -249,66 +257,70 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na NE, dozvolit će vam skrivanje pretplate "
+"bez uklanja iste."
 
 #. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
 msgstr ""
+"Predefinirana vrijednost se uzima za polje kod generiranja novog dokumenta."
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
 msgid "False"
-msgstr ""
+msgstr "NE"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Process"
-msgstr ""
+msgstr "Proces"
 
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr ""
+msgstr "Pretplate i ponavljajuće operacije"
 
 #. module: subscription
 #: help:subscription.subscription,doc_source:0
 msgid ""
 "User can choose the source document on which he wants to create documents"
 msgstr ""
+"Korisnik može izabrati izvorni dokument prema kojem želi kreirati dokumente"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
 #: model:ir.ui.menu,name:subscription.menu_action_document_form
 msgid "Document Types"
-msgstr ""
+msgstr "Tipovi dokumenata"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:115
 #, python-format
 msgid "Wrong Source Document !"
-msgstr ""
+msgstr "Pogrešan izvorni dokument!"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr ""
+msgstr "Polja dokumenta pretplate"
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: selection:subscription.subscription,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:115
@@ -317,14 +329,16 @@ msgid ""
 "Please provide another source document.\n"
 "This one does not exist !"
 msgstr ""
+"Molim odaberite drugi izvorni dokument.\n"
+"Ovaj ne postoji!"
 
 #. module: subscription
 #: field:subscription.document.fields,value:0
 msgid "Default Value"
-msgstr ""
+msgstr "Predefinirana vrijednost"
 
 #. module: subscription
 #: view:subscription.subscription:0
 #: field:subscription.subscription,doc_lines:0
 msgid "Documents created"
-msgstr ""
+msgstr "Dokument kreiran"
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 4d4f829092b..35352cfa024 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
-access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
-access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
-access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
-access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
-access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1

+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1

+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1

+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1

+access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1

+access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1

+access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1

diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index e84cdb41c0d..7d665c96435 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
     </record>