diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index cbdb665e157..430d65e0bf9 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -25,7 +25,7 @@
                 </xpath>
                 <group colspan="8" position="inside">
                     <group colspan="4" width="600">
-                        <field name="charts"/>
+                            <field name="charts"/>
                             <group colspan="4" groups="account.group_account_user">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                                 <field name="has_default_company" invisible="1" />
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 36a87cc6459..d25190e01b2 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2487,6 +2487,9 @@
             <field eval="5" name="sequence"/>
             <field name="code">
 act_window_ids = pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context)
+ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_account_configuration_installer')
+if ref:
+    act_window_ids += [ref[1]]
 todo_ids = pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context)
 pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context)
 action = pool.get('res.config').next(cr, uid, [], context)
diff --git a/addons/account/installer.py b/addons/account/installer.py
index cfd434833ae..d1b19ef4319 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -24,6 +24,7 @@ import time
 import datetime
 from dateutil.relativedelta import relativedelta
 from operator import itemgetter
+from os.path import join as opj
 
 from tools.translate import _
 from osv import fields, osv
@@ -111,6 +112,11 @@ class account_installer(osv.osv_memory):
             context = {}
         fy_obj = self.pool.get('account.fiscalyear')
         for res in self.read(cr, uid, ids, context=context):
+            if 'charts' in res and res['charts'] == 'configurable':
+                #load generic chart of account
+                fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
+                tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
+                fp.close()
             if 'date_start' in res and 'date_stop' in res:
                 f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context)
                 if not f_ids:
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index c928ff3c8fe..64498127dc5 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -2,14 +2,17 @@
 <openerp><data>
 
     <record id="group_account_invoice" model="res.groups">
-        <field name="name">Accounting / Invoicing &amp; Payments</field>
+        <field name="name">Invoicing &amp; Payments</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
     </record>
     <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Accounting / Accountant</field>
+        <field name="name">Accountant</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
     <record id="group_account_manager" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Accounting / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
diff --git a/addons/account_payment/i18n/sr@latin.po b/addons/account_payment/i18n/sr@latin.po
index 6efe331146d..13925099baf 100644
--- a/addons/account_payment/i18n/sr@latin.po
+++ b/addons/account_payment/i18n/sr@latin.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 15:17+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-13 15:21+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@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:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-14 04:45+0000\n"
+"X-Generator: Launchpad (build 14487)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
-msgstr "Zakazani datum ako je fiskno"
+msgstr "Zakazani datum ako je fiksiran"
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -30,7 +30,7 @@ msgstr "Valuta partnera"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr "Postavi za obradu"
+msgstr "Postavi kao pripremu"
 
 #. module: account_payment
 #: help:payment.order,mode:0
@@ -41,7 +41,7 @@ msgstr "Odaberite način plaćanja koji će biti primenjen."
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr "Grupirano po"
+msgstr "Grupiši po..."
 
 #. module: account_payment
 #: model:ir.module.module,description:account_payment.module_meta_information
@@ -52,6 +52,11 @@ msgid ""
 "* a basic mechanism to easily plug various automated payment.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul omogućava:\n"
+"*efikasniji način za upravljanje isplaćivanja faktura\n"
+"*osnovni mehanizam za lako obrađivanje automatizovanih načina isplate\n"
+"    "
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -98,7 +103,7 @@ msgstr "Zeljeni Datum"
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr "slobodno"
+msgstr "Slobodno"
 
 #. module: account_payment
 #: field:payment.order.create,entries:0
@@ -108,18 +113,18 @@ msgstr "Stavke"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr "Koristeni Nalog"
+msgstr "Korišteni nalog"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
 #: field:payment.order.create,duedate:0
 msgid "Due Date"
-msgstr "Datum dospeća"
+msgstr "Krajnji rok"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Ne možete da napravite poteznu liniju na zatvorenim računima."
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -135,7 +140,7 @@ msgstr "_Dodaj u nalog za plaćanje"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr "Ispuna sadrzaja fakture"
+msgstr "Ispunjavanje sadržaja fakture"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -146,12 +151,12 @@ msgstr "Iznos"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Pogrešna vrednost kredita ili debita u ulazu računa !"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr "Ukupno u valuti preduzeca"
+msgstr "Ukupno u valuti preduzeća"
 
 #. module: account_payment
 #: selection:payment.order,state:0
@@ -172,7 +177,7 @@ msgstr "Referenca"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Red plaćanja mora biti jedinstven!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -212,7 +217,7 @@ msgstr "Efektivni datum fakture"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr "Tip Izuzetka"
+msgstr "Tip Izvršavanja"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -229,7 +234,7 @@ msgstr "Stanje"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Transaction Information"
-msgstr "Informacije Transakcije"
+msgstr "Informacije o transakciji"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
@@ -257,8 +262,8 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
-"Odaberite opciju za nalog za plaćanje: \"Fiksno\" znači datum naveden od "
-"vaše strane. \"Direktno\" znači direktno izvršenje. \"Datum odgode\" znači "
+"Odaberite opciju za nalog za plaćanje: \"Fiksirano\" znači datum naveden s "
+"Vaše strane. \"Direktno\" znači direktno izvršenje. \"Datum odgode\" znači "
 "zakazan datum izvršenja."
 
 #. module: account_payment
@@ -280,12 +285,12 @@ msgstr "Datum izvršenja"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Dnevnik banke ili keša za način plaćanja"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr "Fiksni datum"
+msgstr "Fiksirani datum"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
@@ -301,18 +306,19 @@ msgstr "Ciljni račun"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr "Pretrazi naloge za placanje"
+msgstr "Pretraži naloge za plaćanje"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Ne možete napraviti poteznu liniju na primaćem/platežnom računu bez partnera"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr "Kreirano"
+msgstr "Napravljeno"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -327,17 +333,17 @@ msgstr "Ukupni iznos valute"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr "Napravite plaćanja"
+msgstr "Izvršite plaćanja"
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr "Tip Komunikacije"
+msgstr "Tip komunikacije"
 
 #. module: account_payment
 #: model:ir.module.module,shortdesc:account_payment.module_meta_information
 msgid "Payment Management"
-msgstr "Menadzment Plaćanja"
+msgstr "Upravljanje plaćanjem"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
@@ -347,7 +353,7 @@ msgstr "Red Izvoda iz Banke"
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr "Krajnji Rok"
+msgstr "Krajnji rok"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
@@ -391,7 +397,7 @@ msgstr "Način plaćanja"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr "Datum"
+msgstr "Datum valute"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -412,23 +418,23 @@ msgstr "Priprema"
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr "Nasljedna poruka komunikacije."
+msgstr "Naredna poruka komunikacije."
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
-msgstr "Partner nije definisan"
+msgstr "Partner nije definisan na redu stavke"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
-msgstr "Adresa kupca naručitelja."
+msgstr "Adresa naručitelja."
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr "Popuni sadrzaj:"
+msgstr "Popuni sadržaj:"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -438,7 +444,7 @@ msgstr "Ukupno potražuje"
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr "Odaberite datum ako ste odabrali fiksni željeni datum"
+msgstr "Odaberite datum ako ste odabrali fiksirani željeni datum"
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -454,12 +460,12 @@ msgstr "Redovi plaćanja"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr "Sadrzaj Dnevnika"
+msgstr "Stavke dnevnika"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Preduzeće mora biti isto za sve vezane račune i periode."
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -492,12 +498,12 @@ msgstr "Ukupno:"
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation date"
-msgstr "Datum kreiranja"
+msgstr "Datum pravljenja"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr "Dodaj"
+msgstr "DODAJ"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -517,22 +523,22 @@ msgstr "Iznos u valuti preduzeca"
 #. module: account_payment
 #: help:payment.line,partner_id:0
 msgid "The Ordering Customer"
-msgstr "Kupac naručitelj"
+msgstr "Naručitelj"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr "Izvrsi placanje naloga"
+msgstr "Izvrši plaćanje naloga"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr "Referenca fakture"
+msgstr "Ref. fakture"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr "Vaše veze"
+msgstr "Vaš poziv na broj"
 
 #. module: account_payment
 #: field:payment.order,mode:0
@@ -578,7 +584,7 @@ msgstr "Otkaži"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Information"
-msgstr "Informacija"
+msgstr "Informacije"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -588,6 +594,10 @@ msgid ""
 "that should be done, keep track of all payment orders and mention the "
 "invoice reference and the partner the payment should be done for."
 msgstr ""
+"Nalog za plaćanje je zahtev za plaćanje od strane Vašeg preduzeća za isplatu "
+"faktura nabavke ili kupaca. Ovde možete snimiti sve naloge za plaćanje na "
+"čekanju, pratite sve naloge za plaćanje i pomenete poziv na broj za datu "
+"fakturu i kom partneru treba izvršiti isplatu."
 
 #. module: account_payment
 #: help:payment.line,amount:0
@@ -612,12 +622,12 @@ msgstr "Komunikacija 2"
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank account"
-msgstr "Destinacioni bankovni račun"
+msgstr "Ciljni bankovni račun"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr "Jeste li sigurni da zelite da izvrsite isplatu?"
+msgstr "Jeste li sigurni da želite da izvršite isplatu?"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -639,7 +649,7 @@ msgstr "Potvrdi plaćanja"
 #: field:payment.line,company_currency:0
 #: report:payment.order:0
 msgid "Company Currency"
-msgstr "Valuta preduzeca"
+msgstr "Valuta preduzeća"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main_payment
@@ -651,7 +661,7 @@ msgstr "Isplata"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr "Isplata  Faktura / Placanje"
+msgstr "Isplata  Faktura / Plaćanje"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -664,13 +674,13 @@ msgid ""
 "Used as the message between ordering customer and current company. Depicts "
 "'What do you want to say to the recipient about this order ?'"
 msgstr ""
-"Koristi se kao poruka izmedju narucioca i date kompanije. Objasnjava ' Sta "
-"ste to hteli reci kupcu o ovoj narudzbi?'"
+"Koristi se kao poruka između naručioca i date kompanije. Prikazuje ' Šta "
+"želite reći kupcu o ovoj narudžbini?'"
 
 #. module: account_payment
 #: field:payment.mode,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -681,7 +691,7 @@ msgstr "Bankovni račun"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr "Unos Informacije"
+msgstr "Informacije o unosu"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
@@ -702,7 +712,7 @@ msgstr "Ukupno"
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
 msgid "Make Payment"
-msgstr "Izvrsi placanje"
+msgstr "Izvrši placanje"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -713,7 +723,7 @@ msgstr "Partner"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr "Popuni Placanje"
+msgstr "Popuni plaćanje"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
@@ -723,7 +733,7 @@ msgstr "Bankovni račun za način plaćanja"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Ne možete napraviti poteznu liniju na računu po viđenju"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešno ime modela u definiciji akcije."
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 165bb92f6b9..3f8ec1036be 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -16,6 +16,7 @@
     </record>
     
     <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Useability / Analytic Accounting</field>
+        <field name="name">Analytic Accounting</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 </data></openerp>
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 3caf93a2430..087151cb6ea 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -2,11 +2,19 @@
 <openerp>
 <data noupdate="0">
 
+    <record model="ir.module.category" id="module_category_auction">
+        <field name="name">Auction</field>
+        <field name="parent_id" ref="base.module_category_specific_industry_applications"/>
+        <field name="sequence">26</field>
+    </record>
+
     <record id="group_auction_user" model="res.groups">
-        <field name="name">Auction / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_auction"/>
     </record>
     <record id="group_auction_manager" model="res.groups">
-        <field name="name">Auction / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_auction"/>
         <field name="implied_ids" eval="[(4, ref('group_auction_user'))]"/>
     </record>
 
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 0f78103a187..27d06dc4e22 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -45,7 +45,6 @@ Pay attention that this module converts the existing addresses into "addresses +
     'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
-        'security/base_contact_security.xml',
         'security/ir.model.access.csv',
         'base_contact_view.xml',
         'base_contact_installer_view.xml',
diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
deleted file mode 100644
index 56a995c76a8..00000000000
--- a/addons/base_contact/security/base_contact_security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    
-</data>
-</openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 3ee9c9e242f..ed3d86bf9b8 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 19f5615ee78..fdc85ba3d4d 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -39,7 +39,7 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'website': 'http://www.openerp.com',
     'depends': ['base', 'crm'],
     'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'crm_profiling_view.xml'],
+    'update_xml': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
     'test': [
         #'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 59137966da0..587ddbe0b52 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -159,30 +159,6 @@ class questionnaire(osv.osv):
     _name="crm_profiling.questionnaire"
     _description= "Questionnaire"
 
-    def build_form(self, cr, uid, data, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param data: Get Data
-            @param context: A standard dictionary for contextual values """
-        
-        query = """
-        select name, id
-        from crm_profiling_question
-        where id in ( select question from profile_questionnaire_quest_rel where questionnaire = %s)"""
-        res = cr.execute(query, (data['form']['questionnaire_name'],))
-        result = cr.fetchall()
-        quest_fields={}
-        quest_form='''<?xml version="1.0"?>
-            <form string="%s">''' % _('Questionnaire')
-        for name, oid in result:
-            quest_form = quest_form + '<field name="quest_form%d"/><newline/>' % (oid,)
-            quest_fields['quest_form%d' % (oid,)] = {'string': name, 'type': 'many2one', \
-                        'relation': 'crm_profiling.answer', 'domain': [('question_id','=',oid)] }
-        quest_form = quest_form + '''</form>'''
-        return quest_form, quest_fields
-
     _columns = {
         'name': fields.char("Questionnaire",size=128, required=True),
         'description':fields.text("Description", required=True),
@@ -210,25 +186,19 @@ class partner(osv.osv):
                                 "partner","answer","Answers"),
         }
 
-    def _questionnaire_compute(self, cr, uid, data, context=None):
+    def _questionnaire_compute(self, cr, uid, answers, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param data: Get Data
             @param context: A standard dictionary for contextual values """
-
-        temp = []
-        for x in data['form']:
-            if x.startswith("quest_form") and data['form'][x] != 0 :
-                temp.append(data['form'][x])
-
+        partner_id = context.get('active_id')
         query = "select answer from partner_question_rel where partner=%s"
-        cr.execute(query, (data['id'],))
+        cr.execute(query, (partner_id,))
         for x in cr.fetchall():
-            temp.append(x[0])
-
-        self.write(cr, uid, [data['id']], {'answers_ids':[[6, 0, temp]]}, context=context)
+            answers.append(x[0])
+        self.write(cr, uid, [partner_id], {'answers_ids': [[6, 0, answers]]}, context=context)
         return {}
 
 
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 258de2e4e2d..a54d3d4b0a9 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -2,13 +2,6 @@
 <openerp>
     <data>
 
-        <wizard
-            string="Using a questionnaire"
-            model="crm_profiling.questionnaire"
-            name="open_questionnaire"
-            menu="False"
-            id="wizard_open_questionnaire"/>
-
         <record model="ir.actions.act_window" id="open_questionnaires">
           <field name="name">Questionnaires</field>
           <field name="res_model">crm_profiling.questionnaire</field>
@@ -140,7 +133,7 @@
             <notebook position="inside">
                 <page string="Profiling">
                   <button string="Use a questionnaire"
-                      name="%(wizard_open_questionnaire)d" type="action" colspan="1"
+                      name="%(action_open_questionnaire)d" type="action" colspan="1"
                       icon="gtk-justify-fill" />
                   <newline/>
                   <field name="answers_ids" colspan="4" nolabel="1"/>
diff --git a/addons/crm_profiling/crm_profiling_wizard.xml b/addons/crm_profiling/crm_profiling_wizard.xml
deleted file mode 100644
index 39d436a6bd9..00000000000
--- a/addons/crm_profiling/crm_profiling_wizard.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-	</data>
-</openerp>
diff --git a/addons/crm_profiling/test/process/profiling.yml b/addons/crm_profiling/test/process/profiling.yml
index 91c48410f8d..99fe2da1733 100644
--- a/addons/crm_profiling/test/process/profiling.yml
+++ b/addons/crm_profiling/test/process/profiling.yml
@@ -1,10 +1,69 @@
+- |
+  I check segmentation which allows users to perform segmentation within partners.
 -
-  I check segmentation which allows users to perform segmentation within partners
-  and set the category according to question, so first compute questions(answers) 
-  scenario with parther and check that category set according to questions. 
+  I create a crm profiling question record.
+-
+  !record {model: crm_profiling.question, id: crm_profiling_question_openerppartner0}:
+    answers_ids:
+      - name: 'no'
+    name: OpenERP partner?
+-
+  I create a crm profiling answer record.
+-
+  !record {model: crm_profiling.answer, id: crm_profiling_answer_openerppartner0}:
+    name: 'yes'
+    question_id: crm_profiling_question_openerppartner0
+-
+  I create Partner category Customers.
+-
+  !record {model: res.partner.category, id: res_partner_category_customers0}:
+    name: Customers
+- |
+  I'm creating new partner "John" with his email "info@mycustomer.com".
+-
+  !record {model: res.partner, id: res_partner_john0}:
+    address:
+      - city: Bruxelles
+        country_id: base.be
+        street: Rue des Palais 51, bte 33
+        type: default
+        zip: '1000'
+        email: 'info@mycustomer.com'
+    name: John
+    category_id:
+      - res_partner_category_customers0
+
+-
+  Define the answers and category to partner.
 -
   !python {model: res.partner}: |
-    data ={'form': {'quest_form3': ref("partner_quality3"), 'quest_form2': ref("nb_employees2"),'quest_form1': ref("sector1"),'questionnaire_name': ref('questionnaire1')}, 'ids': [ref('base.res_partner_ericdubois0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('base.res_partner_ericdubois0')}
-    data = self._questionnaire_compute(cr, uid, data, context)
-    partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
-    assert partner.category_id[0].id == ref("base.res_partner_category_17"), "Category not assign properly" 
+    data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
+    context['active_id'] = ref('res_partner_john0')
+    self._questionnaire_compute(cr, uid, [ref('crm_profiling_answer_openerppartner0')], context)
+- |
+  I start by creating new Questionnaire.
+-
+  !record {model: crm_profiling.questionnaire, id: crm_profiling_questionnaire_basequestionnaire0}:
+    description: First questionnaire.
+    name: Base questionnaire
+    questions_ids:
+      - crm_profiling.activity_sector
+      - crm_profiling.nb_employees
+      - crm_profiling.partner_level
+-
+  I create a segmentation record.
+-
+  !record {model: crm.segmentation, id: crm_segmentation_test1}:
+    answer_yes:
+      - crm_profiling_answer_openerppartner0
+    categ_id: res_partner_category_customers0
+    name: test
+    parent_id: crm_profiling.crm_segmentation0
+    profiling_active: true
+    som_interval: 0.0
+- |
+  I continue the process of segmentation.
+-
+  !python {model: crm.segmentation}: |
+    self.process_continue(cr, uid, [ref('crm_segmentation_test1')], start=False)
+
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index 91b82a02d1a..b13c67640fc 100644
--- a/addons/crm_profiling/wizard/open_questionnaire.py
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -18,50 +18,72 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import pooler
-import wizard
-from tools import UpdateableStr, UpdateableDict
 
-_QUEST_FORM = UpdateableStr()
-_QUEST_FIELDS=UpdateableDict()
+from osv import osv, fields
+from tools.translate import _
 
-class open_questionnaire(wizard.interface):
-
-    def _questionnaire_compute(self, cr, uid, data, context):
-        pooler.get_pool(cr.dbname).get(data['model'])._questionnaire_compute(cr, uid, data, context)
-        return {}
-
-
-    def build_form(self, cr, uid, data, context):
-        quest_form, quest_fields = pooler.get_pool(cr.dbname).get('crm_profiling.questionnaire').build_form(cr, uid, data, context)
-        _QUEST_FORM. __init__(quest_form)
-        _QUEST_FIELDS.__init__(quest_fields)
-        return{}
-
-    _questionnaire_choice_arch = '''<?xml version="1.0"?>
-    <form string="Questionnaire">
-        <field name="questionnaire_name"/>
-    </form>'''
-
-    _questionnaire_choice_fields = {
-            'questionnaire_name': {'string': 'Questionnaire name', 'type': 'many2one', 'relation': 'crm_profiling.questionnaire', 'required': True },
+class open_questionnaire_line(osv.osv_memory):
+    _name = 'open.questionnaire.line'
+    _rec_name = 'question_id'
+    _columns = {
+        'question_id': fields.many2one('crm_profiling.question','Question', required=True),
+        'answer_id': fields.many2one('crm_profiling.answer', 'Answer'),
+        'wizard_id': fields.many2one('open.questionnaire', 'Questionnaire'),
     }
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': _questionnaire_choice_arch, 'fields': _questionnaire_choice_fields, 'state':[('end', 'Cancel','gtk-cancel'), ('open', 'Open Questionnaire','terp-camera_test')]}
-        },
-        'open': {
-            'actions': [build_form],
-            'result': {'type': 'form', 'arch':_QUEST_FORM, 'fields': _QUEST_FIELDS, 'state':[('end', 'Cancel','gtk-cancel'), ('compute', 'Save Data','terp-stock_format-scientific')]}
-        },
-        'compute': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _questionnaire_compute, 'state':'end'}
+open_questionnaire_line()
+
+class open_questionnaire(osv.osv_memory):
+    _name = 'open.questionnaire'
+    _columns = {
+        'questionnaire_id': fields.many2one('crm_profiling.questionnaire', 'Questionnaire name'),
+        'question_ans_ids': fields.one2many('open.questionnaire.line', 'wizard_id', 'Question / Answers'),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None: context = {}
+        res = super(open_questionnaire, self).default_get(cr, uid, fields, context=context)
+        questionnaire_id = context.get('questionnaire_id', False)
+        if questionnaire_id and 'question_ans_ids' in fields:
+            query = """
+                select question as question_id from profile_questionnaire_quest_rel where questionnaire = %s"""
+            cr.execute(query, (questionnaire_id,))
+            result = cr.dictfetchall()
+            res.update(question_ans_ids=result)
+        return res
+
+    def questionnaire_compute(self, cr, uid, ids, context=None):
+        """ Adds selected answers in partner form """
+        model = context.get('active_model')
+        answers = []
+        if model == 'res.partner':
+            data = self.browse(cr, uid, ids[0], context=context)
+            for d in data.question_ans_ids:
+                 if d.answer_id:
+                     answers.append(d.answer_id.id)
+            self.pool.get(model)._questionnaire_compute(cr, uid, answers, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+
+    def build_form(self, cr, uid, ids, context=None):
+        """ Dynamically generates form according to selected questionnaire """
+        models_data = self.pool.get('ir.model.data')
+        result = models_data._get_id(cr, uid, 'crm_profiling', 'open_questionnaire_form')
+        res_id = models_data.browse(cr, uid, result, context=context).res_id
+        datas = self.browse(cr, uid, ids[0], context=context)
+        context.update({'questionnaire_id': datas.questionnaire_id.id})
+
+        return {
+            'name': _('Questionnaire'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'open.questionnaire',
+            'type': 'ir.actions.act_window',
+            'views': [(res_id,'form')],
+            'target': 'new',
+            'context': context
         }
-    }
 
-open_questionnaire('open_questionnaire')
+open_questionnaire()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
new file mode 100644
index 00000000000..88955f43af4
--- /dev/null
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record id="view_open_questionnaire_form" model="ir.ui.view">
+            <field name="name">Open Questionnaires</field>
+            <field name="model">open.questionnaire</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Questionnaires">
+                    <field name="questionnaire_id" required="1"/>
+                    <newline/>
+                    <separator string="" colspan="4"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2"/>
+                        <button special="cancel" icon="gtk-cancel" string="Cancel"/>
+                        <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_open_questionnaire">
+            <field name="name">Open Questionnaire</field>
+            <field name="res_model">open.questionnaire</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_open_questionnaire_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <record id="open_questionnaire_form" model="ir.ui.view">
+            <field name="name">open.questionnaire.form</field>
+            <field name="model">open.questionnaire</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <separator colspan="4" string="Questionnaire"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2"/>
+                    <group col="2" colspan="2">
+                        <button icon='gtk-cancel' special="cancel" string="_Cancel" />
+                        <button name="questionnaire_compute" string="Save Data" icon="terp-stock_format-scientific" colspan="1" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_open_questionnaire_line_tree" model="ir.ui.view">
+            <field name="name">open.questionnaire.line.list</field>
+            <field name="model">open.questionnaire.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" string="Questionnaire">
+                    <field name="question_id"/>
+                    <field name="answer_id" domain="[('question_id', '=', question_id)]"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_open_questionnaire_line_form" model="ir.ui.view">
+            <field name="name">open.questionnaire.line.form</field>
+            <field name="model">open.questionnaire.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Questionnaire">
+                    <field name="question_id"/>
+                    <field name="answer_id" domain="[('question_id', '=', question_id)]"/>
+                </form>
+            </field>
+        </record>
+
+        <!-- Questionnaire form view -->
+        <!--<act_window
+            context="{}"
+            id="act_open_questionnaire"
+            name="Using a Questionnaire"
+            res_model="open.questionnaire"
+            src_model="crm_profiling.questionnaire"
+            view_id="view_open_questionnaire_form"
+            target="new"
+            view_mode="form"/>-->
+
+    </data>
+</openerp>
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index bc0281e388c..74f3426fc50 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -3,7 +3,8 @@
 <data noupdate="0">
 
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 465e01cdda3..599edd02111 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -42,7 +42,6 @@ Note that:
     'depends': ['crm', 'base_contact', 'account', 'marketing', 'mail'],
     'init_xml': [],
     'update_xml': [
-        'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_registration_view.xml',
         'wizard/event_confirm_view.xml',
@@ -54,7 +53,11 @@ Note that:
         'res_partner_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'test': ['test/test_event.yml'],
+    'test': ['test/process/event_confirm2done.yml',
+             'test/process/event_draft2cancel.yml',
+             'test/process/partner_register2invoice.yml',
+             'test/ui/duplicate_event.yml',
+             'test/ui/demo_data.yml'],
     'installable': True,
     'active': False,
     'certificate': '0083059161581',
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 8e8764ca1a7..4f86f620e6f 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -61,6 +61,8 @@
         <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
 		<field name="product_id" ref="event_product_0"/>
 		<field name="unit_price">68.00</field>
+		<field name="mail_auto_registr">True</field>
+		<field name="mail_auto_confirm">True</field>
 		<field name="user_id" ref="base.user_root"/>
 		<field name="register_max">500</field>
 		<field name="type" ref="event_type_1"/>
@@ -74,9 +76,9 @@
 		<field name="unit_price">24.00</field>
 		<field name="type" ref="event_type_1"/>
 		<field name="user_id" ref="base.user_root"/>
+		<field name="register_min">50</field>
 		<field name="register_max">350</field>
 	</record>
-    <function model="event.event" name="button_confirm" eval="[ref('event_1')]"/>
 	<record id="event_2" model="event.event">
 		<field name="name">Conference on ERP Buisness</field>
         <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
@@ -92,7 +94,7 @@
 		<field name="mail_confirm">Thanks for registration. The conference will begin at 2 PM and will be given by Mr. Pinckaers.</field>
 	</record>
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-    <function model="event.event" name="button_done" eval="[ref('event_2')]"/>
+    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
 
 <!-- Demo data for Event Registration-->
 	<record id="reg_1_1" model="event.registration">
@@ -126,5 +128,16 @@
 
 	 <function model="event.registration" name="check_confirm" eval="[ref('reg_0_1')]"/> 
 
+    <record id="reg_0_2" model="event.registration">
+        <field name="event_id" ref="event_2"/>
+        <field name="partner_id" ref="base.res_partner_c2c"/>
+        <field name="partner_invoice_id" ref="base.res_partner_c2c"/>
+        <field name="nb_register">5</field>
+        <field name="event_product">Ticket for Conference</field>
+        <field name="unit_price">20</field>
+    </record>
+    
+    <function model="event.registration" name="check_confirm" eval="[ref('reg_0_2')]"/>
+    
 	</data>
 </openerp>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
deleted file mode 100644
index c3c70c94d93..00000000000
--- a/addons/event/security/event_security.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
-    </record>
-
-    <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-  </data>
-</openerp>
-
diff --git a/addons/event/test/process/event_confirm2done.yml b/addons/event/test/process/event_confirm2done.yml
new file mode 100644
index 00000000000..4d5542896f7
--- /dev/null
+++ b/addons/event/test/process/event_confirm2done.yml
@@ -0,0 +1,22 @@
+-
+  I want to organize one conference event on "OpenERP Business", Customer subscribe/join 
+  into "Conference on OpenERP Business" with 6 tickets, first I confim this event. 
+-
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_0")])
+-
+  I Check that Event is "confirmed", and Its automatically sending mail to registered 
+  partner which joined to this event.
+-
+  !assert {model: event.event, id: event_0}:
+    - state == 'confirm', "Event should be confirmed."
+-
+  After completed event, I close this event.
+-
+  !python {model: event.event}: |
+    self.button_done(cr, uid, [ref("event_0")])
+-
+  Check that conference is in "close" state. 
+-
+  !assert {model: event.event, id: event_0}:
+    - state == 'done', "Event should be Closed."
diff --git a/addons/event/test/process/event_draft2cancel.yml b/addons/event/test/process/event_draft2cancel.yml
new file mode 100644
index 00000000000..48cb102f3e8
--- /dev/null
+++ b/addons/event/test/process/event_draft2cancel.yml
@@ -0,0 +1,22 @@
+-
+  I want to organize event and its need Minimum 50 Registrations to confirm/start 
+  this Event, but Only 10 registration confirm for this event, I confirm this event. 
+-
+  !python {model: event.event}: |
+    self.button_confirm(cr, uid, [ref("event_1")])
+-
+  Now I cheked for event and It should not be confirm because registrations for 
+  this event is below limit.
+-
+  !assert {model: event.event, id: event_1}:
+    - state == 'confirm', "Event should be confirm."
+-
+  So I cancel this Event
+-
+  !python {model: event.event}: |
+    self.button_cancel(cr, uid, [ref("event_1")])
+-
+  I check event should be cancel.
+-
+  !assert {model: event.event, id: event_1}:
+    - state == 'cancel', "Event should be cancel"
diff --git a/addons/event/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml
new file mode 100644
index 00000000000..f8748afee2f
--- /dev/null
+++ b/addons/event/test/process/partner_register2invoice.yml
@@ -0,0 +1,62 @@
+-
+  I want to organize one conference event, First I registered partner for event 
+  with 5 tickets.
+-
+  !python {model: partner.event.registration}: |
+    context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_ericdubois0")], 'active_id': ref("base.res_partner_ericdubois0")})
+    register = self.create(cr, uid, {'event_id': ref('event_1'),'nb_register': 5}, context=context)
+    self.open_registration(cr, uid, [register], context=context)
+-
+  Now I check for registration created base on partner.
+-
+  !python {model: event.registration}: |
+    ids = self.search(cr, uid, [('partner_id','=',ref("base.res_partner_ericdubois0")), ('event_id', '=', ref('event_1'))])
+    assert ids, "Registration should be create here."
+-
+  I confirm registration process.
+-
+  !python {model: event.registration}: |
+    self.check_confirm(cr, uid, [ref("reg_1_1")])
+-
+  I Check that Registration is confirm.
+- 
+  !assert {model: event.registration, id: reg_1_1}: 
+     - state == 'open', "Registration should be open here."
+-
+  After confirmation of partner, I create invoice base on costing of event. 
+-
+  !python {model: event.registration}: |
+    self.action_invoice_create(cr, uid, [ref("reg_1_1")])
+-
+  Now I Check for Invoice is created and Registration should be closed after invoice generated.
+- 
+  !python {model: event.registration}: |
+    record = self.browse(cr, uid, [ref("reg_1_1")])[0]
+    assert record.invoice_id, "Invoice should be generated"
+    assert record.invoice_id.state == "draft", "Invoice state should be draft"
+    assert record.invoice_id.partner_id == record.partner_id, "Customer is not correspond with registration"
+    assert record.invoice_id.type == 'out_invoice', "Invoice type is not correct"
+    assert record.invoice_id.origin == record.event_product, "Invoice origin is not correct"
+    assert record.invoice_id.amount_total == record.price_subtotal, "Invoice amount is not correct"
+    assert record.state == "done", "Registration should be closed after invoice generated"
+-
+  Now I check for same partner registration for two diffrent event and I create group invoices for same partner. 
+-
+  !python {model: event.make.invoice}: |
+    context.update({'active_model': 'event.make.invoice', 'active_ids': [ref("reg_0_1"), ref("reg_0_2")], 'active_id': ref("reg_0_1")})
+    invoice = self.create(cr, uid, {'grouped': True}, context=context)
+    self.make_invoice(cr, uid, [invoice], context=context)
+-
+  Now I Check for group Invoice is created with total amount of both registration
+  and Registration should be closed after invoice generated.
+- 
+  !python {model: event.registration}: |
+    reg_data_1 = self.browse(cr, uid, [ref("reg_0_1")])[0]
+    reg_data_2 = self.browse(cr, uid, [ref("reg_0_2")])[0]
+    assert reg_data_1.invoice_id, "Invoice should be generated"
+    assert reg_data_1.invoice_id.state == "draft", "Invoice state should be draft"
+    assert reg_data_1.invoice_id.partner_id == reg_data_1.partner_id, "Customer is not correspond with registration"
+    assert reg_data_1.invoice_id.type == 'out_invoice', "Invoice type is not correct"
+    assert reg_data_1.invoice_id.origin == reg_data_1.event_product, "Invoice origin is not correct"
+    assert reg_data_1.invoice_id.amount_total == (reg_data_1.price_subtotal + reg_data_2.price_subtotal), "Invoice total amount is not correct"
+    assert reg_data_1.state == "done", "Registration should be closed after invoice generated"
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
deleted file mode 100644
index 5e35d79cab2..00000000000
--- a/addons/event/test/test_event.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-- |
-  In order to test the "Event Organisation" in Association system.  
-- |
-  I want to organize one conference event on "OpenERP Business".
-- |
-  I'm creating new product "Conference Ticket" to specify registration Cost of conference.
-- 
-  !record {model: product.product, id: product_product_ticketforconcert0}:
-    categ_id: product.cat1
-    list_price: 68.0
-    name: Conference Ticket  
-- |
-  I'm creating Event type "Conference".
--   
-  !record {model: event.type, id: event_type_conference0}:
-     name: Conferences
-- |
-  I'm creating one Event "Conference on OpenERP Business" which will last from 1st of this month to 10th of this month.
--
-  !record {model: event.event, id: event_event_conference0}:
-    date_begin: !eval time.strftime('%Y-%m-01')
-    date_end: !eval time.strftime('%Y-%m-10')
-    name: Conference on OpenERP Business.
-    product_id: 'product_product_ticketforconcert0'
-    type: 'event_type_conference0'
-    reply_to: 'info@customer.com'
-- |
-  Check that the new conference event is "Draft" or not.
-- 
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'draft', "Event should be in draft by default when first time created"
-- |
-  Need Minimum 10 Registrations to confirm/start this Conference Event and does not allowed more than 100 Registrations.
-- |
-  So I set Minimum and Maximum Registrations limit.
--   
-  !python {model: event.event}: |
-    self.write(cr, uid, [ref('event_event_conference0')], {'register_max': 100, 'register_min': 10})
-- |
-  I'm doing to confirm that conference event.
--  
-  !python {model: event.event}: |
-    self.button_confirm(cr, uid, [ref("event_event_conference0")])
-- |
-  But this conference event need minimum 10 Confirmed Registrations. so Check that Event is not "confirmed". 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state != 'confirm', "Event should not confirmed if minimum registrations does not reached"
-- |
-  "Mark Johnson" want to subscribe/join into "Conference on OpenERP Business" with 10 tickets.
-- | 
-  I'm creating new partner "Mark Johnson" with his email "info@mycustomer.com".
-- 
-  !record {model: res.partner, id: res_partner_markjohnson0}:
-    address:
-      - city: Bruxelles
-        country_id: base.be
-        job_ids:
-          - contact_id: base_contact.res_partner_contact_jacot0
-            function: CTO
-            name: base.res_partner_maxtor
-            sequence_partner: 0.0
-            state: current
-        street: Rue des Palais 51, bte 33
-        type: default
-        zip: '1000'
-        email: 'info@mycustomer.com'
-    name: Mark Johnson
-    
-- |
-  I'm creating Registration for "Mark Johnson" on "Conference on OpenERP Business" with 10 tickets. 
-- 
-  !record {model: event.registration, id: event_registration_registrationjacot0}:
-    contact_id: base_contact.res_partner_contact_jacot0
-    event_id: event.event_event_conference0
-    partner_id: event.res_partner_markjohnson0
-    partner_invoice_id: event.res_partner_markjohnson0
-    event_product: Conference Ticket
-    unit_price: 68.0
-    nb_register: 10
-- |
-  I'm going to Open that Registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationjacot0")])
-- |
-  Check that Registration is in "Open" state or not.
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}: 
-     - state == 'open', "Registration should be open here."
-
-- |
-  I'm again trying to confirm that conference event.
--  
-  !python {model: event.event}: |
-    self.button_confirm(cr, uid, [ref("event_event_conference0")])
-    
-- |
-  Now Minimum requirement of Registration is fulfil. so Check that Event is "confirmed" or not. 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'confirm', "Event should be confirmed here."
-  
-- |
-  I'm creating invoice of Registration of "Mark Johnson" on "Conference on OpenERP Business".
--
-  !python {model: event.registration}: |
-    self.action_invoice_create(cr, uid, [ref("event_registration_registrationjacot0")])
-
-- |
-  Check Invoice of Registration of "Mark Johnson" is created or not.     
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}:
-     - invoice_id != False, "Invoice should be generated"
-
-- |
-  Check Registration of "Mark Johnson" is closed or not after invoice generated.     
-- 
-  !assert {model: event.registration, id: event_registration_registrationjacot0}:
-     - state != 'done',  "Registration should be closed after invoice generated"
-  
-- |
-  Now "Mark Johnson" want to another registration on "Conference on OpenERP Business" with 120 tickets.
-- |
-  I'm creating new registration for "Mark Johnson" with 100 tickets.
-- 
-  !record {model: event.registration, id: event_registration_registrationzen0}:
-    event_id: event.event_event_conference0
-    partner_id: event.res_partner_markjohnson0
-    partner_invoice_id: event.res_partner_markjohnson0
-    event_product: Conference Ticket
-    unit_price: 68.0
-    nb_register: 100
-    
-- |
-  I'm going to open "Mark Johnson" registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
-
-- |
-  But conference event does not allow more than 100 Registrations. so Check that registration is not in "open" state. 
--   
-  !assert {model: event.registration, id: event_registration_registrationzen0}:
-     - state == 'draft', "Registration should be in draft by default."
-- |
-  Now I'm modifying number of tickets of "Mark Johnson"'s registration with 90 tickets. 
-- 
-  !python {model: event.registration}: |
-    self.write(cr, uid, [ref("event_registration_registrationzen0")], {'nb_register': 90})
-- |
-  I'm again try to open "Mark Johnson" registration.     
-- 
-  !python {model: event.registration}: |
-    self.check_confirm(cr, uid, [ref("event_registration_registrationzen0")])
-
-- |
-  Check that registration "open" or not. 
--   
-  !assert {model: event.registration, id: event_registration_registrationzen0}:
-     - state == 'open', "Registration should be open here."
-- |
-  I'm closing "Conference on OpenERP Business" Conference event
-- 
-  !python {model: event.event}: |
-    self.button_done(cr, uid, [ref("event_event_conference0")])
-- |
-  Check that conference is in "close" state or not. 
--   
-  !assert {model: event.event, id: event_event_conference0}:
-     - state == 'done', "Registration should be Closed here."
-  
diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml
new file mode 100644
index 00000000000..2f48cf1a90b
--- /dev/null
+++ b/addons/event/test/ui/demo_data.yml
@@ -0,0 +1,32 @@
+-
+  I create event registation record to call event onchange and partner onchange.
+-
+  !record {model: event.registration, id: reg_0_1}:
+    event_id: event_0
+    partner_id: base.res_partner_asus
+    name: 'Ticket for Concert'
+-
+  I create event record to call product onchange and team onchange.
+-
+  !record {model: event.event, id: event_2}:
+    product_id: event_product_2
+    section_id: crm.section_sales_department
+    name: 'Conference on ERP Buisness'
+-
+  I call onchange event from event registration wizard. 
+-
+  !python {model: partner.event.registration}: |
+    context.update({'active_id': ref("base.res_partner_ericdubois0")})
+    self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context)
+-
+  I confirm event from wizard.
+-
+  !python {model: event.confirm}: |
+    context.update({'event_ids': [ref("event_2")]})
+    id = self.create(cr, uid , {})
+    self.confirm(cr, uid, [id], context=context)
+-
+  I call close registration process.
+-
+  !python {model: event.registration}: |
+    self.button_reg_close(cr, uid, [ref("reg_0_2")])
diff --git a/addons/event/test/ui/duplicate_event.yml b/addons/event/test/ui/duplicate_event.yml
new file mode 100644
index 00000000000..c1287353c67
--- /dev/null
+++ b/addons/event/test/ui/duplicate_event.yml
@@ -0,0 +1,16 @@
+-
+  Copy of event.
+-
+  !python {model: event.event}: |
+    try:
+      self.copy(cr, uid, ref("event_2"))
+    except:
+      pass
+-
+  Copy of event registarion.
+-
+  !python {model: event.registration}: |
+    try:
+      self.copy(cr, uid, ref("reg_1_1"))
+    except:
+      pass
\ No newline at end of file
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index b8521e404e2..45d56ddc41c 100644
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -34,8 +34,8 @@ class partner_event_registration(osv.osv_memory):
         'event_id': fields.many2one('event.event', 'Event'),
         'event_type': fields.many2one('event.type', 'Type', readonly=True),
         'unit_price': fields.float('Registration Cost', digits_compute=dp.get_precision('Sale Price')),
-        'start_date': fields.datetime('Start date', required=True, help="Beginning Date of Event", readonly=True),
-        'end_date': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True),
+        'start_date': fields.datetime('Start date', help="Beginning Date of Event", readonly=True),
+        'end_date': fields.datetime('Closing date', help="Closing Date of Event", readonly=True),
         'nb_register': fields.integer('Number of Registration'),
     }
     _defaults = {
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 8e77830184b..e8d1edd3712 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,11 +3,13 @@
     <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / HR Officer</field>
+        <field name="name">HR Officer</field>
+        <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">Human Resources / HR Manager</field>
+        <field name="name">HR Manager</field>
+        <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
     </record>
     <record id="hr_dept_comp_rule" model="ir.rule">
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index e0a8a002a6a..4e91155442b 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -62,8 +62,9 @@ re-invoice your customer's expenses if your work by project.
     'demo_xml': [
         'hr_expense_demo.xml',
         ],
-    'test': ['test/test_hr_expense.yml',
-             'test/hr_expense_report.yml',
+    'test': [
+             'test/expense_demo.yml',
+             'test/expense_process.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 478b8120935..572da086e8d 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -87,6 +87,7 @@ class hr_expense_expense(osv.osv):
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
     }
     _defaults = {
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': 'draft',
         'employee_id': _employee_get,
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 9660dbb2543..0e940c74cc0 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -8,18 +8,6 @@
             <field name="parent_id" ref="product.cat0"/>
             <field name="name">Expenses</field>
         </record>
-        
-        <record id="product_product_expense_car" model="product.product">
-            <field name="list_price">0.32</field>
-            <field name="standard_price">0.32</field>
-            <field name="uom_id" ref="product.product_uom_km"/>
-            <field name="uom_po_id" ref="product.product_uom_km"/>
-            <field name="type">consu</field>
-            <field name="name">Travel Expenses</field>
-            <field name="default_code">TRA</field>
-            <field name="categ_id" ref="hr_expense.cat_expense"/>
-            <field name="hr_expense_ok" eval="True" />
-        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 80c9cd66694..8912dfb09de 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -2,95 +2,88 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="product_product_expense_air" model="product.product">
-            <field name="list_price">1.0</field>
-            <field name="standard_price">1.0</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <record id="hr.employee4" model="hr.employee">
+            <field name="address_home_id" ref="base.res_partner_address_1"/>
+        </record>
+
+        <record id="car_travel" model="product.product">
+            <field name="list_price">0.32</field>
+            <field name="type">service</field>
+            <field name="name">Car Travel Expenses</field>
+            <field name="default_code">CarTRA</field>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
+            <field name="hr_expense_ok" eval="True" />
+        </record>
+
+        <record id="air_ticket" model="product.product">
+            <field name="list_price">700.0</field>
             <field name="type">service</field>
             <field name="name">Air Ticket</field>
             <field name="default_code">AT</field>
-            <field name="categ_id" ref="product.cat2"/>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
 
-        <record id="product_product_expense_hotel" model="product.product">
-            <field name="list_price">1.0</field>
-            <field name="standard_price">1.0</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <record id="hotel_rent" model="product.product">
+            <field name="list_price">400.0</field>
             <field name="type">service</field>
             <field name="name">Hotel Accommodation</field>
             <field name="default_code">HA0</field>
-            <field name="categ_id" ref="product.cat2"/>
+            <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
-
-        <record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="employee_id" ref="hr.employee1"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="name">May Expenses</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="date" eval="time.strftime('%Y-%m-03')"/>
-            <field name="state">draft</field>
+        <record id="expenses0" model="hr.expense.expense">
+            <field name="name">Expenses</field>
+            <field name="date" eval="time.strftime('%Y-08-25')"/>
+        </record>
+        <record id="expenses_line0" model="hr.expense.line">
+            <field name="name">Travel Expenses</field>
+            <field name="date_value" eval="time.strftime('%Y-08-10')"/>
+            <field name="analytic_account" ref="account.analytic_consultancy"/>
+            <field name="expense_id" ref="expenses0"/>
+            <field eval="200.0" name="unit_amount"/>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field eval="1.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
+        <record id="sep_expenses" model="hr.expense.expense">
+            <field name="employee_id" ref="hr.employee4"/>
+            <field name="name">September Expenses</field>
+            <field name="date" eval="time.strftime('%Y-09-28')"/>
+        </record>
+
+        <record id="travel_by_air_sep" model="hr.expense.line">
             <field name="name">Travel by Air</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+            <field name="date_value" eval="time.strftime('%Y-09-03')"/>
             <field name="analytic_account" ref="account.analytic_consultancy"/>
-            <field name="product_id" ref="product_product_expense_air"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
+            <field name="product_id" ref="air_ticket"/>
+            <field name="expense_id" ref="sep_expenses"/>
             <field eval="700.0" name="unit_amount"/>
             <field name="uom_id" ref="product.product_uom_unit"/>
             <field eval="1.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
-            <field name="name">Basic PC - Server for Seagate</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
-            <field name="analytic_account" ref="account.analytic_seagate_p2"/>
-            <field name="product_id" ref="product.product_product_pc4"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
-            <field eval="1200.0" name="unit_amount"/>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field eval="1.0" name="unit_quantity"/>
-        </record>
-
-    </data>
-
-    <data noupdate="1">
-        <record id="hr_expense_expense_septemberexpenses1" model="hr.expense.expense">
-            <field name="currency_id" ref="base.EUR"/>
-            <field name="employee_id" ref="hr.employee1"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="name">Travel Expenses</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="date" eval="time.strftime('%Y-%m-20')"/>
-            <field name="state">draft</field>
-        </record>
-
-        <record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
+        <record id="hotel_bill_sep" model="hr.expense.line">
             <field name="name">Hotel Expenses - Thymbra</field>
-            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+            <field name="date_value" eval="time.strftime('%Y-09-20')"/>
             <field name="analytic_account" ref="account.analytic_thymbra"/>
-            <field name="product_id" ref="product_product_expense_hotel"/>
-            <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+            <field name="product_id" ref="hotel_rent"/>
+            <field name="expense_id" ref="sep_expenses"/>
             <field eval="400.0" name="unit_amount"/>
             <field name="uom_id" ref="product.product_uom_unit"/>
             <field eval="5.0" name="unit_quantity"/>
         </record>
 
-        <record id="hr_expense_line_car_travel" model="hr.expense.line">
+        <record id="car_travel_sep" model="hr.expense.line">
                 <field name="name">Bruxelles - Paris</field>
-                <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
+                <field name="date_value" eval="time.strftime('%Y-09-15')"/>
                 <field name="analytic_account" ref="account.analytic_thymbra"/>
-                <field name="product_id" ref="product_product_expense_car"/>
-                <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
+                <field name="product_id" ref="car_travel"/>
+                <field name="expense_id" ref="sep_expenses"/>
                 <field eval="0.30" name="unit_amount"/>
                 <field name="uom_id" ref="product.product_uom_km"/>
                 <field eval="622.0" name="unit_quantity"/>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
new file mode 100644
index 00000000000..5b3cb0893d0
--- /dev/null
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -0,0 +1,11 @@
+-
+  !record {model: hr.expense.expense, id: sep_expenses}:
+    employee_id: hr.employee4
+    name : 'John Smith'
+-
+  !record {model: product.product, id: car_travel}:
+    hr_expense_ok: 'True'
+-
+  !record {model: hr.expense.line, id: expense_line}:
+    product_id: car_travel
+    name: 'Car Travel Expenses'
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
new file mode 100644
index 00000000000..5c8a9d53f7c
--- /dev/null
+++ b/addons/hr_expense/test/expense_process.yml
@@ -0,0 +1,60 @@
+-
+  In order to test the process of "Employee Expenses" by processing the expenses, I confirm Expense Bill of an employee for September month. 
+-
+  !workflow {model: hr.expense.expense, action: confirm, ref: sep_expenses}
+-
+  I check that state is 'Confirm'.
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Confirm state}:
+    - state == 'confirm'
+-
+  I approve the September expenses.
+-
+  !workflow {model: hr.expense.expense, action: validate, ref: sep_expenses}
+-
+  I check that state is 'Approved'
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Approved state}:
+    - state == 'accepted'
+-
+  I make Invoice for the expense.
+-
+  !python {model: hr.expense.expense}: |
+    self.invoice(cr, uid, [ref('sep_expenses')])
+-
+  I check invoice details.
+-
+  !python {model: hr.expense.expense}: |
+    sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
+    assert sep_expenses.state == 'invoiced', "Expense should be in 'Invoiced' state."
+    assert sep_expenses.invoice_id, "Expense should have link of Invoice."
+    assert sep_expenses.invoice_id.currency_id == sep_expenses.currency_id,"Invoice currency is not correspond with supplier invoice currency"
+    assert sep_expenses.invoice_id.origin == sep_expenses.name,"Invoice origin is not correspond with supplier invoice"
+    assert sep_expenses.invoice_id.type == 'in_invoice', "Invoice type is not supplier invoice"
+    assert sep_expenses.invoice_id.amount_total == sep_expenses.amount,"Invoice total amount is not correspond with supplier invoice total"
+    assert len(sep_expenses.invoice_id.invoice_line) == len(sep_expenses.line_ids),"Lines of Invoice and supplier invoice Line are not correspond"
+    #TODO: check invoice line details with Expenses lines
+-
+  I pay the expenses.
+-
+  !python {model: hr.expense.expense}: |
+    self.expense_paid(cr, uid, [ref('sep_expenses')])
+-
+  I check that state of expenses is 'Paid'.
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Paid state}:
+    - state == 'paid'
+-
+  I duplicate the expenses and cancel duplicated.
+-
+  !python {model: hr.expense.expense}: |
+    duplicate_id = self.copy(cr, uid, ref('sep_expenses'), context=context)
+    self.expense_canceled(cr, uid, [duplicate_id])
+-
+  I print a report of the expenses.
+- 
+  !python {model: hr.expense.expense}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.hr.expense').create(cr, uid, [ref('hr_expense.sep_expenses')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)
diff --git a/addons/hr_expense/test/hr_expense_report.yml b/addons/hr_expense/test/hr_expense_report.yml
deleted file mode 100644
index 4c81ceb5976..00000000000
--- a/addons/hr_expense/test/hr_expense_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a HR Expense, we will print a HR Expense
-- 
-  !python {model: hr.expense.expense}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.hr.expense').create(cr, uid, [ref('hr_expense.hr_expense_expense_septemberexpenses0'),ref('hr_expense.hr_expense_expense_septemberexpenses1')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml
deleted file mode 100644
index bd13529d645..00000000000
--- a/addons/hr_expense/test/test_hr_expense.yml
+++ /dev/null
@@ -1,121 +0,0 @@
--
-  In order to test hr_expenses for OpenERP, I create expenses for employee and manage employee's expenses.
--
-  I create an unit of measure category "Working Time".
--
-  !record {model: product.uom.categ, id: product_uom_categ_workingtime0}:
-    name: Working Time.
-
--
-  I create a new employee.
--
-  !record {model: hr.employee, id: hr.employee}:
-    address_home_id: base.res_partner_address_1
-    address_id: base.main_address
--
-  I assign home address to employee.
--
-  !record {model: hr.employee, id: hr.employee1}:
-    address_home_id: base.res_partner_address_1
-    address_id: base.main_address
--
-  I create product unit of measure "Hour".
--
-  !record {model: product.uom, id: product_uom_hour0}:
-    category_id: 'product_uom_categ_workingtime0'
-    factor: 8.0
-    name: Hour
-    rounding: 0.01
--
-   I Create a product "travel".
--
-  !record {model: product.product, id: product_product_travel0}:
-    categ_id: product.product_category_services
-    cost_method: standard
-    list_price: 800.0
-    mes_type: fixed
-    name: Travel
-    procure_method: make_to_stock
-    standard_price: 700.0
-    supply_method: buy
-    type: product
-    uom_id: 'product_uom_hour0'
-    uom_po_id: 'product_uom_hour0'
-    volume: 0.0
-    warranty: 0.0
-    weight: 0.0
-    weight_net: 0.0
--
-  I mark this product for expenses.
--
-  !python {model: product.product}: |
-    self.on_change_hr_expense_ok(cr, uid, [ref('product_product_travel0')], True)
--
-  I create an expense.
--
-  !record {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    company_id: base.main_company
-    date: !eval "'%s-05-05' %(datetime.now().year)"
-    name: September Expenses
-    line_ids:
-      - date_value: !eval "'%s-05-27' %(datetime.now().year)"
-        name: Travel
-        product_id: 'product_product_travel0'
-        sequence: 0.0
-        uom_id: product.product_uom_unit
-        unit_amount: 700.0
-    user_id: base.user_root
--
-  I check that expense is in "Draft" state.
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'draft'
--
-  I change the employee on expense form.
--
-  !python {model: hr.expense.expense}: |
-    res = self.onchange_employee_id(cr, uid, [ref('hr_expense_expense_september0')], ref('hr.employee1'), None)
-    values = dict([('employee_id', ref('hr.employee1'))] + res['value'].items())
-    self.write(cr, uid, [ref('hr_expense_expense_september0')], values, None)
--
-  Now I change the related product on expense line.
--
-  !python {model: hr.expense.expense}: |
-    exp_line_obj = self.pool.get('hr.expense.line')
-    exp_obj = self.browse(cr, uid, ref('hr_expense_expense_september0'), None)
-    line_ids = [line.id for line in exp_obj.line_ids]
-    res = exp_line_obj.onchange_product_id(cr, uid, line_ids, ref('product_product_expense_air'), False, ref('hr.employee1'), None)
-    values = dict([('product_id', ref('product_product_expense_air'))] + res['value'].items())
-    exp_line_obj.write(cr, uid, line_ids, values, None)
--
-  I confirm this expenses by click on "Confirm" button.
--
-  !workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_september0}
-
--
-  I check that state is "Waiting Confirmation".
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'confirm'
--
-  I accept this expense by click on "Accept" button.
--
-  !workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_september0}
-
--
-  I invoiced this expense by click on "Invoice" button.
--
-  !python {model: hr.expense.expense}: |
-    self.invoice(cr, uid, [ref('hr_expense_expense_september0')], None)
--
-  I check that state is "Invoiced".
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
-    - state == 'invoiced'
--
-  I check that Invoice is created for the expense.
--
-  !python {model: hr.expense.expense}: |
-    exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0]
-    assert exp.invoice_id, "Invoice should be created"
-
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 344cbc64292..02a3cbdbdd8 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -3,10 +3,12 @@
 <data>
 
     <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>
 
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index b4c7bb99c1b..560fdce0506 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="0">
-            <record id="base.group_sale_manager" model="res.groups">
-                <field name="name">Sales / Manager</field>
-            </record>
 
-            <record id="base.group_document_user" model="res.groups">
-                <field name="name">Knowledge / User</field>
-            </record>
+    <record id="base.group_document_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 4cc109f814a..cd96d4ee9dc 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "author" : "conexus.at",
     "website" : "http://www.conexus.at",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": "This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at. Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.",
     "demo_xml" : [],
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index e4bdeccbd75..c8f44493597 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {   'name': 'Belgium - Accounting',
     'version': '1.1',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Belgium in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 8b0c34f6b78..909d4f53600 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -20,7 +20,7 @@
 
 {
     'name': 'Brazilian - Accounting',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 Base module for the Brazilian localization
 ==========================================
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 430bc31c7c3..800ca7937eb 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -23,7 +23,7 @@
     "version" : "1.0",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the English and French - Canadian accounting chart in OpenERP.
 ===========================================================================================
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 4e1988e6c75..b2363ca051b 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -63,7 +63,7 @@ TODO :
 """,
     "version" : "6.1",
     "author" : "Camptocamp",
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     "website": "http://www.camptocamp.com",
 
     "depends" : [
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 1057eae7807..24823f96eb7 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name" : "中国会计科目表 - Accounting",
     "version" : "1.0",
-    "category": "Localization",
+    "category": "Localization/Account Charts",
     "author" : "openerp-china.org",
     "maintainer":"openerp-china.org",
     "website":"http://openerp-china.org",
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index 6eb78017547..6052115df3b 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -38,7 +38,7 @@
     'url': 'http://launchpad.net/openerp-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of accounts for Costa Rica.
 =================================
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 45bcc7dd210..232a1abb3ad 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -125,7 +125,7 @@
     "version" : "1.0",
     "author" : "openbig.org",
     "website" : "http://www.openbig.org",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 71f18c1e6f3..9dd81606036 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -20,7 +20,7 @@
 {
     'name': 'Ecuador - Accounting',
     'version': '1.1',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Ecuador in OpenERP.
 ==============================================================================
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index d68a465969e..4da526f4b76 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -26,7 +26,7 @@
     "version" : "3.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index a7f5eea650d..d4b4f91d911 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -30,7 +30,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index 4ab134e18b9..0ad042b3b28 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "0.2",
     "author" : "P. Christeas, OpenERP SA.",
     "website": "http://openerp.hellug.gr/",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index c4f9ff0f0a4..f05bbdaaff1 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -35,7 +35,7 @@
 {
     'name': 'Guatemala - Accounting',
     'version': '3.0',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Guatemala.
 =====================================================================
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
index 157d396a6ae..af8bb4cfa1d 100644
--- a/addons/l10n_hn/__openerp__.py
+++ b/addons/l10n_hn/__openerp__.py
@@ -35,7 +35,7 @@
 {
     'name': 'Honduras - Accounting',
     'version': '0.1',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras.  It also includes taxes and the Lempira currency""",
     'author': 'Salvatore Josue Trimarchi Pinto',
     'website': 'http://trimarchi.co.cc',
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 6578eb2242a..2c54ca256fc 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -29,7 +29,7 @@ Indian Accounting : Chart of Account.
 Indian accounting chart and localization.
     """,
     "author": ['OpenERP SA', 'Axelor'],
-    "category": "Localization",
+    "category": "Localization/Account Charts",
     "depends": [
         "account",
         "account_chart"
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 5376896cf06..b531db26c99 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -39,7 +39,7 @@ Piano dei conti italiano di un'impresa generica.
 Italian accounting chart and localization.
     """,
     "license": "AGPL-3",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     'website': 'http://www.openerp-italia.org/',
     'init_xml': [
         ],
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index fdb9240c63c..68c2e7ac76b 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Luxembourg - Accounting',
     'version': '1.0',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Luxembourg.
 ======================================================================
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index d1d2c5900c9..69fd801e1dc 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Maroc - Accounting",
     "version" : "1.0",
     "author" : "kazacube",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 1e8c3bdc9c8..aa21d1a6356 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "Mexico - Accounting",
     "version" : "1.0",
     "author" : "RelTek Mexico",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Mexico in OpenERP.
 ========================================================================
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 951a8e45c68..562fd0ab876 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -88,7 +88,7 @@
 {
     "name" : "Netherlands - Accounting",
     "version" : "1.5",
-    "category": "Localization",
+    "category": "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
 =============================================================================
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index f9acc28db9e..de1784009b5 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "Grzegorz Grzelak (Cirrus)",
     "website": "http://www.cirrus.pl",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """
 This is the module to manage the accounting chart and taxes for Poland in OpenERP.
 ==================================================================================
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 69886777879..df441869d72 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -24,7 +24,7 @@
     "version" : "1.1",
     "author" : "filsys",
     "website": "http://www.filsystem.ro",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "depends" : ["account_chart", 'base_vat'],
     "description": """
 This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 197199092c9..7b258a04507 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -23,7 +23,7 @@
     "name" : "OHADA - Accounting",
     "version" : "1.0",
     "author" : "Baamtu Senegal",
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description": """This module implements the accounting chart for OHADA area.
     It allows any company or association to manage its financial accounting.
     Countries that use OHADA are the following:
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index ea29b7cde13..c1534787721 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Thailand - Accounting',
     'version': '1.0',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """
 Chart of Accounts for Thailand.
 ===============================
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index 1e205759a8b..f6e8212aed0 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'UK - Accounting',
     'version': '1.0',
-    'category': 'Localization',
+    'category': 'Localization/Account Charts',
     'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with:
     - a CT600-ready chart of accounts
     - VAT100-ready tax structure
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index 06c1ce9747e..ce44be32771 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -26,7 +26,7 @@
     "name" : "Venezuela - Accounting",
     "version" : "1.0",
     "author" : ['OpenERP SA', "Netquatro"],
-    "category" : "Localization",
+    "category" : "Localization/Account Charts",
     "description":
 '''
 This is the module to manage the accounting chart for Venezuela in OpenERP.
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index e84cdb41c0d..7d665c96435 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_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>
 
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 344e562eb67..d04473da8bf 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -2,11 +2,13 @@
 <openerp>
 <data>
     <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
     </record>
 
     <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
         <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
     </record>
 
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index feee2db4426..4600dbaa8c6 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 08:21+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 09:28+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-12-07 04:51+0000\n"
-"X-Generator: Launchpad (build 14435)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -31,6 +31,11 @@ msgid ""
 "raw materials (stock decrease) and the production of the finished products "
 "(stock increase) when the order is processed."
 msgstr ""
+"Manufacturing Orders are usually proposed automatically by OpenERP based on "
+"the bill of materials and the procurement rules, but you can also create "
+"manufacturing orders manually. OpenERP will handle the consumption of the "
+"raw materials (stock decrease) and the production of the finished products "
+"(stock increase) when the order is processed."
 
 #. module: mrp
 #: help:mrp.production,location_src_id:0
@@ -40,22 +45,22 @@ msgstr "Mjesto gdje sistem traži komponente"
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr "Iskorištenje Radnih Centara"
+msgstr "Iskorištenost radnih centara"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr "Slijed Radnih Centara"
+msgstr "Radni centri usmjeravanja"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr ""
+msgstr "Planiranje resursa proizvodnje"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr "Br. Ciklusa"
+msgstr "Br. ciklusa"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
@@ -68,12 +73,14 @@ msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
 msgstr ""
+"'Pravilo minimalne zalihe' omogućuje automatsko kreiranje naloga nabave kada "
+"nivo zalihe dostigne definirani minimum."
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr ""
+msgstr "Skladišnica"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -90,7 +97,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr "Otpad"
+msgstr "Otpis proizvoda"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -102,22 +109,22 @@ msgstr "Dan"
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
 msgid "Routings"
-msgstr ""
+msgstr "Usmjeravanja"
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Proizvod radnog centra"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr "Pretraži Listu Materijala"
+msgstr "Traži sastavnice"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "For stockable products and consumables"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
@@ -130,6 +137,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Number of iterations this work center has to do in the specified operation "
+"of the routing."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -137,18 +146,18 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr "Referenca"
+msgstr "Vezna oznaka"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr "Gotovi Proizvodi"
+msgstr "Gototvi proizvodi"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr "Za Kupiti"
+msgstr "Za nabaviti"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -165,17 +174,17 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
-msgstr ""
+msgstr "Sustav automatski pokreče RFQ na preferiranog dobavljača."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr "Proizvodi za Završiti"
+msgstr "Proizvodi za završiti"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr "Set / Pakovanje"
+msgstr "Set / Paket"
 
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
@@ -188,12 +197,12 @@ msgstr "MRP Podproizvodi"
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Stanje"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
 msgid "Cost per hour"
-msgstr "Trošak po Stu"
+msgstr "Trošak po satu"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
@@ -201,7 +210,7 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
-"U slučaju da je metoda nabave proizvoda Proizvodnja, sistem kreira nalog za "
+"Kada je metoda nabave proizvoda Proizvodnja, sistem kreira nalog za "
 "proizvodnju."
 
 #. module: mrp
@@ -217,7 +226,7 @@ msgstr "JM"
 #: field:mrp.production.order,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
-msgstr "Količina proizvoda"
+msgstr "Količina"
 
 #. module: mrp
 #: help:mrp.workcenter,product_id:0
@@ -225,6 +234,8 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Ispunite ovaj proizvod kako b jednostavno  pratili troškove proizvodnje  "
+"unutar analitike računovodstva."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -244,7 +255,7 @@ msgstr "Izvještavanje"
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
-msgstr "Račun Ciklusa"
+msgstr "Konto ciklusa"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -260,7 +271,7 @@ msgstr "["
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr "Nabava servisa"
+msgstr "Nabava usluga"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -270,7 +281,7 @@ msgstr "Informacija o kapacitetu"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Destination Location"
-msgstr "Odredišna Lokacija"
+msgstr "Odredišna lokacija"
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -280,7 +291,7 @@ msgstr "naslov"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr "Matični Podaci"
+msgstr "Glavni podaci"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockmts0
@@ -288,11 +299,13 @@ msgid ""
 "The system waits for the products to be available in the stock. These "
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
-msgstr "Referenca Parnera"
+msgstr "Oznaka partnera"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
@@ -337,7 +350,7 @@ msgstr "Lipanj"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr "Proizvedi Proizvod"
+msgstr "Proizvedi proizvod"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -353,12 +366,12 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr "Nabava skladištivog Proizvoda"
+msgstr "Nabava uskladištivog proizvoda"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr "Predefinirana JM"
+msgstr "Uobičajena JM"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -377,7 +390,7 @@ msgstr "Broj sati"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Confirm Production"
-msgstr "Potvrdi Proizvodnju"
+msgstr "Potvrdi proizvodnju"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
@@ -385,6 +398,8 @@ msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
 msgstr ""
+"Sistem kreira nalog (za proizvodnju ili nabavu) prema prodanim količinama i "
+"parametrima proizvoda."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -392,6 +407,8 @@ msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
 msgstr ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
@@ -411,7 +428,7 @@ msgstr "Radno vrijeme"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
-msgstr "Tjedna Varijacija Vrijednosti Zalihe"
+msgstr "Tjedna varijacija vrijednosti zalihe"
 
 #. module: mrp
 #: help:mrp.installer,mrp_repair:0
@@ -425,12 +442,12 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,date_planned:0
 msgid "Scheduled Date"
-msgstr "Planirani Datum"
+msgstr "Planirani datum"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Lista Materijala"
+msgstr "Sastavnica"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -439,21 +456,24 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
 
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Stock Value Variation"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Struktura Liste Materijala"
+msgstr "Struktura sastavnice"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr "Tip proizvoda je servis"
+msgstr "Tip proizvoda je usluga"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -461,16 +481,18 @@ msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bill of materials."
 msgstr ""
+"Define specific property groups that can be assigned to the properties of "
+"your bill of materials."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Dekompozicija proizvodnje"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr "Za Servise"
+msgstr "Za usluge."
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -484,6 +506,8 @@ msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
 msgstr ""
+"Complete this only if you want automatic analytic accounting entries on "
+"production orders."
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -494,7 +518,7 @@ msgstr "Broj ciklusa"
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr "Zahtjev za Ponudu"
+msgstr "Zahtjev za ponudom"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -502,32 +526,34 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
 
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Pogreška: Nevažeći EAN kod"
+msgstr "Greška: Neispravan barkod!"
 
 #. module: mrp
 #: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr ""
+msgstr "Lokacija proizvodnje"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr ""
+msgstr "Promjeni kol."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
-msgstr ""
+msgstr "Force Reservation"
 
 #. module: mrp
 #: field:mrp.bom.revision,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: mrp
 #: field:report.mrp.inout,value:0
@@ -537,12 +563,12 @@ msgstr "Vrijednost Zalihe"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr ""
+msgstr "Proizvod BoM Struktura"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr "Pretraži Proizvodnju"
+msgstr "Traži proizvodnju"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -558,36 +584,36 @@ msgstr "Ožujak"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "BoM Hierarchy"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
 #: view:mrp.product.produce:0
 #: view:mrp.production:0
 msgid "Produce"
-msgstr ""
+msgstr "Produce"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "Trošak radnog centra po ciklusu."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Skladišna iznimka"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr ""
+msgstr "BoM Lines"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr ""
+msgstr "Time before prod."
 
 #. module: mrp
 #: help:mrp.routing,active:0
@@ -595,11 +621,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
+"If the active field is set to False, it will allow you to hide the routing "
+"without removing it."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "Usmjeravanje materijala"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -607,7 +635,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,consumed_products:0
 msgid "Consumed Products"
-msgstr "Utrošeni Proizvodi"
+msgstr "Utrošeni proizvodi"
 
 #. module: mrp
 #: constraint:mrp.bom:0
@@ -619,7 +647,7 @@ msgstr ""
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr "Opterećenje Radnog Centra"
+msgstr "Opterećenje radnog centra"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:45
@@ -631,7 +659,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr "Komponente Liste Materijala"
+msgstr "Komponente sastavnice"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
@@ -656,16 +684,20 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"plannification."
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr ""
+msgstr "Vrijeme u satima za jedan ciklus."
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr ""
+msgstr "Ozn. sastavnice"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -678,7 +710,7 @@ msgstr "U proizvodnji"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr ""
+msgstr "Glavna sastavnica"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -686,6 +718,7 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
+"JP proizvoda (Jedinica Prodaje) je mjerna jedinica za fakturiranje prodaje."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -697,7 +730,7 @@ msgstr "Ispis"
 #: view:mrp.bom:0
 #: view:mrp.workcenter:0
 msgid "Type"
-msgstr "Tip"
+msgstr "Vrsta"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:150
@@ -709,7 +742,7 @@ msgstr "Ukupni Trošak "
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "Vezano na 'Pravilo minimalne zalihe' metodu nabave."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -727,7 +760,7 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
-msgstr "Ime Proizvoda"
+msgstr "Naziv proizvoda"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:491
@@ -738,7 +771,7 @@ msgstr "Pogrešna akcija !"
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
-msgstr ""
+msgstr "A factor of 0.9 means a loss of 10% within the production process."
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -756,12 +789,12 @@ msgstr "Datum ispisa"
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr ""
+msgstr "ZZP (RFQ)"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "Pravilo nabave"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -790,6 +823,9 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -800,12 +836,12 @@ msgstr "Hitno"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "Work Center Usage"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr "Nalog za Proizvodnju"
+msgstr "Nalog proizvodnje"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -823,19 +859,19 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,cycle_total:0
 msgid "Total Cycles"
-msgstr "Ukupno Ciklusa"
+msgstr "Ukupno ciklusa"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Ready to Produce"
-msgstr "Spremno za Proizvodnju"
+msgstr "Spremno za proizvodnju"
 
 #. module: mrp
 #: field:mrp.bom.revision,name:0
 msgid "Modification name"
-msgstr "Ime promjene"
+msgstr "Naziv promjene"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -847,7 +883,7 @@ msgstr "Datum"
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr ""
+msgstr "BoM Type"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -865,7 +901,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: view:mrp.property:0
 msgid "Search"
-msgstr "Traži"
+msgstr "Search"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -875,30 +911,30 @@ msgstr "Broj Ciklusa"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr "Tvrtke"
+msgstr "Organizacije"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "Minimalna zaliha"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
 msgid "Dashboard"
-msgstr "Kontrolna ploča"
+msgstr "Kokpit"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr "Buduće Opterećenje Radnog Centra"
+msgstr "Buduće opterećenje radnog centra"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product"
-msgstr "Uskladištivi proizvod"
+msgstr "Stockable Product"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@@ -914,7 +950,7 @@ msgstr "Šifra"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "Br. Sati"
+msgstr "Br. sati"
 
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
@@ -925,7 +961,7 @@ msgstr ""
 #: view:mrp.property:0
 #: view:mrp.property.group:0
 msgid "Property Group"
-msgstr "Grupa Svojstava"
+msgstr "Grupa svojstava"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -935,7 +971,7 @@ msgstr "Kol."
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr "Plan Proizvodnje"
+msgstr "Plan proizvodnje."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -957,7 +993,7 @@ msgstr ""
 #: view:mrp.production:0
 #: view:mrp.workcenter.load:0
 msgid "Cancel"
-msgstr "Otkaži"
+msgstr "Odustani"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -970,6 +1006,8 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Number of operations this Work Center can do in parallel. If this Work "
+"Center represents a team of 5 workers, the capacity per cycle is 5."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -977,11 +1015,13 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
+"Ako je usluga koristi način opskrbe \"Kupovina\", stvara se RFQ, "
+"podugovaranje potražnje za primjer"
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
-msgstr "Premjesti Proizvod"
+msgstr "Premjesti proizvod"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -991,7 +1031,7 @@ msgstr "Kasni"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
 msgid "Make to stock"
-msgstr ""
+msgstr "Sa skladišta (MTS)"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
@@ -1002,28 +1042,28 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr ""
+msgstr "BOM Name"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Start Production"
-msgstr "Pokreni Proizvodnju"
+msgstr "Pokreni proizvodnju"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr "Upravljačka ploča proizvodnje"
+msgstr "Kokpit proizvodnje"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "Lok. izvora"
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr "Interna Referenca"
+msgstr "Interna oznaka"
 
 #. module: mrp
 #: help:mrp.installer,stock_location:0
@@ -1035,7 +1075,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr "Struktura Proizvoda"
+msgstr "Struktura proizvoda"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1064,7 +1104,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr "Način"
+msgstr "Mode"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1074,7 +1114,7 @@ msgstr "]"
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
 msgid "Amount measuring unit"
-msgstr ""
+msgstr "Mjerna jedinica iznosa"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
@@ -1086,6 +1126,12 @@ msgid ""
 "materials have been defined, OpenERP is capable of automatically deciding on "
 "the manufacturing route depending on the needs of the company."
 msgstr ""
+"Manufacturing Orders describe the operations that need to be carried out and "
+"the raw materials usage for each production stage. You use specifications "
+"(bills of materials or BoM) to work out the raw material requirements and "
+"the manufacturing orders needed for the finished products. Once the bills of "
+"materials have been defined, OpenERP is capable of automatically deciding on "
+"the manufacturing route depending on the needs of the company."
 
 #. module: mrp
 #: constraint:mrp.production:0
@@ -1095,7 +1141,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr "Nalozi za Proizvodnju u Radu"
+msgstr "Nalozi proizvodnje u tijeku"
 
 #. module: mrp
 #: model:ir.module.module,description:mrp.module_meta_information
@@ -1139,7 +1185,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr "Nalozi za Proizvodnju koji čekaju Proizvode"
+msgstr "Nalozi proizvodnje koji čekaju proizvode"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1160,19 +1206,19 @@ msgstr "Trašak Ciklusa"
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
-msgstr "Količina u ciklusima"
+msgstr "Iznos u ciklusima"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 #: view:mrp.production.order:0
 #: field:mrp.production.order,location_dest_id:0
 msgid "Finished Products Location"
-msgstr "Lokacija Završenih Proizvoda"
+msgstr "Lokacija gotovih proizvoda"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
 msgid "Resources"
-msgstr "Resursi"
+msgstr "Sredstva"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1184,7 +1230,7 @@ msgstr "Dnevnik analitike"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr "Radni Centri"
+msgstr "Radni centri"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1199,6 +1245,10 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
+"Routings allow you to create and manage the manufacturing operations that "
+"should be followed within your work centers in order to produce a product. "
+"They are attached to bills of materials that will define the required raw "
+"materials."
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
@@ -1208,7 +1258,7 @@ msgstr "Broj Sati"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr "Operacije Radnih Centara"
+msgstr "Operacije radnog centra"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1222,7 +1272,7 @@ msgstr "Bilješke"
 #: field:mrp.production.order,bom_id:0
 #: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Material"
-msgstr "Lista Materijala"
+msgstr "Sastavnica"
 
 #. module: mrp
 #: view:mrp.workcenter.load:0
@@ -1237,7 +1287,7 @@ msgstr "Opterećenje radnog centra"
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Lokacija gotovih proizvoda"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -1245,6 +1295,8 @@ msgid ""
 "This is the Internal Picking List that brings the finished product to the "
 "production plan"
 msgstr ""
+"This is the Internal Picking List that brings the finished product to the "
+"production plan"
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
@@ -1254,7 +1306,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr "Prijenos Zaliha"
+msgstr "Skladišni prijenosi"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1263,11 +1315,14 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
 msgid "Day by day"
-msgstr ""
+msgstr "Dan po dan"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1288,7 +1343,7 @@ msgstr "Prioritet"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr "Lista odabira"
+msgstr "Skladišni dokument"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1304,7 +1359,7 @@ msgstr "Nalog za Proizvodnju '%s' je planiran za %s."
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr ""
+msgstr "Production Order N° :"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:630
@@ -1315,19 +1370,19 @@ msgstr "Nalog za Proizvodnju '%s' je spreman za proizvodnju."
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Production Scheduled Product"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
 msgid "Security days for each manufacturing operation."
-msgstr ""
+msgstr "Rezervni dani za svaku operaciju proizvodnje"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
 #: model:process.transition,name:mrp.process_transition_servicemts0
 #: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Sa skladišta (MTS)"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -1343,24 +1398,29 @@ msgid ""
 "product needs. You can either create a bill of materials to define specific "
 "production steps or define a single multi-level bill of materials."
 msgstr ""
+"Master Bills of Materials allow you to create and manage the list of "
+"necessary raw materials used to make a finished product. OpenERP will use "
+"these BoMs to automatically propose manufacturing orders according to "
+"product needs. You can either create a bill of materials to define specific "
+"production steps or define a single multi-level bill of materials."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
-msgstr ""
+msgstr "Kada je Metoda nabave \"Kupi\", sistem kreira nalog za nabavu."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Procurement"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
 #: view:mrp.product_price:0
 msgid "Product Cost Structure"
-msgstr ""
+msgstr "Struktura troška proizvoda"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -1376,7 +1436,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Radni centri proizvodnje"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1393,28 +1453,28 @@ msgstr ""
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Search for mrp workcenter"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr ""
+msgstr "BoM Structure"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
 #: field:mrp.production.order,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
-msgstr ""
+msgstr "Hour Account"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Destination Loc."
-msgstr ""
+msgstr "Odredišna lokacija"
 
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
@@ -1424,24 +1484,24 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr ""
+msgstr "Procure Products"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Opterećenje radnog centra"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1452,13 +1512,13 @@ msgstr ""
 #: view:procurement.order:0
 #: field:procurement.order,property_ids:0
 msgid "Properties"
-msgstr ""
+msgstr "Svojstva"
 
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
 "Reference of the document that generated this production order request."
-msgstr ""
+msgstr "Dokument koji je generirao ovaj nalog za proizvodnju."
 
 #. module: mrp
 #: sql_constraint:mrp.bom:0
@@ -1467,21 +1527,24 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr "Dodatne Informacije"
+msgstr "Dodatni Podaci"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Promijeni količine proizvoda"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Upravlja nalozima nabave za sirovine."
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1491,19 +1554,19 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Konto glavne knjige"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "SO Number"
-msgstr ""
+msgstr "SO Number"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
@@ -1515,13 +1578,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Not urgent"
 
 #. module: mrp
 #: help:stock.change.standard.price,change_parent_price:0
@@ -1533,7 +1596,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Naloz za Proizvodnju Za Pokrenuti"
+msgstr "Ne pokrenuti nalozi proizvodnje"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:491
@@ -1548,12 +1611,12 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Radni centar"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
 msgid "Capacity per Cycle"
-msgstr ""
+msgstr "Kapacitet po ciklusu"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_product_product
@@ -1566,30 +1629,30 @@ msgstr ""
 #: field:mrp.production.order,product_id:0
 #: field:mrp.production.product.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,hour_total:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Uk. sati"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
 #: field:mrp.production.order,location_src_id:0
 msgid "Raw Materials Location"
-msgstr ""
+msgstr "Lokacija sirovina"
 
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Print Cost Structure of Product."
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "JP Proizvoda"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -1602,7 +1665,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Utroši proizvode"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -1610,14 +1673,14 @@ msgstr ""
 #: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "JM proizvoda"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "Po narudžbi (MTO)"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
@@ -1634,29 +1697,29 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
-msgstr ""
+msgstr "Proizvodnja proizvoda"
 
 #. module: mrp
 #: field:mrp.production,date_finished:0
 #: field:mrp.production.order,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurs"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
-msgstr ""
+msgstr "Valjanost Bom ili komponente. Držite prazno ako je uvijek valjan."
 
 #. module: mrp
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr ""
+msgstr "JP Proizvoda"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1667,7 +1730,7 @@ msgstr ""
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Very Urgent"
-msgstr ""
+msgstr "Very Urgent"
 
 #. module: mrp
 #: help:mrp.bom,routing_id:0
@@ -1677,37 +1740,41 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
+"planning."
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Odobri"
 
 #. module: mrp
 #: view:mrp.property.group:0
 msgid "Properties categories"
-msgstr ""
+msgstr "Properties categories"
 
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
-msgstr ""
+msgstr "Definira poredak radnih naloga u popisu."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Source Location"
-msgstr ""
+msgstr "Izvorna lokacija"
 
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
 msgid "Scheduled Products"
-msgstr "Planirani Proizvodi"
+msgstr "Planirani proizvodi"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products Consommation"
-msgstr ""
+msgstr "Production Products Consommation"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -1716,7 +1783,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr "Nalozi za Proizvodnju"
+msgstr "Nalozi za proizvodnju"
 
 #. module: mrp
 #: help:mrp.product.produce,mode:0
@@ -1727,29 +1794,34 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
 
 #. module: mrp
 #: view:mrp.production:0
 #: report:mrp.production.order:0
 msgid "Work Orders"
-msgstr "Radni Nalozi"
+msgstr "Radni nalozi"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle:0
 msgid "Cost per cycle"
-msgstr ""
+msgstr "Cost per cycle"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1761,6 +1833,7 @@ msgstr ""
 msgid ""
 "UoM (Unit of Measure) is the unit of measurement for the inventory control"
 msgstr ""
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1769,6 +1842,9 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1779,12 +1855,12 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
 msgid "Time for 1 cycle (hour)"
-msgstr ""
+msgstr "Time for 1 cycle (hour)"
 
 #. module: mrp
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
@@ -1793,50 +1869,50 @@ msgstr ""
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr ""
+msgstr "Production Order"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr ""
+msgstr "Pravilo automatske nabave"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Compute Data"
-msgstr ""
+msgstr "Compute Data"
 
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
-msgstr ""
+msgstr "Količina JP"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
 #: view:mrp.bom:0
 #, python-format
 msgid "Components"
-msgstr ""
+msgstr "Components"
 
 #. module: mrp
 #: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr ""
+msgstr "BOM Struktura"
 
 #. module: mrp
 #: field:mrp.bom,date_stop:0
 msgid "Valid Until"
-msgstr ""
+msgstr "Valid Until"
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
 msgid "Valid From"
-msgstr ""
+msgstr "Valid From"
 
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr ""
+msgstr "Normal BoM"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
@@ -1847,7 +1923,7 @@ msgstr "Pripremno vrijeme proizvodnje"
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr ""
+msgstr "Količina JP"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
@@ -1856,21 +1932,24 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"Weekly Stock Value Variation enables you to track the stock value evolution "
+"linked to manufacturing activities, receptions of products and delivery "
+"orders."
 
 #. module: mrp
 #: view:mrp.product.produce:0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr "Efikasnost Proizvodnje"
+msgstr "Efikasnost proizvodnje"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1878,17 +1957,19 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"If the active field is set to False, it will allow you to hide the bills of "
+"material without removing it."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
-msgstr ""
+msgstr "Zaokruživanje decimala"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Radni nalog"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -1900,12 +1981,12 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Samo za utrošiti"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Recreate Picking"
-msgstr ""
+msgstr "Ponovo kreiraj prijenos"
 
 #. module: mrp
 #: help:mrp.bom,type:0
@@ -1916,11 +1997,16 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
 
 #. module: mrp
 #: field:mrp.bom,method:0
 msgid "Method"
-msgstr ""
+msgstr "Metoda"
 
 #. module: mrp
 #: help:mrp.production,state:0
@@ -1933,62 +2019,68 @@ msgid ""
 " When the production gets started then the state is set to 'In Production'.\n"
 " When the production is over, the state is set to 'Done'."
 msgstr ""
+"Nakon kreiranja nalog za proizvodnju je u stanju 'Nacrt'.\n"
+" Potvrđeni nalozi su u stanju 'Na čekanju' (materijala).\n"
+" U slučaju iznimki stanje je 'Skladišna iznimka'. \n"
+" Ako je zaliha dostatna za proizvodnju stanje je 'Spremno za proizvodnju'.\n"
+" Kad je proizvodnja pokrenuta stanje je  'U proizvodnji'.\n"
+" Izvršeni nalozi su u stanju 'Izvršen'."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr ""
+msgstr "Na nalogu"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Postava"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
 msgid "Time after prod."
-msgstr ""
+msgstr "Vrijeme nakon prod."
 
 #. module: mrp
 #: field:mrp.workcenter.load,time_unit:0
 msgid "Type of period"
-msgstr ""
+msgstr "Type of period"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Total Qty"
-msgstr ""
+msgstr "Ukupna kol."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,hour_nbr:0
 msgid "Number of Hours"
-msgstr ""
+msgstr "Broj sati"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "Costing Information"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Zaokruživanje se primjenjuje na količinu proizvoda."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Prijenos iz proizvodnje ili naloga za nabavu."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr ""
+msgstr "Nadređeno usmjeravanje"
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -1998,7 +2090,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
-msgstr ""
+msgstr "Vrijeme u satima za pripremu."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2014,7 +2106,7 @@ msgstr ""
 #: field:mrp.bom.revision,bom_id:0
 #: field:procurement.order,bom_id:0
 msgid "BoM"
-msgstr ""
+msgstr "BoM"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
@@ -2026,25 +2118,25 @@ msgstr "Varijacija vrijednosti Zalihe"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Dodjela sa skladišta"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Waiting Goods"
 
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
-msgstr ""
+msgstr "last indice"
 
 #. module: mrp
 #: field:mrp.bom,revision_ids:0
 #: view:mrp.bom.revision:0
 msgid "BoM Revisions"
-msgstr ""
+msgstr "BoM Revisions"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2056,7 +2148,7 @@ msgstr ""
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
 msgid "Week"
-msgstr "Tjedni"
+msgstr "Week"
 
 #. module: mrp
 #: field:mrp.installer,progress:0
@@ -2067,24 +2159,24 @@ msgstr ""
 #: selection:mrp.production,priority:0
 #: selection:mrp.production.order,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normalan"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr "Koraci Proizvodnje"
+msgstr "Koraci proizvodnje"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Cost Structure"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Utroši i proizvedi"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2094,7 +2186,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr ""
+msgstr "Nadređena sastavnica"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
@@ -2103,6 +2195,9 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM a specific "
 "component is used."
 msgstr ""
+"Bills of materials components are components and sub-products used to create "
+"master bills of materials. Use this menu to search in which BoM a specific "
+"component is used."
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2112,7 +2207,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Product type is Stockable or Consumable."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:591
@@ -2125,7 +2220,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Odaberi količinu"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2133,7 +2228,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr ""
+msgstr "Sastavnica"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0
@@ -2142,22 +2237,25 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
+"Routing indicates all the Work Centers used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (Work Centers) "
+"will be automatically pre-completed."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
 msgid "Bill of Material Revision"
-msgstr ""
+msgstr "Revizija sastavnice"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 #: view:mrp.workcenter:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Productions"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:194
@@ -2171,6 +2269,8 @@ msgid ""
 "Description of the Work Center. Explain here what's a cycle according to "
 "this Work Center."
 msgstr ""
+"Description of the Work Center. Explain here what's a cycle according to "
+"this Work Center."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -2182,7 +2282,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr ""
+msgstr "Usmjeravanje"
 
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
@@ -2192,12 +2292,12 @@ msgstr "Proizvodne Operacije"
 #. module: mrp
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Zakazani datum"
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -2208,27 +2308,32 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the the needs."
 msgstr ""
+"The Properties in OpenERP are used to select the right bill of materials for "
+"manufacturing a product when you have different ways of building the same "
+"product. You can assign several properties to each Bill of Materials. When a "
+"sales person creates a sales order, he can relate it to several properties "
+"and OpenERP will automatically select the BoM to use according the the needs."
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Nabave s iznimkama"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "'Minimum stock rule' material"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Cijena proizvoda"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
@@ -2238,18 +2343,18 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Split in Production lots"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Promjeni količinu"
 
 #. module: mrp
 #: view:change.production.qty:0
 #: model:ir.actions.act_window,name:mrp.action_change_production_qty
 msgid "Change Product Qty"
-msgstr ""
+msgstr "Promjeni kol. proizvoda"
 
 #. module: mrp
 #: view:mrp.bom.revision:0
@@ -2262,7 +2367,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2272,12 +2377,12 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr "Ploča proizvodnje"
+msgstr "Kokpit proizvodnje"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "Planirani datum završetka"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2286,11 +2391,14 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"Work Center Loads gives you a projection of work center loads over a "
+"specified period. It is expressed in number of hours and machine related "
+"cycles."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Način nabave ovisi o vrsti proizvoda"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2300,7 +2408,7 @@ msgstr "Proizvodnja"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Next Production Orders"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2311,7 +2419,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
 msgid "Property Groups"
-msgstr ""
+msgstr "Grupe svojstava"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2324,16 +2432,18 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
 msgid "Time in hours for the cleaning."
-msgstr ""
+msgstr "Završno vrijeme u satima za čišćenje."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Automatski ZZP (zahtjev za ponudom)"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2341,6 +2451,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Ako je metoda nabave usluge 'Proizvedi' kreirati će zadatak u modulu "
+"upravljanja projektima."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2349,6 +2461,9 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -2356,11 +2471,13 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this quantity."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
-msgstr ""
+msgstr "Na skladištu"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
@@ -2368,17 +2485,17 @@ msgstr ""
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Odsustva resursa"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr ""
+msgstr "Daje poredak u prikazu sastavnica."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2386,7 +2503,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Proizvodi za utrošiti"
 
 #. module: mrp
 #: view:mrp.production.order:0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index fb83f8c4a62..b4b79d6f606 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record id="group_mrp_user" model="res.groups">
-        <field name="name">Manufacturing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_manufacturing"/>
     </record>
     <record id="group_mrp_manager" model="res.groups">
-        <field name="name">Manufacturing / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_manufacturing"/>
         <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/>
     </record>
 
diff --git a/addons/mrp_jit/i18n/hr.po b/addons/mrp_jit/i18n/hr.po
index 6c845797ba4..9f965c216ea 100644
--- a/addons/mrp_jit/i18n/hr.po
+++ b/addons/mrp_jit/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-12-22 12:16+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:29+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 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,3 +46,22 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    Ovaj modul omogućuje Just in Time izračun naloga za nabavu.\n"
+"\n"
+"    Ako instalirate ovaj modul nećete više morati pokretati normalni planer "
+"\n"
+"    zahtjeva u nabavi (ali i dalje ćete morati pokrenuti planer pravila "
+"minimalne točke \n"
+"    naručivanja, ili ga postaviti da se npr. pokreće dnevno)\n"
+"    Svi zahtjevi za nabavom će se procesirati odmah, što može u nekim "
+"slučajevima\n"
+"    utjecati na brzinu rada.\n"
+"\n"
+"    Također može povećati veličinu vaših zaliha jer se artikli naručuju čim "
+"je to \n"
+"    moguće i raspon vremena planiranja se više ne uzima u obzir.\n"
+"    u tom slučaju ne možete koristiti prioritete kod različitih prijenosa.\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index e9745098516..7a6d5bd3c42 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-10-15 09:07+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 10:24+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 05:31+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -23,17 +23,17 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Work Orders"
-msgstr ""
+msgstr "Radni nalozi"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Cancel the operation."
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
@@ -45,76 +45,76 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Information from the routing definition."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr ""
+msgstr "Radni centri"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Resume"
-msgstr ""
+msgstr "Resume"
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr ""
+msgstr "Product to Produce"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr ""
+msgstr "Production Operation"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
 msgid "Free Serialisation"
-msgstr ""
+msgstr "Free Serialisation"
 
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Mrp operacije"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
 msgid "Production Order"
-msgstr ""
+msgstr "Production Order"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Skladišna iznimka"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "Creation of the work order"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:463
@@ -132,7 +132,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr ""
+msgstr "The work orders are created on the basis of the production order."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:133
@@ -149,28 +149,28 @@ msgstr ""
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
 msgid "Confirmed Work Orders"
-msgstr ""
+msgstr "Potvrđeni radni nalozi"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr ""
+msgstr "Operations"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -178,7 +178,7 @@ msgstr ""
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -191,13 +191,13 @@ msgstr "U proizvodnji"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "Radni nalog"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -205,11 +205,13 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
+"Tu je 1 radni nalog po radnom centru. Podaci o broju ciklusa ili vrijeme "
+"ciklusa."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Month -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -232,7 +234,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Planiran datum"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:479
@@ -244,22 +246,22 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Količina"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
 msgid "Operation Name"
-msgstr ""
+msgstr "Operation Name"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,start_stop:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
@@ -270,16 +272,20 @@ msgid ""
 "different impacts on the costs of manufacturing and planning depending on "
 "the available workload."
 msgstr ""
+"Za proizvodnju ili sastavljanje proizvoda, i korištenje sirovina i gotovih "
+"proizvoda morate upravljatii proizvodnim operacijama. Proizvodne operacije "
+"često se nazivaju radnim nalozima. Različite operacije će imati različite "
+"utjecaje na troškove proizvodnje i planiranje, ovisno o raspoloživosti posla."
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
 msgid "Future Work Orders"
-msgstr ""
+msgstr "Future Work Orders"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:459
@@ -292,50 +298,50 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Operation Cancelled"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
 msgid "mrp_operations.operation"
-msgstr ""
+msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr ""
+msgstr "Work Order Report"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp.production.workcenter.line,date_start_date:0
 #: field:mrp_operations.operation,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr ""
+msgstr "Waiting Goods"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -351,53 +357,53 @@ msgstr "Pauza"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "In Progress"
-msgstr "U Tijeku"
+msgstr "In Progress"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Nalog proizvodnje"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Calendar View"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
 msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
-msgstr ""
+msgstr "Operaciju je moguće otkazati na kartici radnog naloga."
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Set Draft"
-msgstr ""
+msgstr "Set Draft"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Ukupno ciklusa"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
 msgid "Production Operation Code"
-msgstr ""
+msgstr "Šifra operacije proizvodnje"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:467
@@ -408,12 +414,12 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Započeto"
 
 #. module: mrp_operations
 #: model:ir.module.module,description:mrp_operations.module_meta_information
@@ -451,7 +457,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:482
@@ -462,28 +468,28 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Ready to Produce"
-msgstr ""
+msgstr "Spremno za proizvodnju"
 
 #. module: mrp_operations
 #: field:stock.move,move_dest_id_lines:0
 msgid "Children Moves"
-msgstr ""
+msgstr "Children Moves"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr ""
+msgstr "Work Orders Planning"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -493,22 +499,22 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Završi operacije."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:452
@@ -519,7 +525,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Information from the production order."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:452
@@ -533,13 +539,13 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutno"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
 #: field:mrp_operations.operation.code,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:475
@@ -555,35 +561,35 @@ msgstr ""
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "Operation Codes"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operacija izvršena"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 #: view:mrp.workorder:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
 msgid "Start/Stop Barcode"
-msgstr ""
+msgstr "Start/Stop Barcode"
 
 #. module: mrp_operations
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form
@@ -594,36 +600,41 @@ msgid ""
 "latest operation of a manufacturing order, the MO is automatically done and "
 "the related products are produced."
 msgstr ""
+"Work Orders is the list of operations to be performed for each manufacturing "
+"order. Once you start the first work order of a manufacturing order, the "
+"manufacturing order is automatically marked as started. Once you finish the "
+"latest operation of a manufacturing order, the MO is automatically done and "
+"the related products are produced."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr "pokreni operaciju"
+msgstr "Pokreni operaciju"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Information"
-msgstr "Obavijest"
+msgstr "Informacija"
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "Work Centers Barcode"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Kasni"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
 msgid "Delay"
-msgstr ""
+msgstr "Kašnjenje"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -631,41 +642,41 @@ msgstr ""
 #: field:mrp.workorder,production_id:0
 #: field:mrp_operations.operation,production_id:0
 msgid "Production"
-msgstr ""
+msgstr "Proizvodnja"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "Search Work Orders"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
 #: model:process.node,name:mrp_operations.process_node_workorder0
 msgid "Work Center"
-msgstr ""
+msgstr "Radni centar"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Real"
-msgstr ""
+msgstr "Realan"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planirani datum"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Uk. sati"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -673,16 +684,18 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
+"Provjerite mogućnost nezavisnog izvršavanja radnih naloga, bez izvršavanja "
+"ovisnih."
 
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "Work Order Analysis"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -690,59 +703,59 @@ msgstr ""
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 msgid "Finished"
-msgstr ""
+msgstr "Dovršeno"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "UOM"
-msgstr ""
+msgstr "JM"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "Hours by Work Center"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Radno vrijeme(od-do)"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operacija otkazana"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Start the operation."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operation done"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "#Line Orders"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -750,32 +763,34 @@ msgid ""
 "When the operation is finished, the operator updates the system by finishing "
 "the work order."
 msgstr ""
+"When the operation is finished, the operator updates the system by finishing "
+"the work order."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "Detalji radnog naloga"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Stanje proizvodnje"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
 
 #. module: mrp_operations
 #: constraint:mrp.production:0
@@ -785,7 +800,7 @@ msgstr ""
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index f70205f2e7f..3a3a089e0bf 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/i18n/hr.po
@@ -7,19 +7,19 @@ 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:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-12 12:24+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 05:39+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "Fees Line"
 
 #. module: mrp_repair
 #: help:mrp.repair,state:0
@@ -35,11 +35,18 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" * 'Nacrt' je početno stanje naloga.  \n"
+"* 'Potvrđen' je slijedeće stanje     \n"
+"* 'U tijeku' označava početak aktivnosti na popravku. \n"
+"* 'Za fakturiranje' stanje koje se koristi za generiranje računa prije ili "
+"poslije izvršenja naloga za popravak.  \n"
+"* 'Izvršen' nalog za popravak je izvršen  \n"
+"* 'Otkazan' nalog za popravak je otkazan."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
 msgid "Inventory Move"
-msgstr ""
+msgstr "Skladišni prijenos"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
@@ -50,16 +57,21 @@ msgid ""
 "date on the production lot in order to know if whether the repair should be "
 "invoiced to the customer or not."
 msgstr ""
+"Nalozi za popravak olakšavaju upravljanje post-prodajnim aktivnostima "
+"popravaka i servisa unutar i nakon jamstvenog roka. U nalogu za popravak "
+"navodite komponente koje treba odbaciti, dodati ili zamijeniti, bilježite "
+"vrijeme potrebno za popravak. Nalog koristi datume jamstva kako bi znao "
+"treba li fakturirati nalog kupcu ili ne."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Recreate Invoice"
-msgstr ""
+msgstr "Ponovo izradi račun"
 
 #. module: mrp_repair
 #: help:mrp.repair,deliver_bool:0
@@ -69,28 +81,32 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a picking with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair.cancel:0
 msgid "Cancel Repair Order"
-msgstr ""
+msgstr "Otkaži nalog za popravak"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
 #: field:mrp.repair.line,to_invoice:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Za fakturiranje"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Printing Date"
 
 #. module: mrp_repair
 #: field:mrp.repair.make_invoice,group:0
 msgid "Group by partner invoice address"
-msgstr ""
+msgstr "Grupiraj po adresi računa"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:430
@@ -101,45 +117,45 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi na nacrt"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Iznimka računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,address_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Adresa dostave"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
 #: model:ir.model,name:mrp_repair.model_mrp_repair_make_invoice
 #: view:mrp.repair:0
 msgid "Make Invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_subtotal:0
 #: field:mrp.repair.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Invoice address :"
-msgstr ""
+msgstr "Adresa računa :"
 
 #. module: mrp_repair
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr ""
+msgstr "Limit jamstva"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: mrp_repair
 #: model:ir.module.module,description:mrp_repair.module_meta_information
@@ -160,12 +176,12 @@ msgstr ""
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:430
@@ -176,17 +192,17 @@ msgstr ""
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "VAT"
-msgstr ""
+msgstr "PDV"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Operations"
-msgstr ""
+msgstr "Operations"
 
 #. module: mrp_repair
 #: field:mrp.repair,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Temeljnica"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:365
@@ -198,28 +214,28 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_order
 msgid "Repair Orders"
-msgstr ""
+msgstr "Nalozi za popravak"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
 msgid "Quotation / Order"
-msgstr ""
+msgstr "Ponuda / Nalog"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "Nalog za popravak br."
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:379
@@ -232,49 +248,49 @@ msgstr ""
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Repairs order"
-msgstr ""
+msgstr "Nalozi za popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Order N° :"
-msgstr ""
+msgstr "Nalog za popravak N° :"
 
 #. module: mrp_repair
 #: field:mrp.repair,prodlot_id:0
 #: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
-msgstr ""
+msgstr "Lot Number"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "Fees Lines"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "Vrsta"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "Fees Line(s)"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "Za fakturiranje"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Shipping address :"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:379
@@ -287,7 +303,7 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr ""
+msgstr "Količina (JM)"
 
 #. module: mrp_repair
 #: help:mrp.repair.line,state:0
@@ -300,11 +316,17 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * Stanje 'Nacrt' se postavlja automatski prilikom upisa/inicijalnog "
+"kreiranja naloga za popravak. \n"
+"* Stanje 'Potvrđen' označava nalog koji treba izvršiti.  \n"
+"* Izvršeni nalozi su u stanju 'Izvršen' .                        \n"
+"* Nalozi u stanju 'Otkazan' se neće izvršavati i ostaju u sistemu radi "
+"evidencije."
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
@@ -312,17 +334,19 @@ msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Ova operacija će otkazati proces popravka, ali neće otkazati pripadajući "
+"račun. Nastaviti?"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Pricelist"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,quotation_notes:0
 msgid "Quotation Notes"
-msgstr ""
+msgstr "Quotation Notes"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
@@ -333,34 +357,34 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "Search Reair Orders"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Add)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
 #: view:mrp.repair:0
 msgid "Repair Line"
-msgstr ""
+msgstr "Stavka popravka"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_method:0
 msgid "Invoice Method"
-msgstr ""
+msgstr "Metoda računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr ""
+msgstr "Popravljeno"
 
 #. module: mrp_repair
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
@@ -371,145 +395,145 @@ msgstr ""
 #: field:mrp.repair.fee,invoice_line_id:0
 #: field:mrp.repair.line,invoice_line_id:0
 msgid "Invoice Line"
-msgstr ""
+msgstr "Stavka računa"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "Before Repair"
-msgstr ""
+msgstr "Prije popravka"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_id:0
 msgid "Current Location"
-msgstr ""
+msgstr "Trenutna lokacija"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: mrp_repair
 #: field:mrp.repair,invoiced:0
 #: field:mrp.repair.fee,invoiced:0
 #: field:mrp.repair.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturirano"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Kreiraj račune"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Remove)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Kreirati račun(e) ?"
 
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "Popravak br."
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "Nalog za popravak"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Under Repair"
-msgstr ""
+msgstr "U popravku"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "Spremno za popravak"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
-msgstr ""
+msgstr "Guarantee Limit"
 
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
 #: report:repair.order:0
 msgid "Product to Repair"
-msgstr ""
+msgstr "Proizvodi za popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "N° :"
-msgstr ""
+msgstr "N° :"
 
 #. module: mrp_repair
 #: help:mrp.repair,pricelist_id:0
 msgid "The pricelist comes from the selected partner, by default."
-msgstr ""
+msgstr "Cjenik odabranog partnera."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Stavka naknade popravka"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Quotation"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Compute"
-msgstr ""
+msgstr "Izračunaj"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Confirm Repair"
-msgstr ""
+msgstr "Potvrdi popravak"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Quotation"
-msgstr ""
+msgstr "Ponuda za popravak"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "End Repair"
-msgstr ""
+msgstr "Završi popravak"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:408
@@ -521,43 +545,43 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
 #: report:repair.order:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Start Repair"
-msgstr ""
+msgstr "Pokreni popravak"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,price_unit:0
 #: field:mrp.repair.line,price_unit:0
 #: report:repair.order:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: selection:mrp.repair.line,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: mrp_repair
 #: help:mrp.repair,guarantee_limit:0
@@ -567,42 +591,46 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"Jamstveni limit se računa kao: datum zadnjeg prijenosa + jamstvo definirano "
+"na proizvodu. Ako je trenutni datum unutar jamstva svaka operacija i naknada "
+"koju dodate biti će označena sa 'nije za fakturiranje'. Naravno, to možete "
+"ručno promijeniti prema potrebi."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees"
-msgstr ""
+msgstr "Fees"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 #: view:mrp.repair.make_invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Lokacija isporuke"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Operation Line(s)"
-msgstr ""
+msgstr "Stavka(e) operacije"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: mrp_repair
 #: field:mrp.repair,location_dest_id:0
 msgid "Delivery Location"
-msgstr ""
+msgstr "Lokacija isporuke"
 
 #. module: mrp_repair
 #: help:mrp.repair,invoice_method:0
@@ -611,71 +639,73 @@ msgid ""
 "selected is different from 'No Invoice', it also allow you to select the "
 "pricelist and invoicing address."
 msgstr ""
+"Ako odaberete različito od 'Ne fakturirati', možete odabrati cjenik i adresu "
+"računa."
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
 #: field:mrp.repair.line,name:0
 #: report:repair.order:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: mrp_repair
 #: field:mrp.repair,operations:0
 msgid "Operation Lines"
-msgstr ""
+msgstr "Stavke operacije"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "fakturirano"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoice Corrected"
-msgstr ""
+msgstr "Račun korigiran"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
 msgid "Deliver"
-msgstr ""
+msgstr "Isporuči"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,internal_notes:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne bilješke"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Skladišnice"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Iznos bez poreza"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
@@ -692,75 +722,75 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "UoM"
-msgstr ""
+msgstr "JM"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Remove"
-msgstr ""
+msgstr "Remove"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
 #: field:mrp.repair.line,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "JM Proizvoda"
 
 #. module: mrp_repair
 #: field:mrp.repair,partner_invoice_id:0
 msgid "Invoicing Address"
-msgstr ""
+msgstr "Adresa za račun"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "After Repair"
-msgstr ""
+msgstr "Poslije popravka"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,location_id:0
 msgid "Source Location"
-msgstr ""
+msgstr "Izvorna lokacija"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_cancel
 #: view:mrp.repair:0
 msgid "Cancel Repair"
-msgstr ""
+msgstr "Otkaži popravak"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
 msgid "No Invoice"
-msgstr ""
+msgstr "Nema računa"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "States"
-msgstr ""
+msgstr "Stanja"
 
 #. module: mrp_repair
 #: help:mrp.repair,partner_id:0
 msgid ""
 "This field allow you to choose the parner that will be invoiced and delivered"
-msgstr ""
+msgstr "Odaberite partnera isporuke i računa"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
 msgid "Ready to Repair"
-msgstr ""
+msgstr "Spremno za popravak"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:365
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_subproduct/i18n/hr.po
index fc2966f7950..8e50561f0a4 100644
--- a/addons/mrp_subproduct/i18n/hr.po
+++ b/addons/mrp_subproduct/i18n/hr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 08:08+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 10:52+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 05:38+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
 msgid "Product"
-msgstr "Proizvod"
+msgstr "Artikl"
 
 #. module: mrp_subproduct
 #: sql_constraint:mrp.bom:0
@@ -28,6 +28,9 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Sve količine artikala moraju biti veće od 0.\n"
+"Morate instalirati modul mrp_subproduct ako želite dodatne artikle na "
+"sastavnici !"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -37,13 +40,15 @@ msgstr "podproizvodi"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Nalog za proizvodnju"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
 msgid ""
 "MRP Sub Product - To produce several products from one production order"
 msgstr ""
+"MRP podproizvod - ZA proizvodnju više proizvoda iz jednog naloga za "
+"proizvodnju"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_qty:0
@@ -63,7 +68,7 @@ msgstr "Tip količine"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr ""
+msgstr "Sastavnica"
 
 #. module: mrp_subproduct
 #: model:ir.module.module,description:mrp_subproduct.module_meta_information
@@ -78,11 +83,20 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul omogućuje proizvodnju više proizvoda iz jednog naloga za "
+"proizvodnju.\n"
+"Možete konfigurirati podproizvode u sastavnici.\n"
+"Bez ovog modula:\n"
+"    A + B + C -> D\n"
+"Sa ovim modulom:\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product UOM"
-msgstr "Jedinica mjere proizvoda"
+msgstr "JM proizvoda"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,bom_id:0
@@ -92,7 +106,7 @@ msgstr "Sastavnica"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You can not create recursive BoM."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne sastavnice."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -102,22 +116,22 @@ msgstr "Podproizvodi"
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Variable"
-msgstr "Varijabla"
+msgstr "Promjenljiva"
 
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Količina na nalogu ne smije biti negativna ili nula!"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
 msgid "Sub Product"
-msgstr ""
+msgstr "Podproizvod"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
 msgid "Fixed"
-msgstr "Određeno"
+msgstr "Fiksno"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/multi_company/i18n/hr.po b/addons/multi_company/i18n/hr.po
index 024de2fcf48..04bc8914653 100644
--- a/addons/multi_company/i18n/hr.po
+++ b/addons/multi_company/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:15+0000\n"
-"PO-Revision-Date: 2010-01-26 11:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-12 12:48+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:41+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -40,6 +40,21 @@ msgid ""
 "%(company_name)s\n"
 "        "
 msgstr ""
+"\n"
+"Datum: %(date)s\n"
+"\n"
+"Dragi %(partner_name)s,\n"
+"\n"
+"U privitku se nalazi podsjetnik na sve vaše neplaćene račune sa dospijelim "
+"iznosom od:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Hvala,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
@@ -66,7 +81,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:multi_company.action_inventory_form
 #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
 msgid "Default Company per Object"
-msgstr ""
+msgstr "Predefinirana organizacija po objektu"
 
 #. module: multi_company
 #: model:product.template,name:multi_company.product_product_odoo1_product_template
@@ -81,7 +96,7 @@ msgstr ""
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Condition"
-msgstr ""
+msgstr "Uvjet"
 
 #. module: multi_company
 #: model:ir.module.module,description:multi_company.module_meta_information
diff --git a/addons/outlook/i18n/hr.po b/addons/outlook/i18n/hr.po
new file mode 100644
index 00000000000..868034d8431
--- /dev/null
+++ b/addons/outlook/i18n/hr.po
@@ -0,0 +1,161 @@
+# 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 12:57+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: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Priručnik za instalaciju"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Outlook Plug-in"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Outlook Plug-In"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Preskoči"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Sučelje za Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Naziv datoteke"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Outlook Plug-in "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+"      This module provide the Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in allows you to select an object that you’d like to add\n"
+"      to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+"      a project, an analytical account, or any other object and Archived "
+"selected\n"
+"      mail in mailgate.messages with attachments.\n"
+"\n"
+"      "
+msgstr ""
+"\n"
+"      Ovaj modul omogućava Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in omogućava vam da odaberete objekt koji bi željeli "
+"dodati\n"
+"      u vaš e-mail i njegove privitke iz MS Outlooka. Možete izabrati "
+"partnera, zadatak,\n"
+"      projekt, analitički konto,  ili bilo koi drugi objekt i arhivirati "
+"odabranu poruku sa privicima\n"
+"      u mailgate.messages.\n"
+"\n"
+"      "
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "Datoteka sa dokumentacijom :- kako instalirati Outlook Plug-in."
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.installer"
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Outlook Plug-In konfiguracija"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Ovaj plugin omogućuje vam povezivanje e-maila s OpenERP dokumentima. Možete "
+"ga dodati bilo kojem postojećem ili kreirati novi."
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Dozvoljava vam da odaberete objekt koji želite dodati vašoj elektroničkoj "
+"poruci i njegove privitke."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Zatvori"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Koraci instalacije i konfiguracije"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"outlook plug-in datoteka. Snimi kako ovu datoteku i instaliraj ovaj plugin u "
+"Outlook."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Podešavanje"
diff --git a/addons/pad/i18n/hr.po b/addons/pad/i18n/hr.po
new file mode 100644
index 00000000000..052831af21a
--- /dev/null
+++ b/addons/pad/i18n/hr.po
@@ -0,0 +1,77 @@
+# 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 12:58+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: pad
+#: code:addons/pad/web/editors.py:32
+#, python-format
+msgid "Ok"
+msgstr "U redu"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:29
+#, python-format
+msgid "Name"
+msgstr "Naziv"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Organizacije"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
+
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr "Zapiši"
+
+#. module: pad
+#: model:ir.module.module,description:pad.module_meta_information
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+"the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+"    "
+msgstr ""
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr ""
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr ""
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr ""
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index b440f1101d9..216607dd4d0 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 08:43+0000\n"
+"PO-Revision-Date: 2011-12-12 10:25+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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 05:00+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@@ -24,7 +24,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "Prodaje po danu"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
@@ -35,7 +35,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
 #: view:pos.discount:0
 msgid "Apply Discount"
-msgstr "Primjeni popust"
+msgstr "Apply Discount"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -45,7 +45,7 @@ msgstr "Stavi u pripremu"
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "Product Nb."
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -55,7 +55,7 @@ msgstr "Blagajna"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Today"
-msgstr ""
+msgstr "Danas"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -70,20 +70,20 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr ""
+msgstr "Stavi novac"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
 msgid "Register Analysis"
-msgstr ""
+msgstr "Register Analysis"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Details of Sales"
-msgstr ""
+msgstr "Detalji prodaje"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -103,18 +103,18 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "Add payment :"
-msgstr ""
+msgstr "Dodaj plaćanje :"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "My Sales"
-msgstr ""
+msgstr "My Sales"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
@@ -135,7 +135,7 @@ msgstr ""
 #: report:pos.user.product:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -145,7 +145,7 @@ msgstr "PDV"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Izvor"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -166,7 +166,7 @@ msgstr ""
 #: report:account.statement:0
 #: field:report.pos.order,partner_id:0
 msgid "Partner"
-msgstr "Stranka"
+msgstr "Partner"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -178,18 +178,18 @@ msgstr "Ukupno za dan"
 #: view:report.pos.order:0
 #: field:report.pos.order,average_price:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Disc. (%)"
-msgstr "Popust (%)"
+msgstr "Pop.(%)"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total discount"
-msgstr ""
+msgstr "Total discount"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -211,14 +211,14 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
 msgid "Sales by month"
-msgstr ""
+msgstr "Prodaje po mjesecima"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 msgid "Sales by User"
-msgstr ""
+msgstr "Prodaje po korisniku"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -230,13 +230,13 @@ msgstr "Pop.(%)"
 #: field:pos.box.entries,ref:0
 #: field:pos.box.out,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Vezna oznaka"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Total Price"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -247,7 +247,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
 #: report:pos.sales.user:0
 msgid "Sales Report"
-msgstr ""
+msgstr "Izveštaj prodaje"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_discount.py:52
@@ -269,7 +269,7 @@ msgstr ""
 #: view:pos.order:0
 #: view:pos.payment.report.date:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: point_of_sale
 #: field:res.company,company_discount:0
@@ -296,13 +296,13 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,total:0
 #: field:report.sales.by.margin.pos.month,total:0
 msgid "Margin"
-msgstr ""
+msgstr "Marža"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
@@ -317,7 +317,7 @@ msgstr "Uk. količina"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
 msgid "Sales by user monthly"
-msgstr ""
+msgstr "Prodaje po korisniku mjesečno"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:54
@@ -341,17 +341,17 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "Način plaćanja"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Daily Operations"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Search Cash Statements"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -362,18 +362,18 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
 msgid "Sales by User Monthly"
-msgstr ""
+msgstr "Sales by User Monthly"
 
 #. module: point_of_sale
 #: field:pos.order,date_payment:0
@@ -385,13 +385,13 @@ msgstr "Datum plaćanja"
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Datum zaključenja"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,am_out:0
@@ -432,7 +432,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -453,7 +453,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "Output Operation"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -465,7 +465,7 @@ msgstr ""
 #: view:pos.sales.user.today:0
 #: view:pos.sales.user.today.current_user:0
 msgid "Print Report"
-msgstr ""
+msgstr "Ispiši"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -496,7 +496,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
 msgid "Invoice Amount"
-msgstr ""
+msgstr "Iznos računa"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -510,25 +510,25 @@ msgstr ""
 #: field:report.cash.register,journal_id:0
 #: field:report.pos.order,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Payment"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Ending Balance"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
@@ -538,7 +538,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.payment.report.date:0
 msgid "Sale by Date and User"
-msgstr ""
+msgstr "Sale by Date and User"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -552,7 +552,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr ""
+msgstr "Mode of Taxes"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:48
@@ -563,14 +563,14 @@ msgstr ""
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Neispravan barkod!"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Open Statements"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -580,13 +580,13 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr ""
+msgstr "Sales total(Revenue)"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total paid"
-msgstr "Uk. plaćeno"
+msgstr "Ukupno plaćeno"
 
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
@@ -597,7 +597,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Qty of product"
-msgstr "Kol."
+msgstr "Kol proizvoda"
 
 #. module: point_of_sale
 #: field:pos.order,contract_number:0
@@ -608,13 +608,13 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
 #: report:pos.user.product:0
 msgid "User's Product"
-msgstr ""
+msgstr "User's Product"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1043
@@ -629,14 +629,14 @@ msgstr ""
 #: view:pos.order:0
 #: field:pos.order.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 #: view:pos.close.statement:0
 msgid "Close Statements"
-msgstr ""
+msgstr "Close Statements"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -647,12 +647,12 @@ msgstr ""
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
 msgid "Payment By User"
-msgstr ""
+msgstr "Plaćanja po korisniku"
 
 #. module: point_of_sale
 #: field:pos.order,type_rec:0
@@ -663,7 +663,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_accepted
@@ -679,12 +679,12 @@ msgstr ""
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "St.Name"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
 msgid "Sales total"
-msgstr "Ukupno prodaja"
+msgstr "Ukupno prodaje"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -699,17 +699,17 @@ msgstr "Datum plaćanja"
 #. module: point_of_sale
 #: field:pos.order,lines:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Order Lines"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
 msgid "Creation Date"
-msgstr "Datum Kreiranja"
+msgstr "Datum kreiranja"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr ""
+msgstr "Današnje prodaje"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -737,7 +737,7 @@ msgstr ""
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr ""
+msgstr "Naziv proizvoda"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:69
@@ -749,7 +749,7 @@ msgstr ""
 #: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
-msgstr "Cjenik"
+msgstr "Pricelist"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -761,7 +761,7 @@ msgstr "Ukupno računi"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# kol"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_return
@@ -771,7 +771,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
 msgid "Sales by margin monthly"
-msgstr ""
+msgstr "Prodaje po marži mjesečno"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -780,24 +780,24 @@ msgstr ""
 #: field:report.sales.by.user.pos,date_order:0
 #: field:report.sales.by.user.pos.month,date_order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Today's Closed Cashbox"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: point_of_sale
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Iznos vaučera mora biti jednak iznosu stavke izvoda banke/blagajne."
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -813,29 +813,29 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Komentar fiskalne pozicije:"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Datum otvaranja"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Taxes :"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
-msgstr ""
+msgstr "Popust"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -845,12 +845,12 @@ msgstr "PDV :"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order lines"
-msgstr ""
+msgstr "POS Order lines"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr ""
+msgstr "Receipt :"
 
 #. module: point_of_sale
 #: field:pos.order,amount_return:0
@@ -881,7 +881,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr ""
+msgstr "transaction for the pos"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
@@ -892,7 +892,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
 msgid "Pos Box Entries"
-msgstr ""
+msgstr "Pos Box Unosi"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_get_sale.py:54
@@ -904,7 +904,7 @@ msgstr ""
 #: field:pos.details,date_end:0
 #: field:pos.sale.user,date_end:0
 msgid "Date End"
-msgstr ""
+msgstr "Datum završetka"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -914,7 +914,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
-msgstr ""
+msgstr "broj transakcija"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -926,7 +926,7 @@ msgstr ""
 #: view:pos.receipt:0
 #: selection:report.pos.order,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -936,7 +936,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
 msgid "Sales (summary)"
-msgstr "Prodaje"
+msgstr "Prodaje (ukupno)"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -952,7 +952,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_report_cash_register
 #: view:report.cash.register:0
 msgid "Point of Sale Cash Register Analysis"
-msgstr ""
+msgstr "Point of Sale Cash Register Analysis"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today
@@ -962,7 +962,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.payment.report:0
 msgid "Payment For Sale"
-msgstr ""
+msgstr "Plaćanje za prodaju"
 
 #. module: point_of_sale
 #: field:pos.order,first_name:0
@@ -977,19 +977,19 @@ msgstr "Ostalo"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "Stavke POS-a"
 
 #. module: point_of_sale
 #: view:pos.order:0
 #: view:report.transaction.pos:0
 msgid "Amount total"
-msgstr ""
+msgstr "Uk. iznos"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "Cash Registers"
-msgstr ""
+msgstr "Blagajne"
 
 #. module: point_of_sale
 #: view:account.journal:0
@@ -1002,7 +1002,7 @@ msgstr ""
 #: report:pos.invoice:0
 #: report:pos.lines:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: point_of_sale
 #: field:pos.scan.product,gencod:0
@@ -1016,12 +1016,12 @@ msgstr ""
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr ""
+msgstr "POS"
 
 #. module: point_of_sale
 #: field:report.cash.register,date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
@@ -1032,7 +1032,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Start Period"
-msgstr ""
+msgstr "Od perioda"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1040,12 +1040,12 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: report:pos.sales.user.today.current.user:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
 msgid "Open Cash Registers"
-msgstr ""
+msgstr "Open Cash Registers"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1055,17 +1055,17 @@ msgstr ""
 #: report:pos.payment.report.user:0
 #: report:pos.user.product:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Naziv dnevnika mora biti jedinstven za jednu organizaciju!"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Povrat URA"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1073,17 +1073,17 @@ msgstr ""
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr ""
+msgstr "POS Orders"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
 msgid "All Closed CashBox"
-msgstr ""
+msgstr "All Closed CashBox"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1042
@@ -1106,7 +1106,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Base"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1127,7 +1127,7 @@ msgstr "Bilješke"
 #: field:pos.get.sale,picking_id:0
 #: view:pos.order:0
 msgid "Sale Order"
-msgstr ""
+msgstr "Sale Order"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1140,7 +1140,7 @@ msgstr "Porezi"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
-msgstr ""
+msgstr "Stavka prodaje"
 
 #. module: point_of_sale
 #: field:pos.config.journal,code:0
@@ -1154,12 +1154,12 @@ msgstr "Šifra"
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_products
 msgid "Products"
-msgstr ""
+msgstr "Proizvodi"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
 msgid "Payment Report For Sale"
-msgstr ""
+msgstr "Payment Report For Sale"
 
 #. module: point_of_sale
 #: field:account.journal,special_journal:0
@@ -1174,17 +1174,17 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fax :"
-msgstr "Fax :"
+msgstr "Fax:"
 
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "Connected Salesman"
 
 #. module: point_of_sale
 #: model:ir.module.module,description:point_of_sale.module_meta_information
@@ -1210,7 +1210,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print the receipt of the sale"
-msgstr ""
+msgstr "Ispis računa POS-a"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_stock_picking
@@ -1233,14 +1233,14 @@ msgstr "Kol."
 #: view:report.cash.register:0
 #: view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Month -1"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
 #: model:ir.model,name:point_of_sale.model_pos_sale_user
 #: view:pos.payment.report.user:0
 msgid "Sale by User"
-msgstr ""
+msgstr "Prodaja po korisniku"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:558
@@ -1264,7 +1264,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "stanje"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1275,7 +1275,7 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:547
@@ -1286,7 +1286,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "Delay Validation"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -1296,18 +1296,18 @@ msgstr "Broj kopija"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "POS plaćanje"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "End Period"
-msgstr ""
+msgstr "Do perioda"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
 msgid "Automatic Opening"
-msgstr ""
+msgstr "Automatic Opening"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_ded:0
@@ -1331,7 +1331,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1341,7 +1341,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Naziv izvoda"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1350,17 +1350,17 @@ msgstr ""
 #: field:pos.box.out,journal_id:0
 #: field:pos.make.payment,journal:0
 msgid "Cash Register"
-msgstr ""
+msgstr "Blagajna MP"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr ""
+msgstr "Račun POS-a"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:91
@@ -1371,7 +1371,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
 msgid "Sales by User Daily margin"
-msgstr ""
+msgstr "Sales by User Daily margin"
 
 #. module: point_of_sale
 #: field:pos.order,note_2:0
@@ -1387,7 +1387,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.cash.register,balance_start:0
 msgid "Opening Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0
@@ -1400,13 +1400,13 @@ msgstr "Plaćeno"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Sve stavke prodaje"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Quotation"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1420,17 +1420,17 @@ msgstr "Ukupno:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Prodaje po marži"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Postava dnevnika"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Retci izvoda"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -1438,16 +1438,18 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Person who uses the the cash register. It could be a reliever, a student or "
+"an interim employee."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "Račun br."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 msgid "Receipt"
-msgstr "Račun"
+msgstr "Receipt"
 
 #. module: point_of_sale
 #: field:pos.order,invoice_wanted:0
@@ -1458,7 +1460,7 @@ msgstr ""
 #: selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
@@ -1466,7 +1468,7 @@ msgstr ""
 #: field:pos.make.payment,invoice_wanted:0
 #: field:pos.order,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_get_sale
@@ -1477,12 +1479,12 @@ msgstr ""
 #: view:account.bank.statement:0
 #: selection:report.cash.register,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otvoreno"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "Order Ref"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date
@@ -1505,23 +1507,23 @@ msgstr ""
 #: field:report.sales.by.margin.pos,net_margin_per_qty:0
 #: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
 msgid "Net margin per Qty"
-msgstr ""
+msgstr "Neto marža po kol."
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
 #: view:report.sales.by.margin.pos.month:0
 msgid "Sales by User Margin"
-msgstr ""
+msgstr "Sales by User Margin"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr ""
+msgstr "Point of Sale Orders Statistics"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_product_product
@@ -1536,12 +1538,12 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr ""
+msgstr "Pos Lines"
 
 #. module: point_of_sale
 #: field:product.product,disc_controle:0
@@ -1551,29 +1553,29 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Završni saldo"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_details
 msgid "Sale Details"
-msgstr ""
+msgstr "Prodaja detaljno"
 
 #. module: point_of_sale
 #: field:pos.payment.report.date,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Date Ordered"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_user
 msgid "Sales lines by Users"
-msgstr ""
+msgstr "Sales lines by Users"
 
 #. module: point_of_sale
 #: field:res.company,max_diff:0
@@ -1585,7 +1587,7 @@ msgstr ""
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:744
@@ -1601,7 +1603,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1612,7 +1614,7 @@ msgstr ""
 #: field:pos.details,date_start:0
 #: field:pos.sale.user,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: point_of_sale
 #: field:pos.order,amount_total:0
@@ -1623,23 +1625,23 @@ msgstr ""
 #: field:report.sales.by.user.pos,amount:0
 #: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: point_of_sale
 #: view:pos.sale.user:0
 msgid "Sale By User"
-msgstr ""
+msgstr "Sale By User"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Otvori blagajnu"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Izvod"
 
 #. module: point_of_sale
 #: field:pos.order,name:0
@@ -1657,7 +1659,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Izvještaj plaćanja"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return
@@ -1681,7 +1683,7 @@ msgstr ""
 #: report:pos.user.product:0
 #: field:report.pos.order,company_id:0
 msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1705,7 +1707,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Reprint"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:558
@@ -1718,7 +1720,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
 msgid "Today's Payment By User"
-msgstr ""
+msgstr "Današnje plaćanje korisnika"
 
 #. module: point_of_sale
 #: field:stock.picking,pos_order:0
@@ -1735,7 +1737,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "No. Of Articles"
-msgstr "Komada"
+msgstr "Br.Artikala"
 
 #. module: point_of_sale
 #: field:pos.order,date_validity:0
@@ -1745,7 +1747,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,pickings:0
 msgid "Picking"
-msgstr ""
+msgstr "Skladišnice"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0
@@ -1761,24 +1763,24 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Redak bankovnog izvoda"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Izvod banke"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Do datuma"
 
 #. module: point_of_sale
 #: view:report.sales.by.user.pos:0
 #: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS Report"
-msgstr ""
+msgstr "POS Izvještaj"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
@@ -1788,7 +1790,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "Close Cash Register"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
@@ -1804,7 +1806,7 @@ msgstr "Očitaj barkod"
 #: field:pos.box.entries,product_id:0
 #: field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Operacija"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
@@ -1814,17 +1816,17 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,journal_entry:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Temeljnica"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Otkazani račun"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1836,7 +1838,7 @@ msgstr "Potvrdi"
 #. module: point_of_sale
 #: report:pos.payment.report.date:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Stavke prodaje"
 
 #. module: point_of_sale
 #: constraint:res.company:0
@@ -1867,7 +1869,7 @@ msgstr "Naziv plaćanja"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
 msgid "Reporting"
-msgstr "Izvještaji"
+msgstr "Izvještavanje"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
@@ -1882,12 +1884,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "Pos Box Out"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Šifra dnevnika mora biti jedinstvena (za organizaciju) !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1897,7 +1899,7 @@ msgstr "Postava"
 #. module: point_of_sale
 #: report:pos.user.product:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: point_of_sale
 #: field:pos.order,date_validation:0
@@ -1915,30 +1917,30 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
 msgid "Invoices"
-msgstr ""
+msgstr "Računi"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 #: field:report.pos.order,total_discount:0
 msgid "Total Discount"
-msgstr ""
+msgstr "Total Discount"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr ""
+msgstr "Take Money"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user
 msgid "Sales Details"
-msgstr ""
+msgstr "Detalji prodaje"
 
 #. module: point_of_sale
 #: field:product.product,am_out:0
@@ -1961,7 +1963,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_pos_order
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
-msgstr ""
+msgstr "Point of Sale"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1987,12 +1989,12 @@ msgstr "Fakturirano"
 #: view:pos.confirm:0
 #: view:pos.open.statement:0
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Napomena popusta"
 
 #. module: point_of_sale
 #: view:pos.scan.product:0
@@ -2003,12 +2005,12 @@ msgstr "Dodaj"
 #: view:report.cash.register:0
 #: selection:report.pos.order,state:0
 msgid "Draft"
-msgstr "U pripremi"
+msgstr "Nacrt"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr ""
+msgstr "POS Order line"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
@@ -2018,12 +2020,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_date
 msgid "POS Payment Report according to date"
-msgstr ""
+msgstr "POS Payment Report according to date"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr "Predračun"
+msgstr "Pro-forma"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:638
@@ -2071,23 +2073,23 @@ msgstr "Prodaje po korisniku"
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Print Receipt"
-msgstr ""
+msgstr "Print Receipt"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "POS Orders lines"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:340
@@ -2104,12 +2106,12 @@ msgstr ""
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
 msgid "Sales Journal"
-msgstr ""
+msgstr "Dnevnik prodaje"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Refund"
-msgstr "Povrat"
+msgstr "Povrat novca"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -2122,19 +2124,19 @@ msgstr ""
 #: report:pos.sales.user.today:0
 #: field:report.pos.order,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Date Order"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "Close Cash Registers"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.payment.report.date:0
 #: report:pos.payment.report.user:0
 msgid "Disc(%)"
-msgstr ""
+msgstr "Pop(%)"
 
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
@@ -2148,17 +2150,17 @@ msgstr ""
 #: view:pos.sales.user.today.current_user:0
 #: view:pos.scan.product:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Order lines"
-msgstr ""
+msgstr "Stavke narudžbe"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "Subtotal w/o Tax"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2168,22 +2170,22 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "Izvještaj blagajne"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Gotovinske temeljnice"
 
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details :"
-msgstr ""
+msgstr "POS Detalji :"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Današnje prodaje po korisniku"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
@@ -2204,23 +2206,23 @@ msgstr ""
 #: report:pos.invoice:0
 #: report:pos.lines:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "Stavke prodaje"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne bilješke"
 
 #. module: point_of_sale
 #: view:pos.add.product:0
@@ -2242,7 +2244,7 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
 #: view:report.pos.order:0
 msgid "Point of Sale Analysis"
-msgstr ""
+msgstr "Analiza maloprodaje (POS-a)"
 
 #. module: point_of_sale
 #: field:pos.make.payment,partner_id:0
@@ -2250,7 +2252,7 @@ msgstr ""
 #: field:pos.order,partner_id:0
 #: view:report.pos.order:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: point_of_sale
 #: field:pos.make.payment,is_acc:0
@@ -2264,12 +2266,12 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Danas    "
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:95
@@ -2293,12 +2295,12 @@ msgstr ""
 #: selection:report.cash.register,month:0
 #: selection:report.pos.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
 msgid "Payments"
-msgstr ""
+msgstr "Plaćanja"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2312,17 +2314,17 @@ msgstr ""
 #: report:pos.sales.user.today.current.user:0
 #: report:pos.user.product:0
 msgid "Print Date"
-msgstr ""
+msgstr "Datum ispisa"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
 msgid "Sales by User Monthly margin"
-msgstr ""
+msgstr "Prodaja prema mjesečnoj marži korisnika"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Traži prodajne naloge"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
@@ -2336,13 +2338,13 @@ msgstr ""
 #: view:pos.order:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 #: view:pos.sales.user.today:0
 msgid "Sales User Today"
-msgstr ""
+msgstr "Prodaja po korisniku"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2350,7 +2352,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #~ msgid "Discount :"
 #~ msgstr "Popust"
@@ -2391,9 +2393,6 @@ msgstr ""
 #~ msgid "E-mail :"
 #~ msgstr "E-mail :"
 
-#~ msgid "Discount"
-#~ msgstr "Popust"
-
 #~ msgid "Payment Name"
 #~ msgstr "Naziv plaćanja"
 
@@ -2420,3 +2419,6 @@ msgstr ""
 
 #~ msgid "Discount percentage"
 #~ msgstr "Postotak popusta"
+
+#~ msgid "Discount"
+#~ msgstr "Discount"
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 09f1e8860fd..640a33d325b 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="1">
 
     <record id="group_pos_user" model="res.groups">
-        <field name="name">Point of Sale / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_point_of_sale"/>
     </record>
     <record id="group_pos_manager" model="res.groups">
-        <field name="name">Point of Sale / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_point_of_sale"/>
         <field name="implied_ids" eval="[(4, ref('group_pos_user')), (4, ref('stock.group_stock_user'))]"/>
     </record>
 
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4850cb7805b..4b73db5cdcc 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="ir.module.category" id="module_category_portal">
+            <field name="name">Portal</field>
+            <field name="parent_id" ref="base.module_category_tools"/>
+            <field name="sequence">25</field>
+        </record>
+
         <record id="group_portal_officer" model="res.groups">
-            <field name="name">Portal / Officer</field>
+            <field name="name">Officer</field>
             <field name="comment">Portal officers can create new portal users with the portal wizard.</field>
+            <field name="category_id" ref="module_category_portal"/>
         </record>
         <record id="group_portal_manager" model="res.groups">
-            <field name="name">Portal / Manager</field>
+            <field name="name">Manager</field>
             <field name="comment">Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.</field>
+            <field name="category_id" ref="module_category_portal"/>
             <field name="implied_ids" eval="[(4, ref('group_portal_officer'))]"/>
         </record>
     </data>
diff --git a/addons/procurement/i18n/hr.po b/addons/procurement/i18n/hr.po
index ae7312f9da2..52f9ec3b968 100644
--- a/addons/procurement/i18n/hr.po
+++ b/addons/procurement/i18n/hr.po
@@ -8,13 +8,13 @@ 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-11 22:33+0000\n"
+"PO-Revision-Date: 2011-12-12 06:23+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-12 05:17+0000\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
 "X-Generator: Launchpad (build 14458)\n"
 
 #. module: procurement
@@ -75,13 +75,13 @@ msgstr ""
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Izračunaj samo pravila minimalnih zaliha"
 
 #. module: procurement
 #: field:procurement.order,company_id:0
 #: field:stock.warehouse.orderpoint,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Organizacija"
 
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
@@ -92,37 +92,37 @@ msgstr ""
 #: view:procurement.order:0
 #: field:procurement.order,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Razlog"
 
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "Izračunaj nabave"
 
 #. module: procurement
 #: field:procurement.order,message:0
 msgid "Latest error"
-msgstr ""
+msgstr "Zadnja greška"
 
 #. module: procurement
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Ne korisiti se u izračunu, samo za informaciju"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr ""
+msgstr "Zadnja nabava"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "on order"
-msgstr ""
+msgstr "na nalogu"
 
 #. module: procurement
 #: help:procurement.order,message:0
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index d9f14a13225..5c993b9cd61 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -3,14 +3,8 @@
 <data noupdate="1">
 
     <record id="group_uos" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Useability / Product UoS View</field>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">Product UoS View</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record id="product_comp_rule" model="ir.rule">
@@ -21,7 +15,8 @@
     </record>
 
     <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Useability / Product Variant</field>
+        <field name="name">Product Variant</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record model="ir.rule" id="product_pricelist_comp_rule">
diff --git a/addons/profile_tools/i18n/hr.po b/addons/profile_tools/i18n/hr.po
new file mode 100644
index 00000000000..eaaed3f8e40
--- /dev/null
+++ b/addons/profile_tools/i18n/hr.po
@@ -0,0 +1,153 @@
+# 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 10:10+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: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+"Promoviranje ideja zaposlenika, glasovanje i rasprava o najboljim idejama."
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"Allows you to give restricted access to your OpenERP documents to external "
+"users, such as customers, suppliers, or accountants. You can share any "
+"OpenERP Menu such as your project tasks, support requests, invoices, etc."
+msgstr ""
+"Dopušta vam davanje ograničenog pristupa vašim OpenERP dokumentima vanjskim "
+"korisnicima, poput kupaca, dobavljača ili računovođe. Možete podjeliti bilo "
+"koji OpenERP izbornik poput zadatka projekta, zahtejvi za podrškom, računi, "
+"itd."
+
+#. module: profile_tools
+#: help:misc_tools.installer,lunch:0
+msgid "A simple module to help you to manage Lunch orders."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Ponavljajući dokumenti"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "misc_tools.installer"
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+"Instaliraj alate za lansiranje, upitnike, pretplatu i audittrail modul\n"
+"    "
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid ""
+"Extra Tools are applications that can help you improve your organization "
+"although they are not key for company management."
+msgstr ""
+"Dodatni alati su aplikacije koje vam mogu pomoći u poboljšanju organizacije "
+"iako nisu ključni za upravljanje društvom."
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
+msgstr "Podešavanje"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Omogućuje organiziranje istraživanja"
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Razni alati"
+
+#. module: profile_tools
+#: help:misc_tools.installer,pad:0
+msgid ""
+"This module creates a tighter integration between a Pad instance of your "
+"choosing and your OpenERP Web Client by letting you easily link pads to "
+"OpenERP objects via OpenERP attachments."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr "Podešavanje dodatnih alata"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr "Kutija za ideje"
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Pomaže u generiranju automatskih ponavljajućih dokumenata"
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Podešavanje alata"
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Upitnik"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Web Share"
+msgstr "Djeljenje na webu"
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index e23ce653702..1b25c9d15cc 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -62,8 +62,9 @@ Dashboard for project members that includes:
         'project_demo.xml',
     ],
     'test':[
-        'test/test_project.yml',
-        'test/test_project_delegation.yml',
+        'test/project_demo.yml',
+        'test/project_process.yml',
+        'test/task_process.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project/project.py b/addons/project/project.py
index 5c234cf5e26..cc29ebdee94 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -114,6 +114,7 @@ class project(osv.osv):
             if task.project_id: result[task.project_id.id] = True
         return result.keys()
 
+    #dead code
     def _get_project_work(self, cr, uid, ids, context=None):
         result = {}
         for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
@@ -360,7 +361,7 @@ def Project():
     working_days = %s
     resource = %s
 """       % (
-            project.id, 
+            project.id,
             project.date_start, working_days,
             '|'.join(['User_'+str(x) for x in puids])
         )
@@ -920,21 +921,24 @@ class task(osv.osv):
             self.log(cr, uid, id, message)
         return True
 
-    def set_remaining_time_1(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 1.0}, context=context)
+    def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None):
+        for task in self.browse(cr, uid, ids, context=context):
+            if (task.state=='draft') or (task.planned_hours==0.0):
+                self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context)
+        self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context)
         return True
 
+    def set_remaining_time_1(self, cr, uid, ids, context=None):
+        return self.set_remaining_time(cr, uid, ids, 1.0, context)
+
     def set_remaining_time_2(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 2.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 2.0, context)
 
     def set_remaining_time_5(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 5.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 5.0, context)
 
     def set_remaining_time_10(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'remaining_hours': 10.0}, context=context)
-        return True
+        return self.set_remaining_time(cr, uid, ids, 10.0, context)
 
     def set_kanban_state_blocked(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context)
@@ -979,6 +983,7 @@ class task(osv.osv):
             self.pool.get('project.task.history').create(cr, uid, {
                 'task_id': task.id,
                 'remaining_hours': task.remaining_hours,
+                'planned_hours': task.planned_hours,
                 'kanban_state': task.kanban_state,
                 'type_id': task.type_id.id,
                 'state': task.state,
@@ -1096,7 +1101,7 @@ class account_analytic_account(osv.osv):
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
         return super(account_analytic_account, self).create(cr, uid, vals, context=context)
-    
+
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
         analytic_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])
@@ -1158,7 +1163,8 @@ class project_task_history(osv.osv):
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
             'project.task.history': (_get_related_date, None, 20)
         }),
-        'remaining_hours': fields.float('Remaining Hours', digits=(16,2)),
+        'remaining_hours': fields.float('Remaining Time', digits=(16,2)),
+        'planned_hours': fields.float('Planned Time', digits=(16,2)),
         'user_id': fields.many2one('res.users', 'Responsible'),
     }
     _defaults = {
@@ -1186,7 +1192,7 @@ class project_task_history_cumulative(osv.osv):
                     id as history_id,
                     date+generate_series(0, CAST((coalesce(end_date,DATE 'tomorrow')::date - date)AS integer)-1) as date,
                     task_id, type_id, user_id, kanban_state, state,
-                    remaining_hours
+                    remaining_hours, planned_hours
                 FROM
                     project_task_history
             ) as history
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0da6b2e247e..22fc175246e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -378,6 +378,7 @@
                                                         type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
                                                     ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
                                                 ></t>
+                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
                                             </span>
                                         </div>
                                         <div class="oe_kanban_clear"/>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index aff90aea94e..89667992f0a 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -25,6 +25,18 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Project Tasks" type="bar">
+                    <field name="date"/>
+                    <field name="planned_hours" operator="+"/>
+                    <field name="type_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+        <record id="view_task_history_burndown_graph" model="ir.ui.view">
+            <field name="name">project.task.history.burndown.graph</field>
+            <field name="model">project.task.history.burndown</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Burndown Chart of Tasks" type="bar">
                     <field name="date"/>
                     <field name="remaining_hours" operator="+"/>
                     <field name="type_id" group="True"/>
@@ -32,12 +44,13 @@
             </field>
         </record>
 
+
         <record id="view_task_history_search" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.search</field>
             <field name="model">project.task.history.cumulative</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-               <search string="Task's Cumulative Flow">
+               <search string="Task's Analysis">
                     <group>
                         <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
@@ -69,13 +82,28 @@
             <field name="res_model">project.task.history.cumulative</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_task_history_graph"/>
             <field eval="False" name="filter"/>
-            <field name="context">{"search_default_open":1, "search_default_this_month": 1}</field>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
             parent="project_report_task" />
 
 
+        <record id="action_view_task_history_burndown" model="ir.actions.act_window">
+            <field name="name">Burndown Chart</field>
+            <field name="res_model">project.task.history.cumulative</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_task_history_burndown_graph"/>
+            <field eval="False" name="filter"/>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
+        </record>
+        <menuitem action="action_view_task_history_burndown"
+            id="menu_action_view_task_history_burndown"
+            parent="project_report_task" />
+
+
     </data>
 </openerp>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 6348c63fcad..5af8706108f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -150,7 +150,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_task_project_user_search"/>
-            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 62f74f51d1b..f1e3a6e9b74 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -3,18 +3,16 @@
 <data noupdate="1">
 
     <record id="group_project_user" model="res.groups">
-        <field name="name">Project / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_project_management"/>
     </record>
 
     <record id="group_project_manager" model="res.groups">
-        <field name="name">Project / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_project_management"/>
         <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
     </record>
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
diff --git a/addons/project/test/project_demo.yml b/addons/project/test/project_demo.yml
new file mode 100644
index 00000000000..3bcae52e238
--- /dev/null
+++ b/addons/project/test/project_demo.yml
@@ -0,0 +1,12 @@
+-
+  !record {model: project.project, id: project_integrate_openerp, view: False}:
+    partner_id: base.res_partner_agrolait
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    remaining_hours: 10.00
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    planned_hours: 10.00
+-
+  !record {model: project.task, id: project_task_1, view: False}:
+    project_id: project_integrate_openerp
\ No newline at end of file
diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
new file mode 100644
index 00000000000..3c51c464b1f
--- /dev/null
+++ b/addons/project/test/project_process.yml
@@ -0,0 +1,70 @@
+-
+  In order to Test Process of Project Management,
+-
+  I create duplicate template.
+-
+  !python {model: project.project}: |
+     new_template = self.duplicate_template(cr, uid, [ref("project_integrate_openerp")])
+     assert new_template, "duplicate template is not created"
+     template = self.browse(cr, uid, new_template['res_id'], context=context)
+     assert template.state == 'open', "Duplicate template must be in open state."
+-
+  I convert template into real Project.
+-
+  !python {model: project.project}: |
+     self.reset_project(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check project details after convert from template.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be active}:
+    - state == "open"
+-
+  I put project in pending.
+-
+  !python {model: project.project}: |
+    self.set_pending(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after put in pending.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be in pending state}:
+    - state == "pending"
+-
+  I re-open the project.
+-
+  !python {model: project.project}: |
+      self.set_open(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after reopen.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be open.}:
+    - state == "open"
+-
+  I close the project.
+-
+  !python {model: project.project}: |
+    self.set_done(cr, uid, [ref("project_integrate_openerp")])
+-
+  I check state after closed.
+-
+  !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be close.}:
+    - state == "close"
+-
+  I set project into template.
+-
+  !python {model: project.project}: |
+    self.set_template(cr, uid, [ref("project_integrate_openerp")])
+-
+  I schedule tasks of project.
+-
+  !python {model: project.project}: |
+    self.schedule_tasks(cr, uid, [ref("project_integrate_openerp")], context=context)
+-
+  I copy the tasks of project.
+-
+  !python {model: project.project}: |
+    self.template_copy(cr, uid, ref("project_integrate_openerp"))
+-
+  I cancel Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_project_9")])
\ No newline at end of file
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
new file mode 100644
index 00000000000..73250de2963
--- /dev/null
+++ b/addons/project/test/task_process.yml
@@ -0,0 +1,76 @@
+-
+  I put task in pending due to specification is not clear.
+-
+  !python {model: project.task}: |
+    self.do_pending(cr, uid, [ref("project_task_1")])
+    context.update({"active_id": ref("project_task_1")})
+-
+  I check state  of task after put in pending.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be in pending state}:
+    - state == "pending"
+-
+  !record {model: project.task.delegate, id: delegate_id}:
+    user_id: res_users_analyst
+    planned_hours: 12.0
+    planned_hours_me: 2.0
+-
+  Now I delegate task to team member.
+-
+  !python {model: project.task.delegate}: |
+    self.delegate(cr, uid, [ref("delegate_id")], {"active_id": ref("project_task_1")})
+-
+  I check delegated task details.
+-
+  !python {model: project.task}: |
+    task = self.browse(cr, uid, ref("project_task_1"), context=context)
+    assert task.planned_hours == 2.0, "Planning hours is not correct after delegated."
+    assert task.state == "pending", "Task should be in Pending after delegated."
+-
+  I re-open the task.
+-
+  !python {model: project.task}: |
+    self.do_reopen(cr, uid, [ref("project_task_1")])
+-
+  I check reopened task details.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
+    - state == "open"
+-
+  I change the stage of task to next stage.
+-
+  !python {model: project.task}: |
+    self.next_type(cr, uid, [ref("project_task_1")])
+-
+  !record {model: project.task.reevaluate, id: reevaluate_id}:
+    remaining_hours : 120
+-
+  I reevaluate task with remaining hours.
+-
+  !python {model: project.task.reevaluate}: |
+    self.compute_hours(cr, uid, [ref("reevaluate_id")], {"active_id": ref("project_task_1")})
+-
+  I check remaining hours after reevaluated task.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
+    - remaining_hours == 120.0
+-
+  I close the task.
+-
+  !python {model: project.task}: |
+    self.action_close(cr, uid, [ref("project_task_1")])
+-
+  I check state after closed.
+-
+  !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}:
+    - state == "done"
+-
+  I change the stage of task to previous stage.
+-
+  !python {model: project.task}: |
+    self.prev_type(cr, uid, [ref("project_task_1")])
+-
+  I cancel Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_2")])
\ No newline at end of file
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
deleted file mode 100644
index f79c2a34224..00000000000
--- a/addons/project/test/test_project.yml
+++ /dev/null
@@ -1,296 +0,0 @@
--
-  Test project template feature
--
-  Create project 'OpenERP Training Programme'
--
-  !record {model: project.project, id: project_project_openerptrainingprogramme0}:
-    company_id: base.main_company
-    name: OpenERP Training Programme
--
-  Create task 'Technical Training' for this project
--
-  !record {model: project.task, id: project_task_technicaltraining0}:
-    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    name: Technical Training
-    planned_hours: 30.0
-    project_id: project_project_openerptrainingprogramme0
-    remaining_hours: 30.0
-    state: draft
--
-  Create task 'Functional Training' for this project
--
-  !record {model: project.task, id: project_task_functionaltraining0}:
-    date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    name: Functional Training
-    planned_hours: 30.0
-    project_id: project_project_openerptrainingprogramme0
-    remaining_hours: 30.0
-    state: draft
--
-  Set project as project template
--
-  !python {model: project.project}: |
-    self.set_template(cr, uid, [ref("project_project_openerptrainingprogramme0")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_id": ref("project.menu_open_view_project_all"), })
--
-  Check if project in template state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in template state}:
-       - state == "template"
--
-  Create new project based on this template
--
-  !python {model: project.project}: |
-     new_prj = self.duplicate_template(cr, uid, [ref("project_project_openerptrainingprogramme0")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_id": ref("project.menu_open_view_project_all"), })
-     if not new_prj:
-         raise Exception( "New project based on template not created")
-     new_id = new_prj['res_id']
-     new_prj = self.read(cr, uid, [new_id], ['name', 'state'])[0]
-     state = new_prj['state']
-     name = new_prj['name']
-     assert state == 'open', "Project in %s state. Project created from template project must be in open state"%state
--
-  Reset project template to normal project
--
-  !python {model: project.project}: |
-    self.reset_project(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in open state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
-       - state == "open"
--
-  Test for different project-states
--
-  Keep project pending
--
-  !python {model: project.project}: |
-    self.set_pending(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in pending state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in pending state}:
-       - state == "pending"
--
-  Cancel the project
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids":
-      [ref("project.menu_open_view_project_all")], "tz": False, "active_model":
-      "ir.ui.menu", "project_id": False, "active_id": ref("project.menu_open_view_project_all"),
-      })
--
-  Check if project in cancel state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in cancel state}:
-       - state == "cancelled"
--
-  Re-open the project
--
-  !python {model: project.project}: |
-    self.set_open(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_model": "ir.ui.menu", "project_id": False, "active_id":
-      ref("project.menu_open_view_project_all"), })
--
-  Check if project in open state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
-       - state == "open"
--
-  Test for task work allocation
--
-  As i cancelled my project before, i check if the task 'Technical Training' is in cancelled state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Task is in cancelled state}:
-       - state == "cancelled"
--
-  Now in order to reactivate the task 'Technical Training', i click on the "Reactivate" button and fill the remaining hour field
--
-  !record {model: project.task.reevaluate, id: project_task_technicaltraining_remainingwiz0}:
-    remaining_hours: 30.0
-- |
-  I click the apply button
--
-  !python {model: project.task.reevaluate}: |
-      self.compute_hours(cr, uid, [ref('project_task_technicaltraining_remainingwiz0')], {'active_id': ref("project_task_technicaltraining0"),'button_reactivate': True})
-- |
-  Check if task 'Technical Training' in  open state and for other initial values
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Project is in open state}:
-       - state == "open"
-       - planned_hours == 30
-       - remaining_hours == 30
-       - delay_hours == 0.0
-       - effective_hours == 0.0
--
-  Make a work task entry 'Training on OpenERP modules, models and classes' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on OpenERP modules, models and classes
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 10
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After work task of 10 hours effective_hours must be equal to 10}:
-       - remaining_hours == 20
-       - effective_hours == 10.0
--
-  Make a work task entry 'Training on OpenERP xml views' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on OpenERP xml views
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 20
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 20}:
-       - remaining_hours == 10
-       - effective_hours == 20.0
--
-  Make a work task entry 'Training on workflows' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on workflows
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, effective_hours must be equal to 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 30}:
-       - remaining_hours == 0
-       - effective_hours == 30.0
--
-  Set remaining hours of 10 hours for reevaluating the task
--
-  !record {model: project.task.reevaluate, id: config_compute_remaining_0}:
-    remaining_hours: 10.0
--
-  Reevaluate the task
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("config_compute_remaining_0")], {"lang": "en_US",
-      "project_id": False, "tz": False, "active_model": "project.task", "search_default_project_id":
-      False, "search_default_user_id": 1, "search_default_current": 1, "active_ids":
-      [ref("project_task_technicaltraining0")], "active_id": ref("project_task_technicaltraining0"), })
-
--
-   Check for effective hours and remaining hours, remaining_hours must be 10 while planned_hours remains 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After reevaluating the task with 10 hours remaining_hours must be 10 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 10.0
-       - effective_hours == 30.0
--
-  Make a work task entry 'Training on reports and wizards' of 10 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 10.0
-        name: Training on reports and wizards
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After one more work task of 10 hours effective_hours must be equal to 40 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 0
-       - effective_hours == 40.0
--
-  Close the task
--
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
--
-  Check if task in done state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: Task is in done state}:
-       - state == "done"
-
-
--
-  Test for task reactivation
--
-  Reactivate task
--
-  !record {model: project.task.reevaluate, id: config_compute_remaining_1}:
-    remaining_hours: 10.0
--
-  Reevaluate the task with 10 hours remaining
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("config_compute_remaining_1")], {"lang": "en_US",
-      "project_id": False, "tz": False, "button_reactivate": True, "active_model":
-      "project.task", "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "active_ids": [ref("project_task_technicaltraining0")], "active_id": ref("project_task_technicaltraining0"),
-      })
--
-   Check for effective hours and remaining hours, remaining_hours must be 10 while planned_hours remains 30
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After reevaluating the task with 10 hours remaining_hours must be 10 while planned_hours remains 30}:
-       - planned_hours == 30
-       - remaining_hours == 10.0
-       - effective_hours == 40.0
--
-  Make a work task entry 'Training on yml' of 5 hours
--
-  !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}:
-    work_ids:
-      - date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-        hours: 5.0
-        name: Training on yml
-        user_id: base.user_root
--
-   Check for effective hours and remaining hours, remaining_hours must be 5, effective_hours must be 45
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After work task of 5 hours effective_hours must be equal to 45 and remaining_hours is 5}:
-       - planned_hours == 30
-       - remaining_hours == 5.0
-       - effective_hours == 45.0
--
-  Close the task
--
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_technicaltraining0")], {'mail_send': False})
--
-  Check if task in done state
--
-  !assert {model: project.task, id: project_task_technicaltraining0, severity: error}:
-       - state == "done"
--
-   Check for effective hours and remaining hours
--
-   !assert {model: project.task, id: project_task_technicaltraining0, severity: error, string: After closing the task planned_hours must remain 30 effective_hours must be 45 and remaining hours must be 0}:
-       - planned_hours == 30
-       - remaining_hours == 0.0
-       - effective_hours == 45.0
--
-  Close project 'OpenERP Training Programme'
--
-  !python {model: project.project}: |
-    self.set_done(cr, uid, [ref("project_project_openerptrainingprogramme0")], {"lang": "en_US", "active_ids": [ref("project.menu_open_view_project_all")],
-      "tz": False, "active_model": "ir.ui.menu", "project_id": False, "active_id":
-      ref("project.menu_open_view_project_all"), })
--
-  Check if project in close state
--
-  !assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: "Project must be in closed state"}:
-       - state == "close"
-
diff --git a/addons/project/test/test_project_delegation.yml b/addons/project/test/test_project_delegation.yml
deleted file mode 100644
index 02bc9afaae8..00000000000
--- a/addons/project/test/test_project_delegation.yml
+++ /dev/null
@@ -1,230 +0,0 @@
--
-  This scenario tests the delegation process. Closing all the delegated tasks(task delegation at multiple levels) transits the parent task from pending to open state.  
-- 
-  Creating a project OpenERP Documentation
-- 
-  !record {model: project.project, id: project_project_openerpdocumentation0}:
-    company_id: base.main_company
-    name: OpenERP Documentation    
-    
-- 
-  Creating a task 'Develop book for Technical and Functional reference'
-- 
-  !record {model: project.task, id: project_task_documentation_book}:
-    name: Develop book for Technical and Functional reference
-    planned_hours: 20.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 20.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_documentation_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), }) 
-
-- 
-  Creating a task 'Publish the References'
-- 
-  !record {model: project.task, id: project_task_publish_book}:
-    name: Publish the References
-    planned_hours: 10.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 10.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_publish_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), }) 
-
--
-  Test the delegate wizard 
-- 
-  Creating a delegate task 'Publish the References' of 15 hours, renaming parent task to 'CHECK Publish the References' of 1 hour
-- 
-  !record {model: project.task.delegate, id: project_task_publish_book_delegate}:
-    name: Publish the References
-    new_task_description: aaa
-    planned_hours: 15.0
-    planned_hours_me: 1.0
-    prefix: 'CHECK: Publish the References'
-    state: pending
-    user_id: base.user_demo
-    
-- 
-  Validating the delegate task
-- 
-  !python {model: project.task.delegate}: |
-    self.delegate(cr, uid, [ref("project_task_publish_book_delegate")],
-      {"lang": "en_US", "active_model": "project.task", "tz": False, "record_id":
-      4, "active_ids": [ref("project_task_publish_book")], "active_id": ref("project_task_publish_book"),
-      })
-
--
-  Check if parent task 'CHECK Publish the References' is in pending state
-- 
-  !assert {model: project.task, id: project_task_publish_book, severity: error, string: "Task must be in pending state after delegation"}:
-       - state == "pending"      
-- 
-  Creating a delegate task 'Prepare a book that gives functional overview of OpenERP' 
-- 
-  !record {model: project.task, id: project_task_delegate_openerp_tutorial}:
-    name: Prepare a book that gives functional overview of OpenERP
-    planned_hours: 30.0
-    project_id: project.project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-    
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_openerp_tutorial")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-          
-- 
-  Creating a delegate task 'Prepare a technical reference for creating your modules'
-- 
-  !record {model: project.task, id: project_task_delegate_developer_book}:
-    name: Prepare a technical reference for creating your modules
-    planned_hours: 30.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
- 
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_developer_book")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-
-- 
-  Delegate task 'Develop book for Technical and Functional reference' to these tasks and make it pending
-- 
-  !record {model: project.task, id: project_task_documentation_book}:
-    child_ids:
-      - project.project_task_delegate_openerp_tutorial
-      - project.project_task_delegate_developer_book
-    planned_hours: 20.0
-    state: pending
-
-- 
-  Creating a delegate task 'Prepare documentation for Module Development'
-- 
-  !record {model: project.task, id: project_task_delegate_module_develop}:
-    name: Prepare documentation for Module Development
-    planned_hours: 30.0
-    project_id: project.project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-    
-
-- 
-  Creating a delegate 'Prepare documentation for Business Process Development'
-- 
-  !record {model: project.task, id: project_task_delegate_business_process_develop}:
-    name: Prepare documentation for Business Process Development
-    planned_hours: 30.0
-    project_id: project_project_openerpdocumentation0
-    remaining_hours: 30.0
-    state: draft
-
-- 
-  Delegate task 'Prepare a technical reference for creating your modules' to these tasks and make it pending
-- 
-  !record {model: project.task, id: project_task_delegate_developer_book}:
-    child_ids:
-      - project.project_task_delegate_module_develop
-      - project.project_task_delegate_business_process_develop
-    planned_hours: 20.0
-    state: pending
-
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_module_develop")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })
-      
-- 
-  Open the task
-- 
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_delegate_business_process_develop")],
-      {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("project.menu_action_view_task")],
-      "tz": False, "active_id": ref("project.menu_action_view_task"), })      
-
-- 
-  Check if 'Prepare a technical reference for creating your modules' in pending state
-- 
-  !assert {model: project.task, id: project_task_delegate_developer_book, severity: error, string: Task must be in pending state}:
-       - state == "pending"
-                 
-- 
-  Close the child task 'Prepare documentation for Module Development'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_module_develop")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Close the child task 'Prepare documentation for Business Process Development'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_business_process_develop")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Parent task 'Prepare a technical reference for creating your modules' task must now be in open state
-- 
-  !assert {model: project.task, id: project_task_delegate_developer_book, severity: error, string: Task is in done state}:
-       - state == "open"
-       
-      
-- 
-  Check if task 'Develop book for Technical and Functional reference' in pending state
-- 
-  !assert {model: project.task, id: project_task_documentation_book, severity: error, string: Task is in pending state}:
-       - state == "pending"
-                 
-- 
-  Close the child task 'Prepare a technical reference for creating your modules'
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_developer_book")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Close the child task 'Prepare a book that gives functional overview of OpenERP' 
-- 
-  !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_delegate_openerp_tutorial")], {"lang": "en_US",
-      "active_ids": [ref("project.menu_action_view_task")], "tz": False, "active_model":
-      "ir.ui.menu", "section_id": False, "search_default_project_id": False, "search_default_user_id":
-      1, "search_default_current": 1, "mail_send": False, "active_id": ref("project.menu_action_view_task"),
-      })
-      
-- 
-  Parent task 'Develop book for Technical and Functional reference' must be now in open state 
-- 
-  !assert {model: project.task, id: project_task_documentation_book, severity: error, string: Task is in done state}:
-       - state == "open"                  
diff --git a/addons/project_issue_sheet/i18n/hr.po b/addons/project_issue_sheet/i18n/hr.po
new file mode 100644
index 00000000000..a300e7ec625
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/hr.po
@@ -0,0 +1,77 @@
+# 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 09:54+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_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid ""
+"\n"
+"                    This module adds the Timesheet support for the "
+"Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analitičke stavke"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Stavka kontrolne kartice"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Kontrolna kartica"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analitički konto"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Datum kreiranja"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Kontrolne kartice"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr ""
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr ""
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 84ac057bbb4..7d33a431f2a 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -44,6 +44,7 @@ Features
     "demo_xml": ["project_long_term_demo.xml"],
     "test": [
           'test/phase_process.yml',
+          'test/task_process.yml',
     ],
     "update_xml": [
         "security/ir.model.access.csv",
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
new file mode 100644
index 00000000000..434470646c2
--- /dev/null
+++ b/addons/project_long_term/i18n/hr.po
@@ -0,0 +1,625 @@
+# 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 09:44+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_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "Upravljanje dugotrajnim projektima"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "Izračunaj planiranje faza"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Sljedeće faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Zadaci projekta"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: project_long_term
+#: 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_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: view:project.resource.allocation:0
+msgid "Resources Allocation"
+msgstr "Alokacija resursa"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr "Postavke prikaza"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Zakaži"
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"        Modul upravljanja dugotrajnim projektima prati planiranje, "
+"zakazivanje i alokaciju resursa.\n"
+"        Uglavnom se koristi s Upravljanjem velikim projektima.\n"
+"            - Faze projekta će održavati voditelj projekta\n"
+"            - Izračunaj zakaizivanje faza: Uzračunaj početni datum i završni "
+"datum faza koje su u statusu nacrt,otvoreno i na čekanju za odabrani "
+"projekt.\n"
+"                                        Ako nijeda projekt nije odabran tada "
+"će se uzeti sve faze u statusu nacrt, otvoreno i na čekanju \n"
+"            - Izračunaj zakazivanje zadatka: RAdi na isti način kao i gumb "
+"za zakazivanje na fazama projekta. Uzima projekt kao argument i računa sve "
+"zadatke u statusu nacrt, otvoreno i na čekanju.\n"
+"            - Zakaži zadatke: Svi azdaci u statusu nacrt, otvoreno i na "
+"čekanju se zakazuju uzimajući početni datum faze.\n"
+"\n"
+"    "
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "Alokacije resursa"
+
+#. module: project_long_term
+#: 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_long_term
+#: code:addons/project_long_term/project_long_term.py:128
+#, python-format
+msgid "Day"
+msgstr "Dan"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Izračunaj pojedinačni projekt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Prijašnje faze"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "JM (Jedinica mjere) je mjerna jedinica za trajanje"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr " Planer računa prema datumu početka i trajanju."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
+#: view:project.task:0
+msgid "Project"
+msgstr "Projekt"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Završni datum"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "Planiranje"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Krajnji rok"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr "Izračunaj zakazivanje faze"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:190
+#, python-format
+msgid " (copy)"
+msgstr " (kopija)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "Raspoloživost"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "I_zračunaj"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr "Izračunaj zakazivanje faza za sve ili pojedini projekt"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "JM trajanja"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+msgid "Compute Task Scheduling"
+msgstr "Izračunaj zakazivanje zadataka"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Minimalni početni datum"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr "Alokacija resursa projekta"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "Izračunaj zakazivanje zadatka"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "Resursi"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+"Za zakazivanje faza svih ili pojedinog projekta. Nakon toga otvara Gantt "
+"pogled.\n"
+"\t           "
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Početni datum"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Vezani zadaci"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr "Raspoloživost tog resursa za tu fazu projekta u postotku (=50%)"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "prisili početak faze nakon ovog datuma"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Zadaci projekta"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "Resursi projekta"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "_U redu"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr "Zakaži i prikaži info"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr ""
+"Računa planer prema datumu projekta ili završnom datumu prethodne faze"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Početni datum faze mora biti manje od završnog datuma faze."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr "project.schedule.tasks"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on the project."
+msgstr ""
+"Projekt je moguće podjeliti u različite faze. Za svaku fazu, možete "
+"definriati alokaciju resursa, opisati različite zadatke i povezati vašu fazu "
+"sa prethodnom i sljedećom fazom, dodati datumska ograničenja za automatsko "
+"zakazivanje. Koristite dugotrajno planiranje za vaše raspoložive ljudske "
+"resurse, pretvorite vaš faze u seriju zadataka nakon početka rada na "
+"projektu."
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "Početni datum"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "Alokacija resursa"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "prisili završetak faze prije ovog datuma"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Na čekanju"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "nepoznato"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "Pojedinosti o zadataku"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Raspored radnih sati za prilagođavanje izvještaja Gantt dijagramom"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Izračun zadatka projekta"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Ograničenja"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Daje redoslijed sekvence prilikom prikaza popisa faza."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Faze projekta"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "U tijeku"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Preostali sati"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Radno vrijeme"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "Trenutni"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Početna faza"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr "Molim navedite projekt za zakazivanje"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "Ukupni sati"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr "Zakazivanje zdataka uspješno završeno"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr "Izračunaj zakazivanje zadataka za odabrani projekt"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "Faza"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"Ako je faza kreirana u statusu 'Nacrt'.\n"
+" AKo je faza započela, status se mijenja u 'U tijeku'.\n"
+" Ako je potreban pregled faza je u statusu 'Na čekanju'.                     "
+"             \n"
+" Ako je faza završila, status je postavljen na 'Završeno'."
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "Resurs"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "Pojedinosti zadatka"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr "Razdoblje rada"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "Pojedinosti resursa"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "Zakazivanje"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr "Faza projekta"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Izračun faza projekta"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Petlje u fazama nisu dozvoljene"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "Izračunaj sve projekte"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Odsustva resursa"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr "Zakaži zadatke"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Predefinirano u danima"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Trajanje"
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 4ab1722336e..b6647b6de2b 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -72,12 +72,13 @@ class project_phase(osv.osv):
              if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']:
                  return False
          return True
-
+    #dead code
     def _get_default_uom_id(self, cr, uid):
        model_data_obj = self.pool.get('ir.model.data')
        model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
        return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
 
+    #dead code
     def _compute_progress(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         if not ids:
diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
new file mode 100644
index 00000000000..64ecef73476
--- /dev/null
+++ b/addons/project_long_term/test/task_process.yml
@@ -0,0 +1,19 @@
+-
+  I create a record to compute the tasks of project.
+-
+  !record {model: project.compute.tasks, id: project_compute_tasks0}:
+    project_id: project.project_integrate_openerp
+-
+  I compute and shedule the tasks.
+-
+  !python {model: project.compute.tasks}: |
+    self.compute_date(cr, uid, [ref("project_compute_tasks0")])
+-
+  Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
+-
+  !python {model: project.project}: |
+    prj = self.browse(cr, uid, [ref("project.project_integrate_openerp")])[0]
+    for task in prj.tasks:
+        if task.state in ('done','cancelled'):
+            continue
+        assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled"
diff --git a/addons/project_mailgate/i18n/hr.po b/addons/project_mailgate/i18n/hr.po
new file mode 100644
index 00000000000..cb4276b9d7f
--- /dev/null
+++ b/addons/project_mailgate/i18n/hr.po
@@ -0,0 +1,107 @@
+# 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:56+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_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "Informacije o povjesti"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: project_mailgate
+#: model:ir.module.module,description:project_mailgate.module_meta_information
+msgid ""
+"This module is an interface that synchronises mails with OpenERP Project "
+"Task.\n"
+"\n"
+"It allows creating tasks as soon as a new mail arrives in our configured "
+"mail server.\n"
+"Moreover, it keeps track of all further communications and task states.\n"
+"    "
+msgstr ""
+"Ovaj modul je sučelje za sinhronizaciju poruka sa OpenERP projektnim "
+"zadacima.\n"
+"\n"
+"Omogućava kreiranje zadataka čim stigne novi e-mail na naš konfigurirani "
+"mail poslužitelj.\n"
+"Štoviše, čuva zapise o svim kasnijim komunikacijama i statusima zadataka.\n"
+"    "
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr "Privici"
+
+#. module: project_mailgate
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "MailGateWay projekta"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:123
+#, python-format
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Details"
+msgstr "Pojedinosti"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:149
+#, python-format
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:143
+#, python-format
+msgid "Done"
+msgstr "Izvršeno"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:129
+#, python-format
+msgid "Open"
+msgstr "Otvoreno"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:135
+#, python-format
+msgid "Pending"
+msgstr "Na čekanju"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "Povijest"
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_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index e0658f8525f..4b4f2016620 100644
--- a/addons/project_mrp/i18n/hr.po
+++ b/addons/project_mrp/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-12 05:17+0000\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
 "X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
@@ -142,75 +142,3 @@ msgstr "U slučaju kada prodajete usluge na prodajnim nalozima"
 
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Upravljanje projektima - MRP i Integracija Prodaje"
-
-#~ msgid "Order Reference must be unique per Company!"
-#~ msgstr "Order Reference must be unique per Company!"
-
-#~ msgid "Create Tasks on SO"
-#~ msgstr "Create Tasks on SO"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Sale Order Line"
-
-#~ msgid ""
-#~ "\n"
-#~ "Automatically creates project tasks from procurement lines\n"
-#~ "==========================================================\n"
-#~ "\n"
-#~ "This module will automatically create a new task for each procurement\n"
-#~ "order line (e.g. for sale order lines), if the corresponding product\n"
-#~ "meets the following characteristics:\n"
-#~ "\n"
-#~ "  * Type = Service\n"
-#~ "  * Procurement method (Order fulfillment) = MTO (make to order)\n"
-#~ "  * Supply/Procurement method = Produce\n"
-#~ "\n"
-#~ "If on top of that a projet is specified on the product form (in the "
-#~ "Procurement\n"
-#~ "tab), then the new task will be created in that specific project.\n"
-#~ "Otherwise, the new task will not belong to any project, and may be added to "
-#~ "a\n"
-#~ "project manually later.\n"
-#~ "\n"
-#~ "When the project task is completed or cancelled, the workflow of the "
-#~ "corresponding\n"
-#~ "procurement line is updated accordingly. For example if this procurement "
-#~ "corresponds\n"
-#~ "to a sale order line, the sale order line will be considered delivered when "
-#~ "the\n"
-#~ "task is completed.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Automatically creates project tasks from procurement lines\n"
-#~ "==========================================================\n"
-#~ "\n"
-#~ "This module will automatically create a new task for each procurement\n"
-#~ "order line (e.g. for sale order lines), if the corresponding product\n"
-#~ "meets the following characteristics:\n"
-#~ "\n"
-#~ "  * Type = Service\n"
-#~ "  * Procurement method (Order fulfillment) = MTO (make to order)\n"
-#~ "  * Supply/Procurement method = Produce\n"
-#~ "\n"
-#~ "If on top of that a projet is specified on the product form (in the "
-#~ "Procurement\n"
-#~ "tab), then the new task will be created in that specific project.\n"
-#~ "Otherwise, the new task will not belong to any project, and may be added to "
-#~ "a\n"
-#~ "project manually later.\n"
-#~ "\n"
-#~ "When the project task is completed or cancelled, the workflow of the "
-#~ "corresponding\n"
-#~ "procurement line is updated accordingly. For example if this procurement "
-#~ "corresponds\n"
-#~ "to a sale order line, the sale order line will be considered delivered when "
-#~ "the\n"
-#~ "task is completed.\n"
-#~ "\n"
-
-#~ msgid "Sale order line"
-#~ msgstr "Sale order line"
-
-#~ msgid "Sales Order"
-#~ msgstr "Prodajni nalog"
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
index ca01b101337..adeb2db41c2 100644
--- a/addons/project_planning/i18n/hr.po
+++ b/addons/project_planning/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:15+0000\n"
-"PO-Revision-Date: 2011-01-19 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-12-12 09:28+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:55+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:02+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -31,39 +31,41 @@ msgid ""
 "This value is given by the sum of work remaining to do on the task for this "
 "planning, expressed in days."
 msgstr ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
 #: model:ir.ui.menu,name:project_planning.menu_board_planning
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
 msgid "Planning Statistics"
-msgstr "Statistike Planiranja"
+msgstr "Statistike planiranja"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
 #: view:report_account_analytic.planning.line:0
 msgid "Planning Line"
-msgstr "Linija Planiranja"
+msgstr "Linija planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Unallocated Time"
-msgstr ""
+msgstr "Ukupno slobodno vrijeme"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,name:0
 msgid "Planning Name"
-msgstr "Ime Planiranja"
+msgstr "Naziv planiranja"
 
 #. module: project_planning
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Rekurzivni zadaci."
 
 #. module: project_planning
 #: view:board.board:0
 msgid "My Project's planning"
-msgstr ""
+msgstr "My Project's planning"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,timesheet:0
@@ -71,12 +73,12 @@ msgstr ""
 #: field:report_account_analytic.planning.stat,sum_amount_real:0
 #: field:report_account_analytic.planning.user,timesheet:0
 msgid "Timesheet"
-msgstr "Raspored"
+msgstr "Evidencija rada"
 
 #. module: project_planning
 #: model:ir.module.module,shortdesc:project_planning.module_meta_information
 msgid "Planning Management Module"
-msgstr ""
+msgstr "Planning Management Module"
 
 #. module: project_planning
 #: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
@@ -85,93 +87,97 @@ msgid ""
 "material), OpenERP allows you to encode and then automatically compute tasks "
 "and phases scheduling, track resource allocation and availability."
 msgstr ""
+"With its global system to schedule all resources of a company (people and "
+"material), OpenERP allows you to encode and then automatically compute tasks "
+"and phases scheduling, track resource allocation and availability."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Total planned tasks"
-msgstr ""
+msgstr "Ukupno planiranih zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Task"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: project_planning
 #: field:account.analytic.account,planning_ids:0
 #: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
 #: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
 msgid "Plannings"
-msgstr ""
+msgstr "Plannings"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Start Task"
-msgstr ""
+msgstr "Započni zadatak"
 
 #. module: project_planning
 #: selection:report_account_analytic.planning,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 #: view:report_account_analytic.planning.line:0
 msgid "Total Planned (in Days)"
-msgstr ""
+msgstr "Total Planned (in Days)"
 
 #. module: project_planning
 #: constraint:report_account_analytic.planning:0
 msgid ""
 "Invalid planning ! Planning dates can't overlap for the same responsible. "
 msgstr ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_account:0
 msgid "Planning By Account"
-msgstr ""
+msgstr "Planiranje računa"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Current Plannings"
-msgstr ""
+msgstr "Current Plannings"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Analitički konto"
+msgstr "Konto analitike"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Vrati u nacrt"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Dodatni podaci"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "To :"
-msgstr ""
+msgstr "Do :"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,timesheet:0
@@ -180,34 +186,36 @@ msgid ""
 "This value is given by the sum of all work encoded in the timesheet(s) "
 "between the 'Date From' and 'Date To' of the planning."
 msgstr ""
+"Ova vrijednost daje zbroj svih radova, kodirano u timesheet/u, raspon  'Od "
+"datuma' i 'Do datuma' rasporeda/planiranja."
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! You can not create recursive analytic accounts."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_open:0
 #: field:report_account_analytic.planning.user,plan_open:0
 msgid "Time Allocation without Tasks"
-msgstr ""
+msgstr "Time Allocation without Tasks"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: view:report_account_analytic.planning:0
 msgid "Planning Lines"
-msgstr ""
+msgstr "Linije Planiranja"
 
 #. module: project_planning
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,account_id:0
 #: field:report_account_analytic.planning.line,account_id:0
 msgid "Analytic account"
-msgstr "Analitički Konto"
+msgstr "Analitički konto"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_open:0
@@ -215,27 +223,29 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to FALSE, expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Razno"
 
 #. module: project_planning
 #: help:res.company,planning_time_mode_id:0
 msgid "This will set the unit of measure used in plannings."
-msgstr ""
+msgstr "This will set the unit of measure used in plannings."
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "HR Planning"
-msgstr "Planiranje Ljudskih resursa"
+msgstr "Planiranje ljudskih resursa"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,tasks:0
 #: field:report_account_analytic.planning.user,tasks:0
 msgid "Remaining Tasks"
-msgstr ""
+msgstr "Preostali zadaci"
 
 #. module: project_planning
 #: view:account.analytic.account:0
@@ -259,12 +269,12 @@ msgstr "Ukupno planirano"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time Encoding"
-msgstr ""
+msgstr "Time Encoding"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,free:0
 msgid "Unallocated Time"
-msgstr ""
+msgstr "Unallocated Time"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_open:0
@@ -272,11 +282,13 @@ msgid ""
 "This value is given by the sum of time allocation without task(s) linked, "
 "expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegiraj"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,free:0
@@ -284,6 +296,8 @@ msgid ""
 "Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
 "without Tasks + Holiday Leaves)"
 msgstr ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
 
 #. module: project_planning
 #: help:report_account_analytic.planning,business_days:0
@@ -291,6 +305,8 @@ msgid ""
 "Set here the number of working days within this planning for one person full "
 "time"
 msgstr ""
+"Set here the number of working days within this planning for one person full "
+"time"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -300,39 +316,39 @@ msgstr "["
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "From :"
-msgstr ""
+msgstr "From :"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_user_ids:0
 msgid "Planning By User"
-msgstr ""
+msgstr "Planning By User"
 
 #. module: project_planning
 #: model:ir.actions.act_window,name:project_planning.act_task_of_lines
 #: view:report_account_analytic.planning:0
 #: field:report_account_analytic.planning.stat,sum_amount_tasks:0
 msgid "Tasks"
-msgstr "Zadaci"
+msgstr "Tasks"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By Account (in Days)"
-msgstr ""
+msgstr "Planning By Account (in Days)"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Time without tasks"
-msgstr ""
+msgstr "Vrijeme bez zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_from:0
 msgid "Start Date"
-msgstr "Datum početka"
+msgstr "Početni datum"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,total_free:0
 msgid "Total Free"
-msgstr ""
+msgstr "Uk. slobodno"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.account,plan_tasks:0
@@ -340,16 +356,18 @@ msgid ""
 "This value is given by the sum of time allocation with the checkbox "
 "'Assigned in Taks' set to TRUE expressed in days."
 msgstr ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
 
 #. module: project_planning
 #: field:report_account_analytic.planning,stat_ids:0
 msgid "Planning analysis"
-msgstr "Analiza Planiranja"
+msgstr "Analiza planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_unit:0
 msgid "Qty UoM"
-msgstr "Količina JM"
+msgstr "Kol. u JM"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,note:0
@@ -360,7 +378,7 @@ msgstr "Bilješka"
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
@@ -371,12 +389,12 @@ msgstr "Planiranje po Kontu"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Pending"
-msgstr ""
+msgstr "Na čekanju"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,sum_amount:0
 msgid "Planned Days"
-msgstr ""
+msgstr "Planirani dani"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,state:0
@@ -389,6 +407,8 @@ msgid ""
 "This value is given by the total of validated leaves into the 'Date From' "
 "and 'Date To' of the planning."
 msgstr ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,user_id:0
@@ -401,7 +421,7 @@ msgstr "Korisnik"
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Remaining Tasks"
-msgstr ""
+msgstr "Total Remaining Tasks"
 
 #. module: project_planning
 #: model:ir.module.module,description:project_planning.module_meta_information
@@ -426,17 +446,17 @@ msgstr ""
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Organizacije"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount_in_base_uom:0
 msgid "Quantity in base uom"
-msgstr ""
+msgstr "Količina u osnovnoj JM"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,plan_tasks:0
 msgid "Time Planned on Tasks"
-msgstr ""
+msgstr "Vrijeme za planirane zadatke"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,amount:0
@@ -446,61 +466,61 @@ msgstr "Količina"
 #. module: project_planning
 #: field:report_account_analytic.planning,code:0
 msgid "Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: project_planning
 #: view:account.analytic.account:0
 #: field:report_account_analytic.planning,line_ids:0
 msgid "Planning lines"
-msgstr "Linija Planiranja"
+msgstr "Linija planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Planning By User (in Days)"
-msgstr ""
+msgstr "Planning By User (in Days)"
 
 #. module: project_planning
 #: view:report_account_analytic.planning.stat:0
 msgid "Planning statistics"
-msgstr "Statistike Planiranja"
+msgstr "Statistike planiranja"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 #: selection:report_account_analytic.planning,state:0
 msgid "Open"
-msgstr "Otvori"
+msgstr "Otvoreno"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
 #: view:report_account_analytic.planning:0
 msgid "Planning by User"
-msgstr ""
+msgstr "Planning by User"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,business_days:0
 msgid "Business Days"
-msgstr ""
+msgstr "Radni dani"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Ponovno Aktiviraj"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
@@ -510,52 +530,52 @@ msgstr "Odgovoran"
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
 msgid "Planning stat"
-msgstr "Stat Planiranja"
+msgstr "Stat planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_tasks:0
 msgid "Time Allocation of Tasks"
-msgstr ""
+msgstr "Time Allocation of Tasks"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Summary by user"
-msgstr "Sižetak prema Korisniku"
+msgstr "Sažetak prema Korisniku"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation without Tasks"
-msgstr ""
+msgstr "Total Time Allocation without Tasks"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.user,holiday:0
 msgid "Leaves"
-msgstr ""
+msgstr "Dopusti"
 
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation of Tasks"
-msgstr ""
+msgstr "Ukupno vrijeme alociranih zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning,date_to:0
 msgid "End Date"
-msgstr "Datum završetka"
+msgstr "Završni Datum"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Remaining tasks"
-msgstr ""
+msgstr "Remaining tasks"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Summary by project"
-msgstr "Sižetak po Projektu"
+msgstr "Sažetak po Projektu"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
 msgid "Responsible :"
-msgstr ""
+msgstr "Responsible :"
 
 #. module: project_planning
 #: report:report_account_analytic.planning.print:0
@@ -565,17 +585,17 @@ msgstr "]"
 #. module: project_planning
 #: field:res.company,planning_time_mode_id:0
 msgid "Planning Time Unit"
-msgstr ""
+msgstr "Vremenska jedinica planiranja"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.line,task_ids:0
 msgid "Planning Tasks"
-msgstr ""
+msgstr "Planiranje zadataka"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,manager_id:0
 msgid "Manager"
-msgstr "Upravitelj"
+msgstr "Voditelj"
 
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_tasks:0
@@ -583,3 +603,5 @@ msgid ""
 "This value is given by the sum of time allocation with task(s) linked, "
 "expressed in days."
 msgstr ""
+"Vrijednost dobivena zbrojem alociranih vremenskih zadataka iskazanih u "
+"danima."
diff --git a/addons/project_retro_planning/i18n/hr.po b/addons/project_retro_planning/i18n/hr.po
index 872dde535d7..a1eb983f064 100644
--- a/addons/project_retro_planning/i18n/hr.po
+++ b/addons/project_retro_planning/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-02 14:48+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:13+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 05:40+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: project_retro_planning
 #: model:ir.model,name:project_retro_planning.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_retro_planning
 #: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
@@ -35,13 +35,17 @@ msgid ""
 "          then the deadline date and start date for all the tasks will "
 "change accordingly  "
 msgstr ""
+"\n"
+"        - Ako se promjenio datum završetka projekta\n"
+"          tada će se promjeniti i kranji rok i datum početka za sve zadatke  "
 
 #. module: project_retro_planning
 #: 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_retro_planning
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index 55b351af97b..ed2d228c401 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-12-22 12:22+0000\n"
-"Last-Translator: Jožek Prikratki <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 11:28+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 05:29+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: project_timesheet
@@ -34,12 +34,12 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr ""
+msgstr "Zadatak ev. rada"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Prijava / Odjava po Projektu"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -49,17 +49,17 @@ msgstr "ID povezanog vremenskog tijeka"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Project Task Work"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: project_timesheet
 #: constraint:res.partner:0
@@ -69,28 +69,28 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic account/project"
-msgstr ""
+msgstr "Analitički konto/projekt"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Sati zadatka"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Error! project start-date must be lower then project end-date."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -100,7 +100,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:220
@@ -111,32 +111,32 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Račun zadatka"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Rad zadatka"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Greška! Rekurzivni zadaci."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:220
@@ -147,43 +147,43 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Task"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Fakturiraj radove"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Pogreška! Ne možete dodijeliti eskalacije na isti projekt!"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Dovršite evidenciju rada."
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -193,7 +193,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -210,47 +210,47 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Fakturiranje zadataka"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Sati evidencije rada"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Task encoding"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Task summary is comes into the timesheet line"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Fakturiraj"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Zadaci po korisniku"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:48
@@ -263,22 +263,22 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Podaci računa"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Encode how much time u spent on your task"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -288,7 +288,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Ev. rada/sati zadatka po mjesecima"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:43
@@ -302,43 +302,43 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Work on task"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mjesec-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Nakon izvršenja zadatka kreiraj račun."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Automatsko kreiranje računa iz stavki prodajnog naloga"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -348,7 +348,7 @@ msgstr "Vremenski plan projekta"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Fakturiraj rad na zadatku"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -364,12 +364,12 @@ msgstr ""
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Sati zadatka po mjesecima"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Popuni ev. rada"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -377,3 +377,6 @@ msgid ""
 "This lists show you every task work you can invoice to the customer. Select "
 "the lines in order to generate the invoices automatically."
 msgstr ""
+
+#~ msgid "My Timesheet"
+#~ msgstr "Moje evidencija rada"
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index b1d2cf956ae..601e427eda4 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -7,14 +7,14 @@ 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:15+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-12-12 11:24+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:56+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -22,6 +22,8 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
+"becomes a confirmed Purchase Order."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:292
@@ -53,7 +55,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr "Datum izrade dokumenta"
+msgstr "Datum  kreiranja ovog dokumenta"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_rfq
@@ -67,6 +69,12 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"Zahtjev za ponudom možete kreirati i prije nego što je nalog za nabavu "
+"potvrđen.\n"
+"Ovdje će se naći i zahtjevi za ponudom koje program automatski kreira "
+"temeljem postavke logističkih pravila (minimalne količine, JIT, ...). "
+"Zahtjev za ponudom možete pretvoriti u Nalog za nabavu. Postave na nalogu za "
+"nabavu kontroliraju kreiranje ulaznog računa temeljem naloga ili primki."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -81,13 +89,13 @@ msgstr "Nefakturirano"
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr "Adresa odredišta"
+msgstr "Adresa isporuke"
 
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.report,validator:0
 msgid "Validated By"
-msgstr ""
+msgstr "Potvrđeno od strane"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -96,12 +104,12 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,partner_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices ?"
-msgstr ""
+msgstr "Želite li kreirati ulazni račun?"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -110,6 +118,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Nalozi za nabavu po brojevima, dobavljačima, proizvodima, .... \n"
+"Za svaki nalog nabave možete pratiti primljene proizvode i kontrolirati "
+"izradu ulaznih računa."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -132,7 +143,7 @@ msgstr ""
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
 #: model:process.transition,name:purchase.process_transition_productrecept0
 msgid "From a Pick list"
-msgstr ""
+msgstr "Sa popisa odabira"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:660
@@ -145,12 +156,12 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr ""
+msgstr "Odaberite otvoreni prodajni nalog"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -158,35 +169,35 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,company_id:0
 msgid "Company"
-msgstr "Tvrtka"
+msgstr "Organizacija"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
 #: view:purchase.report:0
 msgid "Monthly Purchase by Category"
-msgstr ""
+msgstr "Mjesečne nabave po grupama"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Set to Draft"
-msgstr "Postavi kao nacrt"
+msgstr "Postavi na nacrt"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Iznimka računa"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "Uobičajeni cjenik nabave"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_current_purchases
 msgid "Current purchases"
-msgstr ""
+msgstr "Aktualne nabave"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -195,6 +206,9 @@ msgid ""
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
 msgstr ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -202,11 +216,13 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"Za ovog partnera ovdje možete navesti specifičan cjenik za nabavu ako se ne "
+"primjenjuje uobičajeni cjenik."
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -214,6 +230,8 @@ msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 msgstr ""
+"Cjenik određuje valutu za ovu narudžbu. Ujedno računa i cijenu dobavljača za "
+"odabrane proizvode/količine."
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
@@ -229,7 +247,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "Odobri nabavu"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
@@ -237,27 +255,27 @@ msgstr ""
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Odobreno"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "Referentna JM"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr ""
+msgstr "Izvor"
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "Referentna JM"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
 msgid "Purchases"
-msgstr ""
+msgstr "Nabava"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -265,7 +283,7 @@ msgstr ""
 #: view:purchase.order.line:0
 #: field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:660
@@ -278,7 +296,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -286,7 +304,7 @@ msgstr ""
 #: view:purchase.order.line:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -297,19 +315,19 @@ msgstr ""
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Nalog za nabavu"
 
 #. module: purchase
 #: field:purchase.order,name:0
 #: view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Broj naloga"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Total :"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -320,7 +338,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 msgid "Products"
-msgstr ""
+msgstr "Proizvodi"
 
 #. module: purchase
 #: field:purchase.installer,progress:0
@@ -333,13 +351,15 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"Primka generira ulazni račun. Ovisno o kontroli računa na Nalogu nabave, "
+"račun se kreira na temelju primljenih ili naručenih količina."
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazani"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:315
@@ -350,40 +370,40 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr ""
+msgstr "U nalog za nabavu"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0
 #: field:purchase.report,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Pricelist"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Shipping Exception"
 
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Stavke računa"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0
 #: model:process.node,name:purchase.process_node_productrecept0
 msgid "Incoming Products"
-msgstr ""
+msgstr "Ulaz proizvoda"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Proizvodi za isporuku"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr ""
+msgstr "Ručno ispravljeno"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -393,7 +413,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Vezna oznaka"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:244
@@ -404,18 +424,18 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Ime kontakta na odredištu"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:344
@@ -426,13 +446,13 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analitike"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# linija"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:696
@@ -455,22 +475,22 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.order.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Nacrt"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Net Price"
-msgstr ""
+msgstr "Net Cijena"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Order Line"
-msgstr ""
+msgstr "Stavka naloga"
 
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr ""
+msgstr "Označava da je izvršen prijem proizvoda"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:721
@@ -482,18 +502,18 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 #: selection:purchase.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna cijena"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
@@ -505,22 +525,22 @@ msgstr "Potvrdi"
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
 #: view:purchase.order:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "Kontrola računa"
 
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne organizacije."
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
 msgid "Supplier Reference"
-msgstr ""
+msgstr "Oznaka dobavljača"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -529,6 +549,8 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"Primka može kreirati ulazni račun. Ovisno o kontroli računa na Nalogu "
+"nabave, račun se izrađuje na temelju primljenih ili naručenih količina."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -537,7 +559,7 @@ msgstr ""
 #: field:purchase.order.line,state:0
 #: view:purchase.report:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -545,32 +567,34 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Reception Analysis allows you to easily check and analyse your company order "
+"receptions and the performance of your supplier's deliveries."
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Tel.:"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr ""
+msgstr "Skladišni dokument"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Print"
-msgstr ""
+msgstr "Ispis"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr ""
+msgstr "Spoji naloge za nabavu"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Order Lines"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:662
@@ -581,29 +605,29 @@ msgstr ""
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Fax:"
-msgstr ""
+msgstr "Fax:"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Total Price"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Iznos bez poreza"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr ""
+msgstr "Cjenici"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
 msgid "Address Contact Name"
-msgstr ""
+msgstr "Address Contact Name"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -619,7 +643,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Kreirani računi za nalog nabave"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:292
@@ -633,17 +657,17 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Opći podaci"
 
 #. module: purchase
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja ploča"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "Potvrda naloga za nabavu br."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -652,6 +676,9 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Purchase Analysis allows you to easily check and analyse your company "
+"purchase history and performance. From this menu you can track your "
+"negotiation performance, the delivery performance of your suppliers, etc."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -665,6 +692,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Prema polju \"Kontrola računa\" račun će se generirati automatski ako je "
+"\"Kontrola računa\" postavljena na \"Iz primki\" .Račun se može i ručno "
+"upisati ako je \"Kontrola računa\" postavljena na \"Ručno\"."
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -674,12 +704,12 @@ msgstr ""
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "Reservation Destination"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:244
@@ -692,40 +722,40 @@ msgstr ""
 #: selection:purchase.order.line,state:0
 #: selection:purchase.report,state:0
 msgid "Done"
-msgstr ""
+msgstr "Izvršeno"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Postava"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_by_supplier
 #: view:purchase.report:0
 msgid "Purchase by supplier"
-msgstr ""
+msgstr "Nabave po dobavljaču"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr ""
+msgstr "Primke"
 
 #. module: purchase
 #: field:purchase.order,validator:0
 #: view:purchase.report:0
 msgid "Validated by"
-msgstr ""
+msgstr "Potvrdio"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -735,12 +765,16 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Ovdje kontrolirate ulazne račune koje očekujete od dobavljača. OpenERP "
+"automatski kreira nacrte ulaznih računa iz naloga za nabavu i/ili primki. "
+"Kada primite originalni ulazni račun od dobavljača usporedite ga s nacrtom i "
+"potvrdite ga."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr ""
+msgstr "ZZP (RFQ)"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
@@ -781,22 +815,22 @@ msgstr ""
 #: field:purchase.order.line,date_order:0
 #: field:purchase.report,date:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum naloga"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr ""
+msgstr "Proizvodi koji dolaze na ulaznu kontrolu"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
 msgid "Approbation"
-msgstr ""
+msgstr "Approbation"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr ""
+msgstr "Statistika naloga za nabavu"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -811,7 +845,7 @@ msgstr ""
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
 #: model:process.node,name:purchase.process_node_invoicecontrol0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Nacrt računa"
 
 #. module: purchase
 #: help:purchase.installer,purchase_analytic_plans:0
@@ -824,11 +858,13 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: purchase
 #: field:purchase.installer,purchase_requisition:0
@@ -838,101 +874,101 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Kategorije jedinica mjere"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
 msgid "Days to Deliver"
-msgstr ""
+msgstr "Dana za isporuku"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "Prihvat proizvoda"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Procurement"
 
 #. module: purchase
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Računi"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr ""
+msgstr "Potvrđeni nalozi nabave u račun"
 
 #. module: purchase
 #: field:purchase.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "Ukupan broj redaka naloga korisnika po mjesecu."
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mjesec"
 
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "Waiting Supplier Ack"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "Nalozi za nabavu koje čekaju potvrdu"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total Untaxed amount"
-msgstr ""
+msgstr "Uk. osnovica"
 
 #. module: purchase
 #: field:purchase.order,shipped:0
 #: field:purchase.order,shipped_rate:0
 msgid "Received"
-msgstr ""
+msgstr "Received"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinglist0
 msgid "List of ordered products."
-msgstr ""
+msgstr "List of ordered products."
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0
 msgid ""
 "This is the list of picking list that have been generated for this purchase"
-msgstr ""
+msgstr "Ovo je popis primki nastalih ovom nabavom"
 
 #. module: purchase
 #: model:ir.module.module,shortdesc:purchase.module_meta_information
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
 msgid "Purchase Management"
-msgstr ""
+msgstr "Upravljanje nabavom"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
 #: model:process.node,note:purchase.process_node_invoicecontrol0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Potrebna revizija knjigovođe."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
@@ -949,25 +985,25 @@ msgstr ""
 #. module: purchase
 #: report:purchase.order:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Taxes :"
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0
 #: field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturirano"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Grupa"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
 #: model:process.node,note:purchase.process_node_confirmpurchaseorder0
 msgid "State of the Purchase Order."
-msgstr ""
+msgstr "Stanje naloga za nabavu"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -977,19 +1013,19 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Stanje naloga"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
 msgid "Create invoices"
-msgstr ""
+msgstr "Kreiraj račune"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: view:purchase.order.line:0
 #: field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Stavka naloga nabave"
 
 #. module: purchase
 #: constraint:res.partner:0
@@ -999,28 +1035,28 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Calendar View"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr ""
+msgstr "Spajanje naloga za nabavu"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "Regards,"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_negotiation_by_supplier
 #: view:purchase.report:0
 msgid "Negotiation by Supplier"
-msgstr ""
+msgstr "Negotiation by Supplier"
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Svojstva nabave"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1029,21 +1065,23 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"Nalog za nabavu kreira ulazni račun u trenutku potvrde. Račun nastaje "
+"temeljem naloga ili primki ovisno o \"Kontrola računa\" na nalogu."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Osnovica"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Označava da je račun plaćen"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_packinginvoice0
 msgid "Outgoing products to invoice"
-msgstr ""
+msgstr "Nefakturirani izlaz"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -1054,37 +1092,37 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
 #: view:purchase.report:0
 msgid "Qty. per product"
-msgstr ""
+msgstr "Kol. po proizvodu"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
 msgid "Date on which this document has been created."
-msgstr ""
+msgstr "Datum kreiranja ovog dokumenta."
 
 #. module: purchase
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Prodaja i nabava"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Manual Invoices"
-msgstr ""
+msgstr "Ručni računi"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:318
@@ -1096,12 +1134,12 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filtri..."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:362
@@ -1125,22 +1163,22 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
 msgid "Pick list generated"
-msgstr ""
+msgstr "Pick list generated"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Exception"
-msgstr ""
+msgstr "Exception"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Compute"
-msgstr ""
+msgstr "Izračunaj"
 
 #. module: purchase
 #: model:ir.module.module,description:purchase.module_meta_information
@@ -1168,38 +1206,38 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Organizacije"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "Otkaži nalog za nabavu"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "A pick list is generated to track the incoming products."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Kokpit"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Products Value"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
@@ -1210,34 +1248,34 @@ msgstr ""
 #: view:purchase.order:0
 #: view:purchase.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_po_per_month_tree
 #: view:purchase.report:0
 msgid "Purchase order per month"
-msgstr ""
+msgstr "Nalozi nabave po mjesecima"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr ""
+msgstr "Proizvodi po kategorijama"
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Dana do potvrde"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr ""
+msgstr "Izvorni dokument koji je generirao ovaj zahtjev za nabavu."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1249,33 +1287,40 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"Stanje naloga za nabavu ili zahtjeva za ponudom. Ponuda je nalog za nabavu u "
+"stanju 'Nacrt'. Nalog zatim treba uskladiti s ponudom dobavljača i "
+"potvrditi. Potvrda naloga je prihvaćanje ponude dobavljača, odnosno slanje "
+"narudžbenice dobavljaču. Nakon toga dobavljač potvrđuje narudžbenicu i nalog "
+"prelazi u stanje 'Odobren'. Kad je nalog za nabavu plaćen i zaprimljen, "
+"stanje postaje 'Izvršen'. Ako se dogodi otkazivanje tijekom izrade računa "
+"ili kod zaprimanja robe stanje postaje 'Iznimka'."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Podzbroj"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_rfq
 #: model:ir.ui.menu,name:purchase.menu_purchase_rfq
 msgid "Requests for Quotation"
-msgstr ""
+msgstr "Zahtjevi za ponudom"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Datum potvrde naloga za nabavu (narudžbenice)."
 
 #. module: purchase
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "Waiting"
 
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr ""
+msgstr "Verzija uobičajenog cjenika nabave"
 
 #. module: purchase
 #: view:purchase.installer:0
@@ -1292,23 +1337,23 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Fiskalna pozicija"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Request for Quotation N°"
-msgstr ""
+msgstr "Zahtjev za ponudom br."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1323,12 +1368,12 @@ msgstr "Odustani"
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr ""
+msgstr "Stavke naloga za nabavu"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Dobavljač odobrava narudžbenicu."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
@@ -1336,86 +1381,86 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
 #: view:purchase.report:0
 msgid "Purchase Orders"
-msgstr ""
+msgstr "Nalozi za nabavu"
 
 #. module: purchase
 #: field:purchase.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Merge orders"
-msgstr ""
+msgstr "Spoji naloge"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "Kreiraj račun iz stavki naloga za nabavu"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Primke"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "Ukupno naloga po korisniku i mjesecu"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
 #: selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Request for Quotation"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tél. :"
-msgstr ""
+msgstr "Tél. :"
 
 #. module: purchase
 #: field:purchase.order,create_uid:0
 #: view:purchase.report:0
 #: field:purchase.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Odgovoran"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Our Order Reference"
-msgstr ""
+msgstr "Naša oznaka naloga"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "Traži naloge za nabavu"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
 #: view:purchase.report:0
 #: field:purchase.report,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Skladište"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
 #: model:process.node,note:purchase.process_node_draftpurchaseorder1
 msgid "Request for Quotations."
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Date Req."
-msgstr ""
+msgstr "Datum Zah."
 
 #. module: purchase
 #: field:purchase.order,date_approve:0
 #: field:purchase.report,date_approve:0
 msgid "Date Approved"
-msgstr ""
+msgstr "Datum odobrenja"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:417
@@ -1427,17 +1472,17 @@ msgstr ""
 #: report:purchase.order:0
 #: field:purchase.order.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery & Invoicing"
-msgstr ""
+msgstr "Dostava i fakturiranje"
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planirani datum"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
@@ -1447,41 +1492,41 @@ msgstr ""
 #: view:purchase.report:0
 #: field:purchase.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmation"
 
 #. module: purchase
 #: report:purchase.order:0
 #: field:purchase.order.line,name:0
 #: report:purchase.quotation:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "Ovo je vodeće/rezervno vrijeme za svaki nabavni nalog."
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr ""
+msgstr "Expected Delivery address:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
 #: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
 msgid "Receptions Analysis"
-msgstr ""
+msgstr "Analiza primki"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "Iznos osnovice."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
@@ -1490,44 +1535,47 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Access your supplier records and maintain a good relationship with your "
+"suppliers. You can track all your interactions with them through the History "
+"tab: emails, orders, meetings, etc."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "Dostava"
 
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.purchase_draft
 msgid "Request for Quotations"
-msgstr ""
+msgstr "Zahtjev za ponudom"
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "JM proizvoda"
 
 #. module: purchase
 #: report:purchase.order:0
 #: report:purchase.quotation:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: purchase
 #: field:purchase.order,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #. module: purchase
 #: field:purchase.order.line,move_ids:0
 msgid "Reservation"
-msgstr ""
+msgstr "Reservation"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Uk. količina i iznos po mjesecima"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:409
@@ -1541,27 +1589,29 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
+"In case there is no supplier for this product, the buyer can fill the form "
+"manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
 msgid "Purchase Analysis"
-msgstr ""
+msgstr "Analiza nabave"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Your Order Reference"
-msgstr ""
+msgstr "Referenca naloga"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1569,18 +1619,18 @@ msgstr ""
 #: report:purchase.quotation:0
 #: field:purchase.report,expected_date:0
 msgid "Expected Date"
-msgstr ""
+msgstr "Očekivani datum"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_total_price_by_product_by_state
 #: view:purchase.report:0
 msgid "Total price by product by state"
-msgstr ""
+msgstr "Ukupna cijena po proizvodu po stanju"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr ""
+msgstr "TVA:"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1591,22 +1641,22 @@ msgstr ""
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Shipping address :"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Control"
-msgstr ""
+msgstr "Kontrola nabave"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -1623,43 +1673,53 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Pravila: \n"
+" \n"
+" Nalozi za nabavu će biti spojeni samo ako su: \n"
+" * u stanju 'Nacrt' \n"
+" * pripadaju istom dobavljaču \n"
+" * imaju iste sladišne lokacije i cjenike nabave \n"
+" \n"
+" Linije se spajaju samo ako su identične u svemu osim količine i jedinice "
+"mjere: \n"
+" "
 
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "Uobičajena nabavna cijena"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr ""
+msgstr "Purchase Pricelist"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr ""
+msgstr "Kontrola računa"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
 msgid "Approve"
-msgstr ""
+msgstr "Odobri"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Za odobriti"
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1672,6 +1732,13 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * The 'Draft' state is set automatically when purchase order in draft "
+"state.                                        \n"
+"* The 'Confirmed' state is set automatically as confirm when purchase order "
+"in confirm state.                                        \n"
+"* The 'Done' state is set automatically when purchase order is set as done.  "
+"                                      \n"
+"* The 'Cancelled' state is set automatically when user cancel purchase order."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:424
@@ -1682,54 +1749,54 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Verzije cjenika"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
 msgid "Addresses"
-msgstr ""
+msgstr "Adrese"
 
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders ?"
-msgstr ""
+msgstr "Are you sure you want to merge these orders ?"
 
 #. module: purchase
 #: view:purchase.order:0
 #: view:purchase.order.line:0
 #: view:purchase.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "Iz naloga za nabavu"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "TVA :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: purchase
 #: help:purchase.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Ukupan iznos"
 
 #. module: purchase
 #: selection:purchase.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr ""
+msgstr "Vodeće vrijeme nabave"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -1738,17 +1805,20 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Ako je 'Fakturiranje' na nalogu postavljeno na 'Temeljem naloga', račun će "
+"se automatski generirati. Račun može izraditi i knjigovođa upisom računa i "
+"stavki kada je 'Fakturiranje' postavljeno na 'Ručno'."
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase"
-msgstr ""
+msgstr "Nabava"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_partner
 #: field:purchase.order.line,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:662
@@ -1771,18 +1841,18 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Skladišni prijenosi"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Jedinice mjere"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Orders"
-msgstr ""
+msgstr "Orders"
 
 #. module: purchase
 #: help:purchase.order,name:0
@@ -1790,9 +1860,11 @@ msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
 msgstr ""
+"jedinstveni broj naloga za prodaju, automatski postavljen u trenutku "
+"kreiranja"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.open_board_purchase
 #: model:ir.ui.menu,name:purchase.menu_board_purchase
 msgid "Purchase Dashboard"
-msgstr ""
+msgstr "Kokpit nabave"
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index a67c675b089..4a8ac571703 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="1">
 
     <record id="group_purchase_user" model="res.groups">
-        <field name="name">Purchases / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_purchase_management"/>
     </record>
     <record id="group_purchase_manager" model="res.groups">
-        <field name="name">Purchases / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_purchase_management"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
     </record>
 
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index f03e787479e..f6ef8e51123 100644
--- a/addons/purchase_analytic_plans/i18n/hr.po
+++ b/addons/purchase_analytic_plans/i18n/hr.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-08-03 09:36+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 08:01+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:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Stavka nabavnog naloga"
 
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -34,12 +34,12 @@ msgstr "Analitička raspodjela"
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Nalog za nabavu"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr "Upravljanje analitičkom raspodjelom kupnji"
+msgstr "Upravljanje analitičkom raspodjelom u nabavi"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
@@ -48,6 +48,10 @@ msgid ""
 "    The base module to manage analytic distribution and purchase orders.\n"
 "    "
 msgstr ""
+"\n"
+"    Osnovni modul za upravljanje analitičkom raspodjelom i nabavnim "
+"nalozima.\n"
+"    "
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za Arhitekturu Prikaza!"
diff --git a/addons/purchase_double_validation/i18n/hr.po b/addons/purchase_double_validation/i18n/hr.po
new file mode 100644
index 00000000000..42309561093
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/hr.po
@@ -0,0 +1,88 @@
+# 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 07:16+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: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr "Konfiguracija nabavne aplikacije"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+"Definiraj minimalni iznos nakon nakon kojeg je potrebno potvrditi nabavu."
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr "purchase_double_validation"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid ""
+"\n"
+"\tThis module modifies the purchase workflow in order to validate purchases "
+"that exceeds minimum amount set by configuration wizard\n"
+"    "
+msgstr ""
+"\n"
+"\tOvaj modul mijenja dijagram tijeka nabave kako bi potvrdio nabave koje "
+"prelaze minimalni iznos postavljen u asistentu za konfiguraciju\n"
+"    "
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr "Konfiguriraj granični iznos za nabavu"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr "Maksimalni iznos nakon kojeg je obavezna potvrda nabave."
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr "purchase.double.validation.installer"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr "Maksimalni iznos nabave"
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index af8a1330e2d..71c54b973e3 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -2,12 +2,20 @@
 <openerp>
 <data noupdate="1">
 
+    <record model="ir.module.category" id="module_category_purchase_requisition">
+        <field name="name">Purchase Requisition</field>
+        <field name="parent_id" ref="base.module_category_purchase_management"/>
+        <field name="sequence">9</field>
+    </record>
+
     <record id="group_purchase_requisition_user" model="res.groups">
-        <field name="name">Purchase Requisition / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_purchase_requisition"/>
     </record>
 
     <record id="group_purchase_requisition_manager" model="res.groups">
-        <field name="name">Purchase Requisition / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_purchase_requisition"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/>
     </record>
     
diff --git a/addons/report_designer/i18n/hr.po b/addons/report_designer/i18n/hr.po
new file mode 100644
index 00000000000..1f88aa3288c
--- /dev/null
+++ b/addons/report_designer/i18n/hr.po
@@ -0,0 +1,107 @@
+# 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 07:38+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: report_designer
+#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
+#: view:report_designer.installer:0
+msgid "Reporting Tools Configuration"
+msgstr "Konfiguracija alata za izvještavanje"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "Kreiranje upita"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure"
+msgstr "Postavke"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "naziv"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr "report_designer.installer"
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "Dizajner OpenOffice izvještaja"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr "Alati za izvještavanje"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid ""
+"OpenERP's built-in reporting abilities can be improved even further with "
+"some of the following applications"
+msgstr ""
+"OpenERP ugrađene mogućnosti mogu se dodatno nadograditi sa sljedećim "
+"aplikacijama"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure Reporting Tools"
+msgstr "Konfiguriraj alate za izvještavanje"
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_creator:0
+msgid ""
+"Allows you to create any statistic reports  on several objects. It's a SQL "
+"query builder and browser for end users."
+msgstr ""
+"Dozvoljava vam kreiranje statističkih izvješća na nekoliko objekata. Radi se "
+"o SQL kreatoru upita i pregledniku za kranje korisnike."
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_designer:0
+msgid ""
+"Adds wizards to Import/Export .SXW report which you can modify in "
+"OpenOffice.Once you have modified it you can upload the report using the "
+"same wizard."
+msgstr ""
+"Dodaje asistenta za uvoz/izvoz .SXW izvještaja koje možete mijenjati u "
+"OpenOfficeu. Kada ga promjenite možete uploadati izvještaj koristeći isti "
+"asistent."
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+"Instaler za odabir alata za izvještanje.\n"
+"    "
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Napredak konfiguracije"
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index b7a228acf6a..ae8c8bf62e3 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index 9ad402a8321..8b12b395e48 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -7,48 +7,48 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:21+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 07:09+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 05:04+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
 msgid "Customer"
-msgstr "Stranka"
+msgstr "Kupac"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Pretvori u ponudu"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "Prilika '%s' je pretvorena u ponudu."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Nedovoljno podataka!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Kupac nema definiranu adresu"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "Napravi prodaju"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -66,81 +66,93 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul pruža prečicu na jednu ili više prilika u CRM-u.\n"
+"Prečica omogućava generiranje prodajnih naloga na osnovi izabranog slučaja.\n"
+"Ako si izabrani različiti slučajevi (lista), generira jedan prodajni nalog "
+"po \n"
+"slučaju.\n"
+"Slučaj je tada zatvoren i povezan sa generiranim prodajnim nalogom.\n"
+"\n"
+"Sugeriramo instalaciju ovo modula ako ste instalirali i prodajni i CRM "
+"modul.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr ""
+msgstr "_Kreiraj"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
+"Označi ovo da bi se prilika zatvorila nakon kreiranja prodajnog naloga."
 
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Convert to Quote"
-msgstr "Pretvori u Ponudu"
+msgstr "Pretvori u ponudu"
 
 #. module: sale_crm
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Mjesečni obrtaj"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Pretvoreno u prodajnu ponudu (id: %s)."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Prilika: %s"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Kreira prodajnu ponudu iz prilike"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr "Shop"
+msgstr "Trgovina"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Prilike po fazama"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Moje ponude"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Zatvori priliku"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Prodajni tim"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -155,7 +167,7 @@ msgstr "Otkaži"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #~ msgid "Opportunity Analytic"
 #~ msgstr "Analitika prilike"
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index cca79e1562a..53083681d93 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:04+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-12-12 07:53+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <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: 2011-11-05 05:22+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:01+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: sale_journal
@@ -25,22 +25,22 @@ msgstr "Bilješka"
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and picking."
-msgstr ""
+msgstr "Vrsta temeljnice korištene za prodaju i prijenos"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Oznaka naloga mora biti jedinstvena"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Prodaje i Kupnje"
+msgstr "Prodaja i nabava"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -48,6 +48,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
 msgstr ""
+"Ako je aktivno polje postavljeno na NE, možete sakriti vrstu računa bez da "
+"ga uklonite."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
@@ -57,7 +59,7 @@ msgstr "Bilješke"
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr "Način Izrade Računa"
+msgstr "Način izrade računa"
 
 #. module: sale_journal
 #: model:ir.module.module,description:sale_journal.module_meta_information
@@ -86,11 +88,35 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul temeljnice u prodaji omogućuje vam kategorizaciju\n"
+"     prodaje i dostava (lista prijenosa) između različitih temeljnica.\n"
+"     Ovaj modul je od pomoći većim organizacijama koje rade po \n"
+"     odjelima.    \n"
+"\n"
+"    Temeljnicu možete koristiti za različite namjene, npr.:\n"
+"    * za izoliranje prodaje različitih odjela\n"
+"    * temljnice za dostavu kamionom ili poštom\n"
+"\n"
+"    Temeljnice imaju odgovornu osobu i različite statuse:\n"
+"    * nacrt, otvoreno, otkazano, završeno.\n"
+"\n"
+"    Grupne operacije se mogu odvijati na različitim temeljnicama\n"
+"    kako bi potvrdili sve prodaje odjednom, potvrdili ili fakturirali "
+"otpremu, ....\n"
+"\n"
+"    Također podržava skupno fakturiranje koje se može konfigurirati po \n"
+"    partnerima ili prodajnim nalozima, npr.:\n"
+"    * dnevno fakturiranje,\n"
+"    * mjesečno fakturiranje, ...\n"
+"\n"
+"    Postoje i neke statistike po temeljnicama.\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Non grouped"
-msgstr "Nije grupirano"
+msgstr ""
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
@@ -100,7 +126,7 @@ msgstr "Grupirano"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivne pridružene članove."
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
@@ -109,16 +135,19 @@ msgid ""
 "can create a specific invoicing journal to group your invoicing according to "
 "your customer's needs: daily, each Wednesday, monthly, etc."
 msgstr ""
+"Vrste računa koriste se za partnere, prodajne naloge i dostavnice. Možete "
+"kreirati posebnu temeljnicu za fakturiranje kako bi grupirali fakturiranje "
+"sukladno potrebama kupca: dnevno, svake srijede, mjesečno, itd."
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 msgid "Invoicing method"
-msgstr "Način Izrade Računa"
+msgstr "Način fakturiranja"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -126,7 +155,7 @@ msgstr ""
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr "Tip Računa"
+msgstr "Vrsta računa"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
@@ -136,14 +165,14 @@ msgstr "Aktivan"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoice Types"
-msgstr "Tipovi Računa"
+msgstr "Vrste računa"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
@@ -153,7 +182,7 @@ msgstr ""
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr "Upravljanje prodajom i narudžbama prema Pregledu"
+msgstr "Upravljanje prodajom i dostavama po temeljnicama"
 
 #~ msgid "Assigned packing"
 #~ msgstr "Dodijeljeno pakiranje"
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 7d4443a3cce..4900834f7b0 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -39,7 +39,6 @@ It adds sales name and sales Reference on production order.
     'depends': ['mrp', 'sale'],
     'init_xml': [],
     'update_xml': [
-        'security/sale_mrp_security.xml',
         'security/ir.model.access.csv',
         'sale_mrp_view.xml',
     ],
diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml
deleted file mode 100644
index c0139329d1e..00000000000
--- a/addons/sale_mrp/security/sale_mrp_security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-	<record id="base.group_sale_manager" model="res.groups">
-	        <field name="name">Sales / Manager</field>
-	    </record>
-    
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index f7a81a24948..0462f1339d0 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -26,7 +26,13 @@ class res_groups(osv.osv):
     _columns = {
         'share': fields.boolean('Share Group', readonly=True,
                     help="Group created to set access rights for sharing data with some users.")
-     }
+    }
+
+    def __init__(self, pool, cr):
+        super(res_groups, self).__init__(pool, cr)
+        # add domain in get_groups_by_application()
+        self.groups_by_application_domain.append(('share', '=', False))
+
 res_groups()
 
 class res_users(osv.osv):
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index b03a090c809..3b74fbb4dbc 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -21,18 +21,6 @@
             <field name="name">Users</field>
             <field name="context">{'search_default_no_share': 1}</field>
         </record>
-        <record id="view_users_form_share" model="ir.ui.view">
-            <field name="name">res.users.form</field>
-            <field name="model">res.users</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page//field[@name='groups_id']" position="attributes">
-                    <attribute name="context">{'search_default_no_share':1}</attribute>
-                </xpath>
-            </field>
-        </record>
-
 
         <record model="ir.ui.view" id="res_groups_search_sharing">
             <field name="name">res.groups.search.share</field>
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index a5405dbcb48..1e92ac44a53 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="ir.module.category" id="module_category_share">
+            <field name="name">Sharing</field>
+            <field name="parent_id" ref="base.module_category_tools"/>
+            <field name="sequence">26</field>
+        </record>
+
         <record id="group_share_user" model="res.groups">
-            <field name="name">Sharing / User</field>
+            <field name="name">User</field>
             <field name="comment">
 Members of this groups have access to the sharing wizard, which allows them to invite external users to view or edit some of their documents.</field>
+            <field name="category_id" ref="module_category_share"/>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 389d62e8ce0..f83a5d362ab 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record id="group_stock_user" model="res.groups">
-        <field name="name">Warehouse / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_warehouse_management"/>
     </record>
     <record id="group_stock_manager" model="res.groups">
-        <field name="name">Warehouse / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_warehouse_management"/>
         <field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
     </record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index aeb809330e7..b489b8dd16e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1616,8 +1616,8 @@
                     <group colspan="2" col="2">
                         <separator colspan="2" string="Move Information"/>
                         <field name="name" string="Reason"/>
-                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4"/>
-                        <field name="product_uos" groups="product.group_uos" colspan="4"/>
+                        <field name="product_uos_qty" groups="product.group_uos"  on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)"/>
+                        <field name="product_uos" groups="product.group_uos"/>
                     </group>
 
                     <group colspan="2" col="2">
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>
 
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 7b6c43ed2bc..c44a35e3ee9 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -2,10 +2,12 @@
 <openerp>
     <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>
         <record model="res.groups" id="base.group_survey_user">
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 98a8c03c177..16bd30c151f 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -2,14 +2,9 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
     
 </data>