From 5ea774f883f1ac71ca98906a5ec5811b7e55e132 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Oct 2011 16:33:39 +0200
Subject: [PATCH 001/119] [IMP] use authenticate() method to log the user in

bzr revid: chs@openerp.com-20111013143339-dtasfi7kvvn7wusq
---
 addons/web/common/openerplib/main.py |  3 ++-
 addons/web/common/session.py         |  5 +++--
 addons/web/controllers/main.py       | 10 ++++++----
 addons/web/static/src/js/chrome.js   |  2 +-
 addons/web/static/src/js/core.js     |  7 ++++---
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py
index 217cb221cd9..052c8243271 100644
--- a/addons/web/common/openerplib/main.py
+++ b/addons/web/common/openerplib/main.py
@@ -351,7 +351,8 @@ class Connection(object):
         
         if not self.database or not self.login or self.password is None:
             raise AuthenticationError("Creditentials not provided")
-        
+
+        # TODO use authenticate instead of login
         self.user_id = self.get_service("common").login(self.database, self.login, self.password)
         if not self.user_id:
             raise AuthenticationError("Authentication failure")
diff --git a/addons/web/common/session.py b/addons/web/common/session.py
index ef38fc6a154..3b1dc9d3ca9 100644
--- a/addons/web/common/session.py
+++ b/addons/web/common/session.py
@@ -58,8 +58,9 @@ class OpenERPSession(object):
         self._login = login
         self._password = password
 
-    def login(self, db, login, password, env):
-        uid = self.proxy('common').login_env(db, login, password, 'web', env)
+    def authenticate(self, db, login, password, env):
+        # TODO use the lib once it use authenticate
+        uid = self.proxy('common').authenticate(db, login, password, env)
         self.bind(db, uid, login, password)
         
         if uid: self.get_context()
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2432edc71ea..c4cde50e06f 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -265,14 +265,16 @@ class Session(openerpweb.Controller):
     _cp_path = "/web/session"
 
     @openerpweb.jsonrequest
-    def login(self, req, db, login, password):
+    def authenticate(self, req, db, login, password, base_location=None):
         wsgienv = req.httprequest.environ
+        release = web.common.release
         env = dict(
-            host='%s://%s' % (wsgienv['wsgi.url_scheme'], wsgienv['HTTP_HOST']),
-            referrer=wsgienv.get('HTTP_REFERER'),
+            base_location=base_location,
+            HTTP_HOST=wsgienv['HTTP_HOST'],
             REMOTE_ADDR=wsgienv['REMOTE_ADDR'],
+            user_agent="%s / %s" % (release.name, release.version),
         )
-        req.session.login(db, login, password, env)
+        req.session.authenticate(db, login, password, env)
         ctx = req.session.get_context() if req.session._uid else {}
 
         return {
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1742bd91c95..8a0c1a93ecc 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -543,7 +543,7 @@ openerp.web.Login =  openerp.web.Widget.extend(/** @lends openerp.web.Login# */{
      */
     do_login: function (db, login, password) {
         var self = this;
-        this.session.session_login(db, login, password, function() {
+        this.session.session_authenticate(db, login, password, function() {
             if(self.session.session_is_valid()) {
                 if (self.has_local_storage) {
                     if(self.remember_creditentials) {
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index da9c21bf551..0279102feeb 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -477,10 +477,11 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
     session_is_valid: function() {
         return this.uid;
     },
-    session_login: function(db, login, password, success_callback) {
+    session_authenticate: function(db, login, password, success_callback) {
         var self = this;
-        var params = { db: db, login: login, password: password };
-        return this.rpc("/web/session/login", params, function(result) {
+        var base_location = document.location.protocol + '//' + document.location.host;
+        var params = { db: db, login: login, password: password, base_location: base_location };
+        return this.rpc("/web/session/authenticate", params, function(result) {
             self.session_id = result.session_id;
             self.uid = result.uid;
             self.user_context = result.context;

From 216d028ad66c59bec3018cff954d9b49ba264920 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Tue, 8 Nov 2011 19:00:12 +0530
Subject: [PATCH 002/119] [IMP] crm_profiling: Converted Open Questionnaire
 wizard to osv_memory wizard.

bzr revid: uco@tinyerp.com-20111108133012-wjqhjrif02h18oxh
---
 addons/crm_profiling/__openerp__.py           |   2 +-
 addons/crm_profiling/crm_profiling.py         |  40 +------
 addons/crm_profiling/crm_profiling_view.xml   |   9 +-
 addons/crm_profiling/crm_profiling_wizard.xml |   5 -
 .../crm_profiling/test/test_crm_profiling.yml |  12 +--
 .../wizard/open_questionnaire.py              | 100 +++++++++++-------
 .../wizard/open_questionnaire_view.xml        |  86 +++++++++++++++
 7 files changed, 156 insertions(+), 98 deletions(-)
 delete mode 100644 addons/crm_profiling/crm_profiling_wizard.xml
 create mode 100644 addons/crm_profiling/wizard/open_questionnaire_view.xml

diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 656f8360f0b..382fbcb1b28 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/test_crm_profiling.yml'],
     'installable': True,
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/test_crm_profiling.yml b/addons/crm_profiling/test/test_crm_profiling.yml
index 2b70cac592b..99fe2da1733 100644
--- a/addons/crm_profiling/test/test_crm_profiling.yml
+++ b/addons/crm_profiling/test/test_crm_profiling.yml
@@ -32,15 +32,14 @@
     name: John
     category_id:
       - res_partner_category_customers0
-    answers_ids:
-      - crm_profiling_answer_openerppartner0
 
 -
   Define the answers and category to partner.
 -
   !python {model: res.partner}: |
     data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
-    self._questionnaire_compute(cr, uid, data, context)
+    context['active_id'] = ref('res_partner_john0')
+    self._questionnaire_compute(cr, uid, [ref('crm_profiling_answer_openerppartner0')], context)
 - |
   I start by creating new Questionnaire.
 -
@@ -51,13 +50,6 @@
       - crm_profiling.activity_sector
       - crm_profiling.nb_employees
       - crm_profiling.partner_level
-- |
-  I create the form for the "Base questionnaire".
--
-  !python {model: crm_profiling.questionnaire}: |
-    context.update({'active_id':ref('res_partner_john0')})
-    data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
-    self.build_form(cr, uid, data, context)
 -
   I create a segmentation record.
 -
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index 91b82a02d1a..bf7591ea3e7 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.TransientModel):
+    _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>

From 77c716683eefcc07d56d9f30e4eecf66f90c4191 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Nov 2011 12:10:08 +0530
Subject: [PATCH 003/119] [ADD]: event: Added new register2invoice.yml for
 partner registration for event to invoice generated

bzr revid: ron@tinyerp.com-20111114064008-zbxjp4210ff2nveo
---
 addons/event/__openerp__.py                   |  3 ++-
 .../event/test/process/register2invoice.yml   | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 addons/event/test/process/register2invoice.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 1890ed7bf84..d65f3bbe221 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,7 +54,8 @@ Note that:
         'res_partner_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'test': ['test/test_event.yml'],
+    'test': ['test/test_event.yml',
+             'test/process/register2invoice.yml'],
     'installable': True,
     'active': False,
     'certificate': '0083059161581',
diff --git a/addons/event/test/process/register2invoice.yml b/addons/event/test/process/register2invoice.yml
new file mode 100644
index 00000000000..649179f9e99
--- /dev/null
+++ b/addons/event/test/process/register2invoice.yml
@@ -0,0 +1,23 @@
+-
+  I want to organize one conference event, First I registered partner for event 
+  with 5 tickets, so I confirm this registration.
+-
+  !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.state == "done", "Registration should be closed after invoice generated"
\ No newline at end of file

From 64a531e000d67b93634723df3a5fe432ae8fa577 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Nov 2011 12:37:48 +0530
Subject: [PATCH 004/119] [IMP]: event: Added more assert for generated
 invoiced in register2invoice.yml

bzr revid: ron@tinyerp.com-20111114070748-wu67m8d9ddpiqdy8
---
 addons/event/test/process/register2invoice.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/event/test/process/register2invoice.yml b/addons/event/test/process/register2invoice.yml
index 649179f9e99..80c8aed1b5f 100644
--- a/addons/event/test/process/register2invoice.yml
+++ b/addons/event/test/process/register2invoice.yml
@@ -20,4 +20,9 @@
   !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 origin is not correct"
     assert record.state == "done", "Registration should be closed after invoice generated"
\ No newline at end of file

From 46322eb7e1de8ace1667c24d6f2c3cb1a6a70c18 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Nov 2011 14:16:44 +0530
Subject: [PATCH 005/119] [IMP] event: Improved assert string

bzr revid: ron@tinyerp.com-20111114084644-8jrahh2z4qc4b2rs
---
 .../test/{test_event.yml => process/event_confirm2done.yml}     | 0
 addons/event/test/process/register2invoice.yml                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename addons/event/test/{test_event.yml => process/event_confirm2done.yml} (100%)

diff --git a/addons/event/test/test_event.yml b/addons/event/test/process/event_confirm2done.yml
similarity index 100%
rename from addons/event/test/test_event.yml
rename to addons/event/test/process/event_confirm2done.yml
diff --git a/addons/event/test/process/register2invoice.yml b/addons/event/test/process/register2invoice.yml
index 80c8aed1b5f..96032e07007 100644
--- a/addons/event/test/process/register2invoice.yml
+++ b/addons/event/test/process/register2invoice.yml
@@ -24,5 +24,5 @@
     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 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"
\ No newline at end of file

From 7ef465010b11a99baa88c1c4e9416d5d4aab5adb Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Nov 2011 15:11:27 +0530
Subject: [PATCH 006/119] [IMP, MOVE, REN] event: 1) Moved
 event/test/test_event.yml to event/test/process/event_confirm2done.yml 2)
 Removed all demo data which is used in yml 3) Created process from events
 register, confirm to done 4) updated __openerp__.py

bzr revid: ron@tinyerp.com-20111114094127-n3l4xwca8d1m2guc
---
 addons/event/__openerp__.py                   |   2 +-
 addons/event/event_demo.xml                   |   2 +
 .../event/test/process/event_confirm2done.yml | 188 ++----------------
 3 files changed, 22 insertions(+), 170 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index d65f3bbe221..0d796481065 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,7 +54,7 @@ Note that:
         'res_partner_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'test': ['test/test_event.yml',
+    'test': ['test/process/event_confirm2done.yml',
              'test/process/register2invoice.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 8e8764ca1a7..4f5a01b0c76 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"/>
diff --git a/addons/event/test/process/event_confirm2done.yml b/addons/event/test/process/event_confirm2done.yml
index 5e35d79cab2..cbb3a946ca3 100644
--- a/addons/event/test/process/event_confirm2done.yml
+++ b/addons/event/test/process/event_confirm2done.yml
@@ -1,172 +1,22 @@
-- |
-  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".
+  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.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."
-  
+    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', "Registration should be Closed."

From a67e8be3fa9f7e513ea8770bb63b8e42088b42b0 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Nov 2011 15:37:21 +0530
Subject: [PATCH 007/119] [REN, IMP] event: Rename register2invoice.yml to
 partner_register2invoice.yml and improved assert string on
 event_confirm2done.yml

bzr revid: ron@tinyerp.com-20111114100721-nu34kju9d1i0c4oo
---
 addons/event/__openerp__.py                                     | 2 +-
 addons/event/test/process/event_confirm2done.yml                | 2 +-
 .../{register2invoice.yml => partner_register2invoice.yml}      | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename addons/event/test/process/{register2invoice.yml => partner_register2invoice.yml} (100%)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 0d796481065..3681a582f2f 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -55,7 +55,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_confirm2done.yml',
-             'test/process/register2invoice.yml'],
+             'test/process/partner_register2invoice.yml'],
     'installable': True,
     'active': False,
     'certificate': '0083059161581',
diff --git a/addons/event/test/process/event_confirm2done.yml b/addons/event/test/process/event_confirm2done.yml
index cbb3a946ca3..4d5542896f7 100644
--- a/addons/event/test/process/event_confirm2done.yml
+++ b/addons/event/test/process/event_confirm2done.yml
@@ -19,4 +19,4 @@
   Check that conference is in "close" state. 
 -
   !assert {model: event.event, id: event_0}:
-    - state == 'done', "Registration should be Closed."
+    - state == 'done', "Event should be Closed."
diff --git a/addons/event/test/process/register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml
similarity index 100%
rename from addons/event/test/process/register2invoice.yml
rename to addons/event/test/process/partner_register2invoice.yml

From 5502ea7a9ceca7de6d5dfe697489b643903ea6b3 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Nov 2011 16:43:13 +0530
Subject: [PATCH 008/119] [ADD, IMP] event: 1) Added new yml
 event_draft2cancel.yml, 2) Updated demo data and gave min registration limit
 and event set to draft state instead of confirm state, 3) Created process
 from events register below limit but it should not be confirm then cancel
 event, 4) updated __openerp__.py

bzr revid: ron@tinyerp.com-20111114111313-uhlq0o6vc4enklfn
---
 addons/event/__openerp__.py                   |  1 +
 addons/event/event_demo.xml                   |  2 +-
 .../event/test/process/event_draft2cancel.yml | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 addons/event/test/process/event_draft2cancel.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 3681a582f2f..aa7b3197b05 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -55,6 +55,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_confirm2done.yml',
+             'test/process/event_draft2cancel.yml',
              'test/process/partner_register2invoice.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 4f5a01b0c76..8e1d37c52f6 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -76,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"/>
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"

From a83fcde385eff451f431aed88a2dc600bea60bb3 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Nov 2011 18:26:46 +0530
Subject: [PATCH 009/119] [ADD] event: 1) Added test/ui/onchange_events.yml 2)
 Added process to onchanges events, 3) Updated __openerp__.py

bzr revid: ron@tinyerp.com-20111114125646-67hmq4w5cvrp1t7a
---
 addons/event/__openerp__.py              |  3 ++-
 addons/event/test/ui/onchange_events.yml | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 addons/event/test/ui/onchange_events.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index aa7b3197b05..7533c90e601 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -56,7 +56,8 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_confirm2done.yml',
              'test/process/event_draft2cancel.yml',
-             'test/process/partner_register2invoice.yml'],
+             'test/process/partner_register2invoice.yml',
+             'test/ui/onchange_events.yml'],
     'installable': True,
     'active': False,
     'certificate': '0083059161581',
diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml
new file mode 100644
index 00000000000..d6f58ed37db
--- /dev/null
+++ b/addons/event/test/ui/onchange_events.yml
@@ -0,0 +1,10 @@
+-
+  I call onchange event to change costing of registration base on event.
+-
+  !python {model: event.registration}: |
+    self.onchange_event(cr, uid, ref('reg_1_1'), ref("event_1"), [])
+-
+  I call onchange event to change the partner of event registration.
+-
+  !python {model: event.registration}: |
+    self.onchange_partner_id(cr, uid, ref('reg_1_1'), ref("base.res_partner_asus"), ref("event_1"), email=False)

From 2452caff0830da176ca8b3443c6bc5e9266e9abc Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 14 Nov 2011 18:35:46 +0530
Subject: [PATCH 010/119] [ADD] event: 1) Added onchange_product event in
 onchange_events.yml

bzr revid: ron@tinyerp.com-20111114130546-jbcbi5li6xa3id2c
---
 addons/event/test/ui/onchange_events.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml
index d6f58ed37db..ec8dbc78858 100644
--- a/addons/event/test/ui/onchange_events.yml
+++ b/addons/event/test/ui/onchange_events.yml
@@ -8,3 +8,8 @@
 -
   !python {model: event.registration}: |
     self.onchange_partner_id(cr, uid, ref('reg_1_1'), ref("base.res_partner_asus"), ref("event_1"), email=False)
+-
+  I call onchange event to change the product of event.
+-
+  !python {model: event.event}: |
+    self.onchange_product(cr, uid, ref("event_1"), ref("event_product_0"))

From 6bc804ac7330ce18a933745deb8a0138e2cca040 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 15 Nov 2011 12:07:19 +0530
Subject: [PATCH 011/119] [IMP] event: * Added Demo data for partner
 Registration for event * Added case Group of invoice for same partner

bzr revid: ron@tinyerp.com-20111115063719-22r1hsqa9tsh111d
---
 addons/event/event_demo.xml                   | 11 +++++++++
 .../test/process/partner_register2invoice.yml | 23 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 8e1d37c52f6..9c9dba85730 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -128,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/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml
index 96032e07007..3f8e0f0eb42 100644
--- a/addons/event/test/process/partner_register2invoice.yml
+++ b/addons/event/test/process/partner_register2invoice.yml
@@ -25,4 +25,25 @@
     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"
\ No newline at end of file
+    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"

From 63adefd9a39902f96b5e806dd969121809a2e88f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 15 Nov 2011 12:29:13 +0530
Subject: [PATCH 012/119] [FIX] event: Traceback generated when converting
 partner to registration of event

bzr revid: ron@tinyerp.com-20111115065913-03ikpexa6emwpiao
---
 addons/event/wizard/partner_event_registration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 = {

From ed2cd316f671480a19a5fe0573fbbcc146e05565 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 15 Nov 2011 14:05:53 +0530
Subject: [PATCH 013/119] [IMP] event: Added registration process from patner
 on partner_register2invoice.yml

bzr revid: ron@tinyerp.com-20111115083553-v7xg40kj9l7ayrs5
---
 .../test/process/partner_register2invoice.yml     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/event/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml
index 3f8e0f0eb42..d573d8c0f9a 100644
--- a/addons/event/test/process/partner_register2invoice.yml
+++ b/addons/event/test/process/partner_register2invoice.yml
@@ -1,6 +1,19 @@
 -
   I want to organize one conference event, First I registered partner for event 
-  with 5 tickets, so I confirm this registration.
+  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, "Registratin should be create here."
+-
+  I confirm registration process.
 -
   !python {model: event.registration}: |
     self.check_confirm(cr, uid, [ref("reg_1_1")])

From 8661aa8a983de5ac77edb056916b76ba56fd4291 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 15 Nov 2011 14:48:56 +0530
Subject: [PATCH 014/119] [IMP] event: Added onchange_team and copy case in  on
 onchange_event.yml and improved string at partner_register2invoice.yml

bzr revid: ron@tinyerp.com-20111115091856-9ede5mpat4uz3gpr
---
 .../event/test/process/partner_register2invoice.yml |  2 +-
 addons/event/test/ui/onchange_events.yml            | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/event/test/process/partner_register2invoice.yml b/addons/event/test/process/partner_register2invoice.yml
index d573d8c0f9a..f8748afee2f 100644
--- a/addons/event/test/process/partner_register2invoice.yml
+++ b/addons/event/test/process/partner_register2invoice.yml
@@ -11,7 +11,7 @@
 -
   !python {model: event.registration}: |
     ids = self.search(cr, uid, [('partner_id','=',ref("base.res_partner_ericdubois0")), ('event_id', '=', ref('event_1'))])
-    assert ids, "Registratin should be create here."
+    assert ids, "Registration should be create here."
 -
   I confirm registration process.
 -
diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml
index ec8dbc78858..da80d2d81ba 100644
--- a/addons/event/test/ui/onchange_events.yml
+++ b/addons/event/test/ui/onchange_events.yml
@@ -13,3 +13,16 @@
 -
   !python {model: event.event}: |
     self.onchange_product(cr, uid, ref("event_1"), ref("event_product_0"))
+-
+  I call onchange event to change the team of event.
+-
+  !python {model: event.event}: |
+    self.do_team_change(cr, uid, ref("event_1"), ref("crm.section_sales_department"))
+-
+  Copy of event.
+-
+  !python {model: event.event}: |
+    try:
+      self.copy(cr, uid, ref("event_2"))
+    except:
+      pass
\ No newline at end of file

From e0f0d7a5c00a464a5215b08f2d5b54d4892e2025 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 15 Nov 2011 15:11:03 +0530
Subject: [PATCH 015/119] [IMP] event: Added onchange_event for partner
 registration

bzr revid: ron@tinyerp.com-20111115094103-gdykg94bms34qj0n
---
 addons/event/test/ui/onchange_events.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml
index da80d2d81ba..750d8112351 100644
--- a/addons/event/test/ui/onchange_events.yml
+++ b/addons/event/test/ui/onchange_events.yml
@@ -18,6 +18,12 @@
 -
   !python {model: event.event}: |
     self.do_team_change(cr, uid, ref("event_1"), ref("crm.section_sales_department"))
+-
+  I call onchange event on partner registration.
+-
+  !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)
 -
   Copy of event.
 -

From e477f052e95d7612e81dd7b2b949def45ae4fdca Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 17 Nov 2011 11:57:56 +0530
Subject: [PATCH 016/119] [IMP, ADD] event: Add duplicate_event.yml and move
 code of duplicate of event from onchange_events.yml to duplicate yml

bzr revid: ron@tinyerp.com-20111117062756-drk1hm8jtryq4xmb
---
 addons/event/__openerp__.py              | 1 +
 addons/event/test/ui/duplicate_event.yml | 8 ++++++++
 addons/event/test/ui/onchange_events.yml | 8 --------
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 addons/event/test/ui/duplicate_event.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 7533c90e601..485923257fe 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -57,6 +57,7 @@ Note that:
     'test': ['test/process/event_confirm2done.yml',
              'test/process/event_draft2cancel.yml',
              'test/process/partner_register2invoice.yml',
+             'test/ui/duplicate_event.yml',
              'test/ui/onchange_events.yml'],
     'installable': True,
     'active': False,
diff --git a/addons/event/test/ui/duplicate_event.yml b/addons/event/test/ui/duplicate_event.yml
new file mode 100644
index 00000000000..03be9a3d06d
--- /dev/null
+++ b/addons/event/test/ui/duplicate_event.yml
@@ -0,0 +1,8 @@
+-
+  Copy of event.
+-
+  !python {model: event.event}: |
+    try:
+      self.copy(cr, uid, ref("event_2"))
+    except:
+      pass
\ No newline at end of file
diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml
index 750d8112351..90cc99f3abf 100644
--- a/addons/event/test/ui/onchange_events.yml
+++ b/addons/event/test/ui/onchange_events.yml
@@ -24,11 +24,3 @@
   !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)
--
-  Copy of event.
--
-  !python {model: event.event}: |
-    try:
-      self.copy(cr, uid, ref("event_2"))
-    except:
-      pass
\ No newline at end of file

From 5d8c487a362534f1d08634e8b0fdf40e588dfd85 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 22 Nov 2011 16:11:26 +0530
Subject: [PATCH 017/119] [IMP, REN]: event: * renamed file
 event/test/ui/onchange_events.yml => event/test/ui/demo_data.yml, * Created
 record for onchange event

bzr revid: ron@tinyerp.com-20111122104126-vyfp6bf7at9ap205
---
 addons/event/__openerp__.py              |  2 +-
 addons/event/test/ui/demo_data.yml       | 20 ++++++++++++++++++
 addons/event/test/ui/onchange_events.yml | 26 ------------------------
 3 files changed, 21 insertions(+), 27 deletions(-)
 create mode 100644 addons/event/test/ui/demo_data.yml
 delete mode 100644 addons/event/test/ui/onchange_events.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 485923257fe..60d01d15007 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -58,7 +58,7 @@ Note that:
              'test/process/event_draft2cancel.yml',
              'test/process/partner_register2invoice.yml',
              'test/ui/duplicate_event.yml',
-             'test/ui/onchange_events.yml'],
+             'test/ui/demo_data.yml'],
     'installable': True,
     'active': False,
     'certificate': '0083059161581',
diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml
new file mode 100644
index 00000000000..66a3cbe8263
--- /dev/null
+++ b/addons/event/test/ui/demo_data.yml
@@ -0,0 +1,20 @@
+-
+  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_c2c
+    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)
diff --git a/addons/event/test/ui/onchange_events.yml b/addons/event/test/ui/onchange_events.yml
deleted file mode 100644
index 90cc99f3abf..00000000000
--- a/addons/event/test/ui/onchange_events.yml
+++ /dev/null
@@ -1,26 +0,0 @@
--
-  I call onchange event to change costing of registration base on event.
--
-  !python {model: event.registration}: |
-    self.onchange_event(cr, uid, ref('reg_1_1'), ref("event_1"), [])
--
-  I call onchange event to change the partner of event registration.
--
-  !python {model: event.registration}: |
-    self.onchange_partner_id(cr, uid, ref('reg_1_1'), ref("base.res_partner_asus"), ref("event_1"), email=False)
--
-  I call onchange event to change the product of event.
--
-  !python {model: event.event}: |
-    self.onchange_product(cr, uid, ref("event_1"), ref("event_product_0"))
--
-  I call onchange event to change the team of event.
--
-  !python {model: event.event}: |
-    self.do_team_change(cr, uid, ref("event_1"), ref("crm.section_sales_department"))
--
-  I call onchange event on partner registration.
--
-  !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)

From 5636b7f0afc08ff8ae60b408a17cf6726c8cbc05 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Wed, 23 Nov 2011 11:09:37 +0530
Subject: [PATCH 018/119] [IMP] Cleanup the test case on hr_expense

bzr revid: jap@tinyerp.com-20111123053937-z5umq72sncompwf3
---
 addons/hr_expense/__openerp__.py              |   4 +-
 .../hr_expense/test/confirm2heldinvoiced.yml  |  71 ++++++++++
 addons/hr_expense/test/hr_expense_report.yml  |   8 --
 addons/hr_expense/test/test_hr_expense.yml    | 121 ------------------
 4 files changed, 73 insertions(+), 131 deletions(-)
 create mode 100644 addons/hr_expense/test/confirm2heldinvoiced.yml
 delete mode 100644 addons/hr_expense/test/hr_expense_report.yml
 delete mode 100644 addons/hr_expense/test/test_hr_expense.yml

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 4a22f00e076..7d11b0912bc 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -62,8 +62,8 @@ 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/confirm2heldinvoiced.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_expense/test/confirm2heldinvoiced.yml b/addons/hr_expense/test/confirm2heldinvoiced.yml
new file mode 100644
index 00000000000..5574317de0d
--- /dev/null
+++ b/addons/hr_expense/test/confirm2heldinvoiced.yml
@@ -0,0 +1,71 @@
+-
+  In Order to test process of Employee Expenses.
+-
+  I create this expense.
+-
+  !workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_septemberexpenses0}
+-
+  I change the state of expense.
+-
+  !python {model: hr.expense.expense}: |
+    self.expense_confirm(cr, uid, [ref('hr_expense_expense_septemberexpenses0')])
+-
+  I check the the expense is created or not
+-
+  !assert {model: hr.expense.expense, id: hr_expense_expense_septemberexpenses0}:
+    - state == 'confirm'
+-
+  I accept this expense.
+-
+  !workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_septemberexpenses0}
+-
+  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 the Invoiced for the expense.
+-
+  !python {model: hr.expense.expense}: |
+    self.invoice(cr, uid, [ref('hr_expense_expense_septemberexpenses0')])
+    
+-
+  I check that expense is "Invoiced".
+-
+  !assert {model: hr.expense.expense, id: hr_expense_expense_septemberexpenses0}:
+    - 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_septemberexpenses0')])[0]
+    assert exp.invoice_id, "Invoice should be created"
+-
+  I paid the expense
+-
+  !python {model: hr.expense.expense}: |
+    self.expense_paid(cr, uid, [ref('hr_expense_expense_septemberexpenses0')])
+-
+  I check the expense is paid.
+-
+  !assert {model: hr.expense.expense, id: hr_expense_expense_septemberexpenses0}:
+    - state == 'paid'
+-
+  I cancel the expense
+-
+  !python {model: hr.expense.expense}: |
+    self.expense_canceled(cr, uid, [ref('hr_expense_expense_septemberexpenses0')])
+-
+  I check the expense is cancel.
+-
+  !assert {model: hr.expense.expense, id: hr_expense_expense_septemberexpenses0}:
+    - state == 'cancelled' 
+-
+  we will print a PDF report defined on 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/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"
-

From cc37a9b36c38ce7fc8bc0bb6a8fb9d91d65178ee Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 23 Nov 2011 16:23:41 +0530
Subject: [PATCH 019/119] [FIX] stock :- remove colspan=4 in groups.

bzr revid: ysa@tinyerp.com-20111123105341-c5pjxdh3742idsz4
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8e3450708eb..5a8477ba74c 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">

From 5f2c5a43222a1cfe63621c77a738f8f536f8ce06 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 28 Nov 2011 13:36:57 +0530
Subject: [PATCH 020/119] [IMP] hr_expense: YML test cases of expenses process

bzr revid: hmo@tinyerp.com-20111128080657-tevdtnx70fbdnpbn
---
 addons/hr_expense/__openerp__.py              |  2 +-
 addons/hr_expense/hr_expense.py               |  1 +
 addons/hr_expense/hr_expense_data.xml         | 14 +--
 addons/hr_expense/hr_expense_demo.xml         | 94 ++++++++-----------
 .../hr_expense/test/confirm2heldinvoiced.yml  | 71 --------------
 addons/hr_expense/test/expense_process.yml    | 46 +++++++++
 6 files changed, 86 insertions(+), 142 deletions(-)
 delete mode 100644 addons/hr_expense/test/confirm2heldinvoiced.yml
 create mode 100644 addons/hr_expense/test/expense_process.yml

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 7d11b0912bc..f2ae82662fd 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -63,7 +63,7 @@ re-invoice your customer's expenses if your work by project.
         'hr_expense_demo.xml',
         ],
     'test': [
-             'test/confirm2heldinvoiced.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..7e079b21e14 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -1,96 +1,76 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data noupdate="1">
+    <data>
 
-        <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.employee3" 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="sep_expenses" model="hr.expense.expense">
+            <field name="employee_id" ref="hr.employee3"/>
+            <field name="name">September Expenses</field>
+            <field name="date" eval="time.strftime('%Y-09-28')"/>
         </record>
 
-        <record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
+        <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/confirm2heldinvoiced.yml b/addons/hr_expense/test/confirm2heldinvoiced.yml
deleted file mode 100644
index 5574317de0d..00000000000
--- a/addons/hr_expense/test/confirm2heldinvoiced.yml
+++ /dev/null
@@ -1,71 +0,0 @@
--
-  In Order to test process of Employee Expenses.
--
-  I create this expense.
--
-  !workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_septemberexpenses0}
--
-  I change the state of expense.
--
-  !python {model: hr.expense.expense}: |
-    self.expense_confirm(cr, uid, [ref('hr_expense_expense_septemberexpenses0')])
--
-  I check the the expense is created or not
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_septemberexpenses0}:
-    - state == 'confirm'
--
-  I accept this expense.
--
-  !workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_septemberexpenses0}
--
-  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 the Invoiced for the expense.
--
-  !python {model: hr.expense.expense}: |
-    self.invoice(cr, uid, [ref('hr_expense_expense_septemberexpenses0')])
-    
--
-  I check that expense is "Invoiced".
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_septemberexpenses0}:
-    - 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_septemberexpenses0')])[0]
-    assert exp.invoice_id, "Invoice should be created"
--
-  I paid the expense
--
-  !python {model: hr.expense.expense}: |
-    self.expense_paid(cr, uid, [ref('hr_expense_expense_septemberexpenses0')])
--
-  I check the expense is paid.
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_septemberexpenses0}:
-    - state == 'paid'
--
-  I cancel the expense
--
-  !python {model: hr.expense.expense}: |
-    self.expense_canceled(cr, uid, [ref('hr_expense_expense_septemberexpenses0')])
--
-  I check the expense is cancel.
--
-  !assert {model: hr.expense.expense, id: hr_expense_expense_septemberexpenses0}:
-    - state == 'cancelled' 
--
-  we will print a PDF report defined on 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/expense_process.yml b/addons/hr_expense/test/expense_process.yml
new file mode 100644
index 00000000000..6db6f4d0204
--- /dev/null
+++ b/addons/hr_expense/test/expense_process.yml
@@ -0,0 +1,46 @@
+-
+  In Order to test process of "Employee Expenses".
+-
+  I confirm "Expense Bill of September" of one employee of Marketing Department.
+-
+  !workflow {model: hr.expense.expense, action: confirm, ref: sep_expenses}
+-
+  I check state of expense after confirmed
+-
+  !assert {model: hr.expense.expense, id: sep_expenses}:
+    - state == 'confirm'
+-
+  I accept this expense.
+-
+  !workflow {model: hr.expense.expense, action: validate, ref: sep_expenses}
+-
+  I make Invoice for the expense.
+-
+  !python {model: hr.expense.expense}: |
+    self.invoice(cr, uid, [ref('sep_expenses')])
+    
+-
+  I check invoice details after invoiced.
+-
+  !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."
+-
+  I paid the expense
+-
+  !python {model: hr.expense.expense}: |
+    self.expense_paid(cr, uid, [ref('sep_expenses')])
+-
+  I check the expense after paid.
+-
+  !assert {model: hr.expense.expense, id: sep_expenses}:
+    - state == 'paid'
+-
+  I print this expense
+- 
+  !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)

From 4a39d126a1198e482c56cffb7e5d54e1ea848708 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 28 Nov 2011 14:34:36 +0530
Subject: [PATCH 021/119] [IMP]project:impove test case yml for project
 management.

bzr revid: kbh@tinyerp.com-20111128090436-5v6yd7ytbbch5b93
---
 addons/project/__openerp__.py                 |  6 +-
 .../project/test/process/cancel_project.yml   | 40 ++++++++++
 addons/project/test/process/cancel_task.yml   | 35 +++++++++
 .../process/draft2delegate2open2done_task.yml | 76 +++++++++++++++++++
 .../test/process/template2project2close.yml   | 61 +++++++++++++++
 5 files changed, 216 insertions(+), 2 deletions(-)
 create mode 100644 addons/project/test/process/cancel_project.yml
 create mode 100644 addons/project/test/process/cancel_task.yml
 create mode 100644 addons/project/test/process/draft2delegate2open2done_task.yml
 create mode 100644 addons/project/test/process/template2project2close.yml

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 9132636b56f..1c1b8fea4f8 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -61,8 +61,10 @@ Dashboard for project members that includes:
         'project_demo.xml',
     ],
     'test':[
-        'test/test_project.yml',
-        'test/test_project_delegation.yml',
+        'test/process/draft2delegate2open2done_task.yml',
+        'test/process/template2project2close.yml',
+        'test/process/cancel_project.yml',
+        'test/process/cancel_task.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project/test/process/cancel_project.yml b/addons/project/test/process/cancel_project.yml
new file mode 100644
index 00000000000..db5ba8ff0b7
--- /dev/null
+++ b/addons/project/test/process/cancel_project.yml
@@ -0,0 +1,40 @@
+-
+  I cancel unqualified Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel Project in to Draft.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel pending Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel opened Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel delegated Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel done Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel close Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_task_1")])
+-
+  I reset canclled Project into Draft.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_task_1")])
\ No newline at end of file
diff --git a/addons/project/test/process/cancel_task.yml b/addons/project/test/process/cancel_task.yml
new file mode 100644
index 00000000000..618db25b22d
--- /dev/null
+++ b/addons/project/test/process/cancel_task.yml
@@ -0,0 +1,35 @@
+-
+  I cancel unqualified Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel Task in to Draft.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel pending Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel opened Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel done Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_1")])
+-
+  I cancel close Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_1")])
+-
+  I reset canclled Task into Draft.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_1")])
\ No newline at end of file
diff --git a/addons/project/test/process/draft2delegate2open2done_task.yml b/addons/project/test/process/draft2delegate2open2done_task.yml
new file mode 100644
index 00000000000..544d95c326e
--- /dev/null
+++ b/addons/project/test/process/draft2delegate2open2done_task.yml
@@ -0,0 +1,76 @@
+-
+  In order to test process of Project Task,
+-
+  I put task in pending due to specification is not clear.
+-
+  !python {model: project.task}: |
+    self.do_pending(cr, uid, [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"
+-
+  Now I delegate task to team member.
+-
+  !python {model: project.task.delegate}: |
+    new_id = self.create(cr,uid,{'planned_hours': 1.0, 'user_id': 3,
+    'name': 'demo task', 'state': 'pending', 'prefix': 'CHECK: demo task',
+     'planned_hours_me': 1.0, 'new_task_description': 'this is demo.'})
+    self.delegate(cr, uid, [new_id], {"active_id": ref("project_task_1")})
+-
+  I check delegated task details.
+-
+  !assert {model: project.task.delegate, id: project_task_1, severity: error, string: Task should be pending state}:
+
+       - planned_hours == 0.0
+       - name == 'a'
+       - state == "pending"
+-
+  I check new task after delegated task.
+-
+  !record {model: project.task, id: project_task_delegate }:
+    name: test
+    planned_hours: 30.0
+    project_id: project_task_1
+    remaining_hours: 30.0
+    description: testing of delegated task
+    state: draft
+-
+   Now I Delegate task  to these tasks and make it pending
+-
+  !record {model: project.task, id: project_task_1 }:
+    child_ids:
+      - project.project_task_delegate
+    planned_hours: 20.0
+    state: pending
+-
+  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 reevaluate task with remaining hours.
+-
+
+  I Check remaining hours after reevaluated task.
+-
+  !assert {model: project.task.reevaluate, id: project_task_1, severity: error, string: task should be reevaluated}:
+       - remaining_hours == 1.0
+-
+  I close the task.
+-
+  !python {model: project.task}: |
+    self.do_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"
+-
diff --git a/addons/project/test/process/template2project2close.yml b/addons/project/test/process/template2project2close.yml
new file mode 100644
index 00000000000..a4c7da0a9b5
--- /dev/null
+++ b/addons/project/test/process/template2project2close.yml
@@ -0,0 +1,61 @@
+-
+  In order to Test Process of Project Management,
+-
+  I create duplicate template
+-
+  !python {model: project.project}: |
+     new_project = self.duplicate_template(cr, uid, [ref("project_integrate_openerp")])
+     if not new_project:
+         raise Exception( "New project based on template not created")
+     new_id = new_project['res_id']
+     new_project = self.read(cr, uid, [new_id], ['name', 'state'])[0]
+     state = new_project['state']
+     name = new_project['name']
+     assert state == 'open', "Project in %s state. Project created from template project must be in open state"%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")])
+-

From dfbfaf6d1d4ba397e2261e90eed1f4aa84499fd1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 28 Nov 2011 14:41:58 +0530
Subject: [PATCH 022/119] [IMP] event: Added copy of event registration in
 duplicate_event.yml

bzr revid: ron@tinyerp.com-20111128091158-lm8j37ej39oz7xu0
---
 addons/event/test/ui/duplicate_event.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/event/test/ui/duplicate_event.yml b/addons/event/test/ui/duplicate_event.yml
index 03be9a3d06d..c1287353c67 100644
--- a/addons/event/test/ui/duplicate_event.yml
+++ b/addons/event/test/ui/duplicate_event.yml
@@ -4,5 +4,13 @@
   !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

From 1a635e2216a294c7ab5b78c6fa6742a7c676fc2b Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 28 Nov 2011 15:10:28 +0530
Subject: [PATCH 023/119] [IMP] event: called onchange_contact_id() on event

bzr revid: ron@tinyerp.com-20111128094028-6a96zd70xnb21b40
---
 addons/event/test/ui/demo_data.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml
index 66a3cbe8263..2762e3b3cda 100644
--- a/addons/event/test/ui/demo_data.yml
+++ b/addons/event/test/ui/demo_data.yml
@@ -3,7 +3,7 @@
 -
   !record {model: event.registration, id: reg_0_1}:
     event_id: event_0
-    partner_id: base.res_partner_c2c
+    partner_id: base.res_partner_asus
     name: 'Ticket for Concert'
 -
   I create event record to call product onchange and team onchange.

From 1f7737946f89fa3360d11ff3fc39c230bf628672 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 28 Nov 2011 16:10:02 +0530
Subject: [PATCH 024/119] [IMP] project: refactor test cases of process of
 project

bzr revid: hmo@tinyerp.com-20111128104002-2rq1o010c0zl49jn
---
 addons/project/__openerp__.py                 |   6 +-
 .../project/test/process/cancel_project.yml   |  40 ---
 addons/project/test/process/cancel_task.yml   |  35 ---
 .../process/draft2delegate2open2done_task.yml |  76 -----
 ...2project2close.yml => project_process.yml} |  21 +-
 addons/project/test/task_process.yml          |  69 ++++
 addons/project/test/test_project.yml          | 296 ------------------
 .../project/test/test_project_delegation.yml  | 230 --------------
 8 files changed, 82 insertions(+), 691 deletions(-)
 delete mode 100644 addons/project/test/process/cancel_project.yml
 delete mode 100644 addons/project/test/process/cancel_task.yml
 delete mode 100644 addons/project/test/process/draft2delegate2open2done_task.yml
 rename addons/project/test/{process/template2project2close.yml => project_process.yml} (73%)
 create mode 100644 addons/project/test/task_process.yml
 delete mode 100644 addons/project/test/test_project.yml
 delete mode 100644 addons/project/test/test_project_delegation.yml

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 1c1b8fea4f8..c9484ae9dd8 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -61,10 +61,8 @@ Dashboard for project members that includes:
         'project_demo.xml',
     ],
     'test':[
-        'test/process/draft2delegate2open2done_task.yml',
-        'test/process/template2project2close.yml',
-        'test/process/cancel_project.yml',
-        'test/process/cancel_task.yml',
+        'test/project_process.yml',
+        'test/task_process.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project/test/process/cancel_project.yml b/addons/project/test/process/cancel_project.yml
deleted file mode 100644
index db5ba8ff0b7..00000000000
--- a/addons/project/test/process/cancel_project.yml
+++ /dev/null
@@ -1,40 +0,0 @@
--
-  I cancel unqualified Project.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel Project in to Draft.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel pending Project.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel opened Project.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel delegated Project.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel done Project.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel close Project.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_task_1")])
--
-  I reset canclled Project into Draft.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_task_1")])
\ No newline at end of file
diff --git a/addons/project/test/process/cancel_task.yml b/addons/project/test/process/cancel_task.yml
deleted file mode 100644
index 618db25b22d..00000000000
--- a/addons/project/test/process/cancel_task.yml
+++ /dev/null
@@ -1,35 +0,0 @@
--
-  I cancel unqualified Task.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel Task in to Draft.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel pending Task.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel opened Task.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel done Task.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_1")])
--
-  I cancel close Task.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_1")])
--
-  I reset canclled Task into Draft.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_1")])
\ No newline at end of file
diff --git a/addons/project/test/process/draft2delegate2open2done_task.yml b/addons/project/test/process/draft2delegate2open2done_task.yml
deleted file mode 100644
index 544d95c326e..00000000000
--- a/addons/project/test/process/draft2delegate2open2done_task.yml
+++ /dev/null
@@ -1,76 +0,0 @@
--
-  In order to test process of Project Task,
--
-  I put task in pending due to specification is not clear.
--
-  !python {model: project.task}: |
-    self.do_pending(cr, uid, [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"
--
-  Now I delegate task to team member.
--
-  !python {model: project.task.delegate}: |
-    new_id = self.create(cr,uid,{'planned_hours': 1.0, 'user_id': 3,
-    'name': 'demo task', 'state': 'pending', 'prefix': 'CHECK: demo task',
-     'planned_hours_me': 1.0, 'new_task_description': 'this is demo.'})
-    self.delegate(cr, uid, [new_id], {"active_id": ref("project_task_1")})
--
-  I check delegated task details.
--
-  !assert {model: project.task.delegate, id: project_task_1, severity: error, string: Task should be pending state}:
-
-       - planned_hours == 0.0
-       - name == 'a'
-       - state == "pending"
--
-  I check new task after delegated task.
--
-  !record {model: project.task, id: project_task_delegate }:
-    name: test
-    planned_hours: 30.0
-    project_id: project_task_1
-    remaining_hours: 30.0
-    description: testing of delegated task
-    state: draft
--
-   Now I Delegate task  to these tasks and make it pending
--
-  !record {model: project.task, id: project_task_1 }:
-    child_ids:
-      - project.project_task_delegate
-    planned_hours: 20.0
-    state: pending
--
-  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 reevaluate task with remaining hours.
--
-
-  I Check remaining hours after reevaluated task.
--
-  !assert {model: project.task.reevaluate, id: project_task_1, severity: error, string: task should be reevaluated}:
-       - remaining_hours == 1.0
--
-  I close the task.
--
-  !python {model: project.task}: |
-    self.do_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"
--
diff --git a/addons/project/test/process/template2project2close.yml b/addons/project/test/project_process.yml
similarity index 73%
rename from addons/project/test/process/template2project2close.yml
rename to addons/project/test/project_process.yml
index a4c7da0a9b5..c440c757273 100644
--- a/addons/project/test/process/template2project2close.yml
+++ b/addons/project/test/project_process.yml
@@ -1,17 +1,13 @@
 -
   In order to Test Process of Project Management,
 -
-  I create duplicate template
+  I create duplicate template.
 -
   !python {model: project.project}: |
-     new_project = self.duplicate_template(cr, uid, [ref("project_integrate_openerp")])
-     if not new_project:
-         raise Exception( "New project based on template not created")
-     new_id = new_project['res_id']
-     new_project = self.read(cr, uid, [new_id], ['name', 'state'])[0]
-     state = new_project['state']
-     name = new_project['name']
-     assert state == 'open', "Project in %s state. Project created from template project must be in open state"%state
+     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.
 -
@@ -24,7 +20,7 @@
        - state == "open"
 
 -
-  I put project in pending
+  I put project in pending.
 -
   !python {model: project.project}: |
     self.set_pending(cr, uid, [ref("project_integrate_openerp")])
@@ -59,3 +55,8 @@
   !python {model: project.project}: |
     self.set_template(cr, uid, [ref("project_integrate_openerp")])
 -
+  I cancel Project.
+-
+  !python {model: project.project}: |
+    self.set_cancel(cr, uid, [ref("project_integrate_openerp")])
+
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
new file mode 100644
index 00000000000..0a6a15a230b
--- /dev/null
+++ b/addons/project/test/task_process.yml
@@ -0,0 +1,69 @@
+-
+  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."
+    assert len(task.child_ids), "Sub task is not created after delegate."
+-
+  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"
+-
+  !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.do_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 cancel Task.
+-
+  !python {model: project.task}: |
+    self.do_cancel(cr, uid, [ref("project_task_2")])
+
+
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"                  

From 7bb36d6c1b76cee148cb998fdb553fee57d9a839 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 28 Nov 2011 16:21:40 +0530
Subject: [PATCH 025/119] [IMP] project: add test case for scheduling task in
 project process

bzr revid: hmo@tinyerp.com-20111128105140-1wo9f883saij6wft
---
 addons/project/test/project_process.yml | 8 ++++++--
 addons/project/test/task_process.yml    | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
index c440c757273..4e1a5e80281 100644
--- a/addons/project/test/project_process.yml
+++ b/addons/project/test/project_process.yml
@@ -54,9 +54,13 @@
 -
   !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 cancel Project.
 -
   !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_integrate_openerp")])
-
+    self.set_cancel(cr, uid, [ref("project_project_9")])
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index 0a6a15a230b..87d2206a918 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -26,7 +26,6 @@
     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."
-    assert len(task.child_ids), "Sub task is not created after delegate."
 -
   I Re-open the task.
 -

From ee3dd3f581e259af3084b2b0289c02e8de404ed8 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Mon, 28 Nov 2011 16:41:07 +0530
Subject: [PATCH 026/119] [IMP]minor changes to the statements of YML.

bzr revid: kbh@tinyerp.com-20111128111107-gsnjmi1xm9z647vv
---
 addons/project/test/project_process.yml |  8 ++++----
 addons/project/test/task_process.yml    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
index 4e1a5e80281..1c0c7a18713 100644
--- a/addons/project/test/project_process.yml
+++ b/addons/project/test/project_process.yml
@@ -25,17 +25,17 @@
   !python {model: project.project}: |
     self.set_pending(cr, uid, [ref("project_integrate_openerp")])
 -
-  I Check state after put in pending.
+  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.
+  I re-open the project.
 -
   !python {model: project.project}: |
       self.set_open(cr, uid, [ref("project_integrate_openerp")])
 -
-  I Check state after reopen.
+  I check state after reopen.
 -
   !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be open.}:
        - state == "open"
@@ -45,7 +45,7 @@
   !python {model: project.project}: |
     self.set_done(cr, uid, [ref("project_integrate_openerp")])
 -
-  I Check state after closed.
+  I check state after closed.
 -
   !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be close.}:
        - state == "close"
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index 87d2206a918..e294b117397 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -5,12 +5,12 @@
     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.
+  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}: 
+  !record {model: project.task.delegate, id: delegate_id}:
     user_id: res_users_analyst
     planned_hours: 12.0
     planned_hours_me: 2.0
@@ -27,7 +27,7 @@
     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.
+  I re-open the task.
 -
   !python {model: project.task}: |
     self.do_reopen(cr, uid, [ref("project_task_1")])
@@ -37,7 +37,7 @@
   !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
     - state == "open"
 -
-  !record {model: project.task.reevaluate, id: reevaluate_id}: 
+  !record {model: project.task.reevaluate, id: reevaluate_id}:
     remaining_hours : 120
 -
   I reevaluate task with remaining hours.
@@ -55,7 +55,7 @@
   !python {model: project.task}: |
     self.do_close(cr, uid, [ref("project_task_1")])
 -
-  I Check state after closed.
+  I check state after closed.
 -
   !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}:
     - state == "done"

From 235d501eeff302cde8b7409d3bbb5f0749d0f8d1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 28 Nov 2011 18:17:48 +0530
Subject: [PATCH 027/119] [IMP] event: Added case of button_reg_close and event
 confirm from wizard  and improved data data to confirm stage instead of done
 stage

bzr revid: ron@tinyerp.com-20111128124748-f1xge9tyh9dv30tn
---
 addons/event/event_demo.xml        |  2 +-
 addons/event/test/ui/demo_data.yml | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 9c9dba85730..4f86f620e6f 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -94,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">
diff --git a/addons/event/test/ui/demo_data.yml b/addons/event/test/ui/demo_data.yml
index 2762e3b3cda..2f48cf1a90b 100644
--- a/addons/event/test/ui/demo_data.yml
+++ b/addons/event/test/ui/demo_data.yml
@@ -18,3 +18,15 @@
   !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")])

From 201365e2d2ba971d31b06457a04cb840b1d00835 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Wed, 30 Nov 2011 11:28:47 +0530
Subject: [PATCH 028/119] [IMP] hr_expense: improve test case

bzr revid: jap@tinyerp.com-20111130055847-2idpwqsufmk4whsm
---
 addons/hr_expense/test/expense_demo.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
index 6364e44d9bd..cd88448fefa 100644
--- a/addons/hr_expense/test/expense_demo.yml
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -4,7 +4,7 @@
     name : 'Antoine Philippe'
 -
   !record {model: product.product, id: car_travel, view: False}:
-    hr_expense_ok: 'True
+    hr_expense_ok: 'True'
 -
   !record {model: hr.expense.line, id: expense_line, view: False}:
     product_id: 'car_travel'

From 08d4845a49072df99b6cbb8912a54dd3757ef762 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Dec 2011 15:04:17 +0100
Subject: [PATCH 029/119] [IMP] res_groups: add function field
 trans_implied_ids

bzr revid: rco@openerp.com-20111202140417-0hgg92yks1vprnem
---
 openerp/addons/base/res/res_users.py | 45 ++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 0e2fb677c93..73fe1573607 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -522,6 +522,8 @@ class users(osv.osv):
 
 users()
 
+
+
 #
 # Extension of res.groups and res.users with a relation for "implied" or 
 # "inherited" groups.  Once a user belongs to a group, it automatically belongs
@@ -530,21 +532,38 @@ users()
 
 class groups_implied(osv.osv):
     _inherit = 'res.groups'
+
+    def _get_trans_implied(self, cr, uid, ids, field, arg, context=None):
+        "computes the transitive closure of relation implied_ids"
+        trans_memo = {}
+        def compute_trans(g):
+            "computes the list of group ids transitively implied by g"
+            # use a memo for performance and cycle avoidance
+            if g.id in trans_memo:
+                return trans_memo[g.id]
+            trans_memo[g.id] = set()
+            for h in g.implied_ids:
+                trans_memo[g.id].add(h.id)
+                trans_memo[g.id].update(compute_trans(h))
+            return trans_memo[g.id]
+        res = {}
+        for g in self.browse(cr, 1, ids, context):
+            res[g.id] = list(compute_trans(g))
+        return res
+
     _columns = {
         'implied_ids': fields.many2many('res.groups', 'res_groups_implied_rel', 'gid', 'hid',
             string='Inherits', help='Users of this group automatically inherit those groups'),
+        'trans_implied_ids': fields.function(_get_trans_implied,
+            type='many2many', relation='res.groups', string='Transitively inherits'),
     }
 
     def get_closure(self, cr, uid, ids, context=None):
-        "return the closure of ids, i.e., all groups recursively implied by ids"
-        closure = set()
-        todo = self.browse(cr, 1, ids)
-        while todo:
-            g = todo.pop()
-            if g.id not in closure:
-                closure.add(g.id)
-                todo.extend(g.implied_ids)
-        return list(closure)
+        "return the reflexive transitive closure of implied_ids for group ids"
+        res = set()
+        for g in self.browse(cr, 1, ids):
+            res.update(map(int, [g] + g.trans_implied_ids))
+        return list(res)
 
     def create(self, cr, uid, values, context=None):
         users = values.pop('users', None)
@@ -557,11 +576,11 @@ class groups_implied(osv.osv):
     def write(self, cr, uid, ids, values, context=None):
         res = super(groups_implied, self).write(cr, uid, ids, values, context)
         if values.get('users') or values.get('implied_ids'):
-            # add implied groups (to all users of each group)
+            # add all implied groups (to all users of each group)
             for g in self.browse(cr, uid, ids):
-                gids = self.get_closure(cr, uid, [g.id], context)
-                users = [(4, u.id) for u in g.users]
-                super(groups_implied, self).write(cr, uid, gids, {'users': users}, context)
+                gids = map(int, g.trans_implied_ids)
+                vals = {'users': [(4, u.id) for u in g.users]}
+                super(groups_implied, self).write(cr, uid, gids, vals, context)
         return res
 
     def get_maximal(self, cr, uid, ids, context=None):

From 0c2183b1219a89cb28d8f55e16fcf5e389773c0f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Dec 2011 15:14:10 +0100
Subject: [PATCH 030/119] [IMP] res_users: rename function

bzr revid: rco@openerp.com-20111202141410-jcjr3ftaih7hs232
---
 openerp/addons/base/res/res_users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 73fe1573607..5731482b442 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -697,7 +697,7 @@ def name_selection_groups(ids): return 'sel_groups_' + '_'.join(map(str, ids))
 def is_boolean_group(name): return name.startswith('in_group_')
 def is_boolean_groups(name): return name.startswith('in_groups_')
 def is_selection_groups(name): return name.startswith('sel_groups_')
-def is_field_group(name):
+def is_reified_group(name):
     return is_boolean_group(name) or is_boolean_groups(name) or is_selection_groups(name)
 
 def get_boolean_group(name): return int(name[9:])
@@ -754,7 +754,7 @@ class users_view(osv.osv):
         if not fields:
             group_fields, fields = [], self.fields_get(cr, uid, context=context).keys()
         else:
-            group_fields, fields = partition(is_field_group, fields)
+            group_fields, fields = partition(is_reified_group, fields)
         if group_fields:
             group_obj = self.pool.get('res.groups')
             fields.append('groups_id')

From 92057d3d84396dcb4e051a7d9800229b3f3e8e54 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Dec 2011 16:56:24 +0100
Subject: [PATCH 031/119] [IMP] add field category_id on groups

bzr revid: rco@openerp.com-20111202155624-hp2p1md2y4s4zcw0
---
 openerp/addons/base/base_update.xml        |  1 +
 openerp/addons/base/module/module_data.xml |  5 ++++
 openerp/addons/base/res/res_users.py       | 27 +++++++++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 26f971b8334..c68da96afe3 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -19,6 +19,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Groups">
+                    <field name="category_id" select="1"/>
                     <field name="name" select="1"/>
                     <notebook colspan="4">
                         <page string="Users">
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index f3593fa5791..2157ea24d4f 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -114,6 +114,11 @@
             <field name="sequence">15</field>
         </record>
 
+        <record model="ir.module.category" id="module_category_settings">
+            <field name="name">Administration</field>
+            <field name="sequence">100</field>
+        </record>
+
 <!--
         <record id="ir_ui_view_sc_modules0" model="ir.ui.view_sc">
             <field name="name">Modules</field>
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 5731482b442..eafd6c36356 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -43,7 +43,7 @@ class groups(osv.osv):
     _order = 'name'
     _description = "Access Groups"
     _columns = {
-        'name': fields.char('Group Name', size=64, required=True, translate=True),
+        'name': fields.char('Name', size=64, required=True, translate=True),
         'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
         'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'),
         'rule_groups': fields.many2many('ir.rule', 'rule_group_rel',
@@ -643,6 +643,31 @@ users_implied()
 
 class groups_view(osv.osv):
     _inherit = 'res.groups'
+    _rec_name = 'full_name'
+
+    def _get_full_name(self, cr, uid, ids, field, arg, context=None):
+        res = {}
+        for g in self.browse(cr, uid, ids, context):
+            if g.category_id:
+                res[g.id] = '%s / %s' % (g.category_id.name, g.name)
+            else:
+                res[g.id] = g.name
+        return res
+
+    def _from_group_ids(self, cr, uid, ids, context=None):
+        return ids
+
+    def _from_category_ids(obj, cr, uid, ids, context=None):
+        return obj.pool.get('res.groups').search(cr, uid, [('category_id', 'in', ids)], context=context)
+
+    _columns = {
+        'category_id': fields.many2one('ir.module.category', 'Application', select=True),
+        'full_name': fields.function(_get_full_name, type='char', string='Group Name',
+            store={
+                'res.groups': (_from_group_ids, ['category_id', 'name'], 10),
+                'ir.module.category': (_from_category_ids, ['name'], 10),
+            }),
+    }
 
     def get_classified(self, cr, uid, context=None):
         """ classify all groups by prefix; return a pair (apps, others) where

From 6431688615dc2e144e09ccbae185196de9b742b4 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Dec 2011 17:14:56 +0100
Subject: [PATCH 032/119] [IMP] base: link groups to applications (module
 categories)

bzr revid: rco@openerp.com-20111202161456-esv3hil2ricovi7u
---
 openerp/addons/base/module/module_data.xml    | 42 +++++++++++++++----
 .../addons/base/security/base_security.xml    | 17 ++++----
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 2157ea24d4f..2cee6f0fce4 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -114,18 +114,44 @@
             <field name="sequence">15</field>
         </record>
 
-        <record model="ir.module.category" id="module_category_settings">
+        <record model="ir.module.category" id="module_category_administration">
             <field name="name">Administration</field>
             <field name="sequence">100</field>
         </record>
 
-<!--
-        <record id="ir_ui_view_sc_modules0" model="ir.ui.view_sc">
-            <field name="name">Modules</field>
-            <field name="resource">ir.ui.menu</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="base.menu_module_tree"/>
+        <record model="ir.module.category" id="module_category_usability">
+            <field name="name">Usability</field>
+            <field name="sequence">101</field>
         </record>
--->
+
+        <!-- add applications to base groups -->
+        <record model="res.groups" id="group_erp_manager">
+            <field name="category_id" ref="module_category_administration"/>
+        </record>
+        <record model="res.groups" id="group_system">
+            <field name="category_id" ref="module_category_administration"/>
+        </record>
+
+        <record model="res.groups" id="group_user">
+            <field name="category_id" ref="module_category_human_resources"/>
+        </record>
+
+        <record model="res.groups" id="group_multi_company">
+            <field name="category_id" ref="module_category_usability"/>
+        </record>
+        <record model="res.groups" id="group_extended">
+            <field name="category_id" ref="module_category_usability"/>
+        </record>
+        <record model="res.groups" id="group_no_one">
+            <field name="category_id" ref="module_category_usability"/>
+        </record>
+
+        <record model="res.groups" id="group_sale_salesman">
+            <field name="category_id" ref="module_category_sales_management"/>
+        </record>
+        <record model="res.groups" id="group_sale_manager">
+            <field name="category_id" ref="module_category_sales_management"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index cb749eb3c66..b41f87c72da 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -4,36 +4,37 @@
 
 <!--
  Users Groups
+    [Note] Field 'category_id' is set later in base/module/module_data.xml
 -->
     <record model="res.groups" id="group_erp_manager">
-        <field name="name">Administration / Access Rights</field>
+        <field name="name">Access Rights</field>
     </record>
     <record model="res.groups" id="group_system">
-        <field name="name">Administration / Configuration</field>
+        <field name="name">Configuration</field>
         <field name="implied_ids" eval="[(4, ref('group_erp_manager'))]"/>
     </record>
 
     <record model="res.groups" id="group_user">
-        <field name="name">Human Resources / Employee</field>
+        <field name="name">Employee</field>
     </record>
 
     <record model="res.groups" context="{'noadmin':True}" id="group_multi_company">
-        <field name="name">Useability / Multi Companies</field>
+        <field name="name">Multi Companies</field>
     </record>
 
     <record model="res.groups" context="{'noadmin':True}" id="group_extended">
-        <field name="name">Useability / Extended View</field>
+        <field name="name">Extended View</field>
     </record>
 
     <record model="res.groups" id="group_no_one" context="{'noadmin':True}">
-        <field name="name">Useability / Technical Features</field>
+        <field name="name">Technical Features</field>
     </record>
 
     <record id="group_sale_salesman" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">User</field>
     </record>
     <record id="group_sale_manager" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <field name="name">Manager</field>
         <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
     </record>
 

From ac62aebefc63f1f8c6905b4114b30f73b32561ec Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Dec 2011 17:30:22 +0100
Subject: [PATCH 033/119] [FIX] move definition of fields category_id and
 full_name, and fix unique name constraint

bzr revid: rco@openerp.com-20111202163022-ntc4ni944zwkm50n
---
 openerp/addons/base/res/res_users.py | 53 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index eafd6c36356..10c53f9ca1a 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -40,8 +40,25 @@ import openerp.exceptions
 
 class groups(osv.osv):
     _name = "res.groups"
-    _order = 'name'
     _description = "Access Groups"
+    _order = 'full_name'
+    _rec_name = 'full_name'
+
+    def _get_full_name(self, cr, uid, ids, field, arg, context=None):
+        res = {}
+        for g in self.browse(cr, uid, ids, context):
+            if g.category_id:
+                res[g.id] = '%s / %s' % (g.category_id.name, g.name)
+            else:
+                res[g.id] = g.name
+        return res
+
+    def _from_group_ids(self, cr, uid, ids, context=None):
+        return ids
+
+    def _from_category_ids(obj, cr, uid, ids, context=None):
+        return obj.pool.get('res.groups').search(cr, uid, [('category_id', 'in', ids)], context=context)
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
@@ -50,9 +67,16 @@ class groups(osv.osv):
             'group_id', 'rule_group_id', 'Rules', domain=[('global', '=', False)]),
         'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
         'comment' : fields.text('Comment',size=250),
+        'category_id': fields.many2one('ir.module.category', 'Application', select=True),
+        'full_name': fields.function(_get_full_name, type='char', string='Group Name',
+            store={
+                'res.groups': (_from_group_ids, ['category_id', 'name'], 10),
+                'ir.module.category': (_from_category_ids, ['name'], 10),
+            }),
     }
+
     _sql_constraints = [
-        ('name_uniq', 'unique (name)', 'The name of the group must be unique !')
+        ('name_uniq', 'unique (full_name)', 'The name of the group must be unique !')
     ]
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -643,31 +667,6 @@ users_implied()
 
 class groups_view(osv.osv):
     _inherit = 'res.groups'
-    _rec_name = 'full_name'
-
-    def _get_full_name(self, cr, uid, ids, field, arg, context=None):
-        res = {}
-        for g in self.browse(cr, uid, ids, context):
-            if g.category_id:
-                res[g.id] = '%s / %s' % (g.category_id.name, g.name)
-            else:
-                res[g.id] = g.name
-        return res
-
-    def _from_group_ids(self, cr, uid, ids, context=None):
-        return ids
-
-    def _from_category_ids(obj, cr, uid, ids, context=None):
-        return obj.pool.get('res.groups').search(cr, uid, [('category_id', 'in', ids)], context=context)
-
-    _columns = {
-        'category_id': fields.many2one('ir.module.category', 'Application', select=True),
-        'full_name': fields.function(_get_full_name, type='char', string='Group Name',
-            store={
-                'res.groups': (_from_group_ids, ['category_id', 'name'], 10),
-                'ir.module.category': (_from_category_ids, ['name'], 10),
-            }),
-    }
 
     def get_classified(self, cr, uid, context=None):
         """ classify all groups by prefix; return a pair (apps, others) where

From 4fdf1ab805c4d366cf1e9754b73ecaaca86d1362 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 5 Dec 2011 12:16:09 +0100
Subject: [PATCH 034/119] [FIX] groups: fix implementation of trans_implied_ids

bzr revid: rco@openerp.com-20111205111609-3ll31ozf871zrtly
---
 openerp/addons/base/res/res_users.py | 48 ++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 10c53f9ca1a..2034999db88 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -554,25 +554,45 @@ users()
 # to the implied groups (transitively).
 #
 
+class cset(object):
+    """ A cset (constrained set) is a set of elements that may be constrained to
+        be a subset of other csets.  Elements added to a cset are automatically
+        added to its supersets.  Cycles in the subset constraints are supported.
+    """
+    def __init__(self, xs):
+        self.supersets = set()
+        self.elements = set(xs)
+    def subsetof(self, other):
+        if other is not self:
+            self.supersets.add(other)
+            other.update(self.elements)
+    def update(self, xs):
+        xs = set(xs) - self.elements
+        if xs:      # xs will eventually be empty in case of a cycle
+            self.elements.update(xs)
+            for s in self.supersets:
+                s.update(xs)
+    def __iter__(self):
+        return iter(self.elements)
+
+
+
 class groups_implied(osv.osv):
     _inherit = 'res.groups'
 
     def _get_trans_implied(self, cr, uid, ids, field, arg, context=None):
         "computes the transitive closure of relation implied_ids"
-        trans_memo = {}
-        def compute_trans(g):
-            "computes the list of group ids transitively implied by g"
-            # use a memo for performance and cycle avoidance
-            if g.id in trans_memo:
-                return trans_memo[g.id]
-            trans_memo[g.id] = set()
-            for h in g.implied_ids:
-                trans_memo[g.id].add(h.id)
-                trans_memo[g.id].update(compute_trans(h))
-            return trans_memo[g.id]
+        memo = {}           # use a memo for performance and cycle avoidance
+        def computed_set(g):
+            if g not in memo:
+                memo[g] = cset(g.implied_ids)
+                for h in g.implied_ids:
+                    computed_set(h).subsetof(memo[g])
+            return memo[g]
+
         res = {}
         for g in self.browse(cr, 1, ids, context):
-            res[g.id] = list(compute_trans(g))
+            res[g.id] = map(int, computed_set(g))
         return res
 
     _columns = {
@@ -584,9 +604,9 @@ class groups_implied(osv.osv):
 
     def get_closure(self, cr, uid, ids, context=None):
         "return the reflexive transitive closure of implied_ids for group ids"
-        res = set()
+        res = set(ids)
         for g in self.browse(cr, 1, ids):
-            res.update(map(int, [g] + g.trans_implied_ids))
+            res.update(map(int, g.trans_implied_ids))
         return list(res)
 
     def create(self, cr, uid, values, context=None):

From 720a6fb7ddbd0b941cc78208f352c8d0abcb7605 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 6 Dec 2011 10:10:11 +0100
Subject: [PATCH 035/119] [IMP] reimplemented user access rights form (basic)

bzr revid: rco@openerp.com-20111206091011-u7vgz4ig9p2ae2bl
---
 openerp/addons/base/base_update.xml  |  11 ++
 openerp/addons/base/res/res_users.py | 274 ++++++++++++---------------
 2 files changed, 128 insertions(+), 157 deletions(-)

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index c68da96afe3..0b0604089de 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -155,6 +155,17 @@
                 </form>
             </field>
         </record>
+
+        <record id="user_groups_view" model="ir.ui.view">
+            <field name="name">res.users.groups</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="view_users_form"/>
+            <field name="arch" type="xml">
+                <!-- dummy, will be modified by groups -->
+                <field name="groups_id" position="after"/>
+            </field>
+        </record>
+
         <record id="view_users_tree" model="ir.ui.view">
             <field name="name">res.users.tree</field>
             <field name="model">res.users</field>
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 2034999db88..56ac650d725 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -676,56 +676,11 @@ users_implied()
 #
 # Extension of res.groups and res.users for the special groups view in the users
 # form.  This extension presents groups with selection and boolean widgets:
-# - Groups named as "App/Name" (corresponding to root menu "App") are presented
-#   per application, with one boolean and selection field each.  The selection
-#   field defines a role "Name" for the given application.
-# - Groups named as "Stuff/Name" are presented as boolean fields and grouped
-#   under sections "Stuff".
-# - The remaining groups are presented as boolean fields and grouped in a
+# - Groups are shown by application, with boolean and/or selection fields.
+#   Selection fields typically defines a role "Name" for the given application.
+# - Uncategorized groups are presented as boolean fields and grouped in a
 #   section "Others".
 #
-
-class groups_view(osv.osv):
-    _inherit = 'res.groups'
-
-    def get_classified(self, cr, uid, context=None):
-        """ classify all groups by prefix; return a pair (apps, others) where
-            - both are lists like [("App", [("Name", browse_group), ...]), ...];
-            - apps is sorted in menu order;
-            - others are sorted in alphabetic order;
-            - groups not like App/Name are at the end of others, under _('Others')
-        """
-        # sort groups by implication, with implied groups first
-        groups = self.browse(cr, uid, self.search(cr, uid, []), context)
-        groups.sort(key=lambda g: set(self.get_closure(cr, uid, [g.id], context)))
-        
-        # classify groups depending on their names
-        classified = {}
-        for g in groups:
-            # split() returns 1 or 2 elements, so names[-2] is prefix or None
-            names = [None] + [s.strip() for s in g.name.split('/', 1)]
-            classified.setdefault(names[-2], []).append((names[-1], g))
-        
-        # determine the apps (that correspond to root menus, in order)
-        menu_obj = self.pool.get('ir.ui.menu')
-        menu_ids = menu_obj.search(cr, uid, [('parent_id','=',False)], context={'ir.ui.menu.full_list': True})
-        apps = []
-        for m in menu_obj.browse(cr, uid, menu_ids, context):
-            if m.name in classified:
-                # application groups are already sorted by implication
-                apps.append((m.name, classified.pop(m.name)))
-        
-        # other groups
-        others = sorted(classified.items(), key=lambda pair: pair[0])
-        if others and others[0][0] is None:
-            others.append((_('Others'), others.pop(0)[1]))
-        for sec, groups in others:
-            groups.sort(key=lambda pair: pair[0])
-        
-        return (apps, others)
-
-groups_view()
-
 # Naming conventions for reified groups fields:
 # - boolean field 'in_group_ID' is True iff
 #       ID is in 'groups_id'
@@ -753,39 +708,82 @@ def partition(f, xs):
     "return a pair equivalent to (filter(f, xs), filter(lambda x: not f(x), xs))"
     yes, nos = [], []
     for x in xs:
-        if f(x):
-            yes.append(x)
-        else:
-            nos.append(x)
+        (yes if f(x) else nos).append(x)
     return yes, nos
 
+
+
+class groups_view(osv.osv):
+    _inherit = 'res.groups'
+
+    def create(self, cr, uid, values, context=None):
+        res = super(groups_view, self).create(cr, uid, values, context)
+        self.update_user_groups_view(cr, uid, context)
+        return res
+
+    def write(self, cr, uid, ids, values, context=None):
+        res = super(groups_view, self).write(cr, uid, ids, values, context)
+        self.update_user_groups_view(cr, uid, context)
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        res = super(groups_view, self).unlink(cr, uid, ids, context)
+        self.update_user_groups_view(cr, uid, context)
+        return res
+
+    def update_user_groups_view(self, cr, uid, context=None):
+        # the view with id 'base.user_groups_view' inherits the user form view,
+        # and introduces the reified group fields
+        view = self.get_user_groups_view(cr, uid, context)
+        if view:
+            xml = []
+            xml.append('<!-- GENERATED AUTOMATICALLY BY GROUPS -->')
+            xml.append('<field name="groups_id" position="replace">')
+            for app, gs in self.get_groups_by_application(cr, uid, context):
+                category = app and app.name or _('Other')
+                xml.append('<separator string="%s" colspan="6"/>' % category)
+                for g in gs:
+                    xml.append('<field name="%s"/>' % name_boolean_group(g.id))
+            xml.append('</field>')
+            view.write({'arch': '\n'.join(xml)})
+        return True
+
+    def get_user_groups_view(self, cr, uid, context=None):
+        try:
+            view = self.pool.get('ir.model.data').get_object(cr, 1, 'base', 'user_groups_view', context)
+            assert view and view._table_name == 'ir.ui.view'
+        except Exception:
+            view = False
+        return view
+
+    def get_groups_by_application(self, cr, uid, context=None):
+        """ return all groups classified by application, as a list of pairs:
+            [(app, [group, ...]), ...], where app and group are browse records.
+            The groups of an application are given as sequences (for linear sets of groups);
+            those linear sets of groups may be shown on the screen as a selection widget.
+            Applications are given in sequence order, and groups are given in reverse implication order.
+        """
+        # classify all groups by application
+        by_app, others = {}, []
+        for g in self.browse(cr, uid, self.search(cr, uid, []), context):
+            if g.category_id:
+                by_app.setdefault(g.category_id, []).append(g)
+            else:
+                others.append(g)
+        # build the result
+        res = []
+        apps = sorted(by_app.iterkeys(), key=lambda a: a.sequence or 0)
+        for app in apps:
+            res.append((app, sorted(by_app[app], key=lambda g: g.name)))
+        if others:
+            res.append((False, sorted(others, key=lambda g: g.name)))
+        return res
+
+groups_view()
+
 class users_view(osv.osv):
     _inherit = 'res.users'
 
-    def _process_values_groups(self, cr, uid, values, context=None):
-        """ transform all reified group fields into a 'groups_id', adding 
-            also the implied groups """
-        add, rem = [], []
-        for k in values.keys():
-            if is_boolean_group(k):
-                if values.pop(k):
-                    add.append(get_boolean_group(k))
-                else:
-                    rem.append(get_boolean_group(k))
-            elif is_boolean_groups(k):
-                if not values.pop(k):
-                    rem.extend(get_boolean_groups(k))
-            elif is_selection_groups(k):
-                gid = values.pop(k)
-                if gid:
-                    rem.extend(get_selection_groups(k))
-                    add.append(gid)
-        if add or rem:
-            # remove groups in 'rem' and add groups in 'add'
-            gdiff = [(3, id) for id in rem] + [(4, id) for id in add]
-            values.setdefault('groups_id', []).extend(gdiff)
-        return True
-
     def create(self, cr, uid, values, context=None):
         self._process_values_groups(cr, uid, values, context)
         return super(users_view, self).create(cr, uid, values, context)
@@ -794,102 +792,64 @@ class users_view(osv.osv):
         self._process_values_groups(cr, uid, values, context)
         return super(users_view, self).write(cr, uid, ids, values, context)
 
+    def _process_values_groups(self, cr, uid, values, context=None):
+        """ transform all reified group fields into a 'groups_id', adding 
+            also the implied groups """
+        add, remove = [], []
+        for k in values.keys():
+            if is_boolean_group(k):
+                target = add if values.pop(k) else remove
+                target.append(get_boolean_group(k))
+            elif is_boolean_groups(k):
+                if not values.pop(k):
+                    remove.extend(get_boolean_groups(k))
+            elif is_selection_groups(k):
+                gid = values.pop(k)
+                if gid:
+                    remove.extend(get_selection_groups(k))
+                    add.append(gid)
+        if add or remove:
+            # remove groups in 'remove' and add groups in 'add'
+            gdiff = [(3, id) for id in remove] + [(4, id) for id in add]
+            values.setdefault('groups_id', []).extend(gdiff)
+        return True
+
     def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
         if not fields:
-            group_fields, fields = [], self.fields_get(cr, uid, context=context).keys()
-        else:
-            group_fields, fields = partition(is_reified_group, fields)
+            fields = self.fields_get(cr, uid, context=context).keys()
+        group_fields, fields = partition(is_reified_group, fields)
+
         if group_fields:
-            group_obj = self.pool.get('res.groups')
+            # first read the normal fields (and 'groups_id')
             fields.append('groups_id')
-            # read the normal fields (and 'groups_id')
             res = super(users_view, self).read(cr, uid, ids, fields, context=context, load=load)
+            # add reified groups fields in result(s)
             records = res if isinstance(res, list) else [res]
             for record in records:
-                # get the field 'groups_id' and insert the group_fields
-                groups = set(record['groups_id'])
+                user_group_ids = set(record['groups_id'])
                 for f in group_fields:
                     if is_boolean_group(f):
-                        record[f] = get_boolean_group(f) in groups
+                        record[f] = get_boolean_group(f) in user_group_ids
                     elif is_boolean_groups(f):
-                        record[f] = not groups.isdisjoint(get_boolean_groups(f))
+                        record[f] = not user_group_ids.isdisjoint(get_boolean_groups(f))
                     elif is_selection_groups(f):
-                        selected = groups.intersection(get_selection_groups(f))
-                        record[f] = group_obj.get_maximal(cr, uid, selected, context=context)
+                        # TODO
+                        pass
             return res
+
         return super(users_view, self).read(cr, uid, ids, fields, context=context, load=load)
 
-    def fields_get(self, cr, user, allfields=None, context=None, write_access=True):
-        res = super(users_view, self).fields_get(cr, user, allfields, context, write_access)
-        apps, others = self.pool.get('res.groups').get_classified(cr, user, context)
-        for app, groups in apps:
-            ids = [g.id for name, g in groups]
-            app_name = name_boolean_groups(ids)
-            sel_name = name_selection_groups(ids)
-            selection = [(g.id, name) for name, g in groups]
-            res[app_name] = {'type': 'boolean', 'string': app}
-            tips = [name + ': ' + (g.comment or '') for name, g in groups]
-            if tips:
-                res[app_name].update(help='\n'.join(tips))
-            res[sel_name] = {'type': 'selection', 'string': 'Group', 'selection': selection}
-
-        for sec, groups in others:
-            for gname, g in groups:
+    def fields_get(self, cr, uid, allfields=None, context=None, write_access=True):
+        res = super(users_view, self).fields_get(cr, uid, allfields, context, write_access)
+        # add reified groups fields
+        for app, gs in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
+            for g in gs:
                 name = name_boolean_group(g.id)
-                res[name] = {'type': 'boolean', 'string': gname}
-                if g.comment:
-                    res[name].update(help=g.comment)
-        return res
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form',
-                context=None, toolbar=False, submenu=False):
-        # in form views, transform 'groups_id' into reified group fields
-        res = super(users_view, self).fields_view_get(cr, uid, view_id, view_type,
-                context, toolbar, submenu)
-        if view_type == 'form':
-            root = etree.fromstring(encode(res['arch']))
-            nodes = root.xpath("//field[@name='groups_id']")
-            if nodes:
-                # replace node by the reified group fields
-                fields = res['fields']
-                elems = []
-                apps, others = self.pool.get('res.groups').get_classified(cr, uid, context)
-                # create section Applications
-                elems.append('<separator colspan="6" string="%s"/>' % _('Applications'))
-                for app, groups in apps:
-                    ids = [g.id for name, g in groups]
-                    app_name = name_boolean_groups(ids)
-                    sel_name = name_selection_groups(ids)
-                    selection = [(g.id, name) for name, g in groups]
-                    fields[app_name] = {'type': 'boolean', 'string': app}
-                    tips = [name + ': ' + (g.comment or '') for name, g in groups]
-                    if tips:
-                        fields[app_name].update(help='\n'.join(tips))
-                    fields[sel_name] = {'type': 'selection', 'string': 'Group', 'selection': selection}
-                    attrs = {'invisible': [('%s' % app_name, '=', False)]}
-                    elems.append("""
-                        <field name="%(app)s"/>
-                        <field name="%(sel)s" nolabel="1" colspan="2"
-                            attrs=%(attrs)s modifiers=%(json_attrs)s/>
-                        <newline/>
-                        """ % {'app': app_name, 'sel': sel_name,
-                               'attrs': quoteattr(str(attrs)),
-                               'json_attrs': quoteattr(simplejson.dumps(attrs))})
-                # create other sections
-                for sec, groups in others:
-                    elems.append('<separator colspan="6" string="%s"/>' % sec)
-                    for gname, g in groups:
-                        name = name_boolean_group(g.id)
-                        fields[name] = {'type': 'boolean', 'string': gname}
-                        if g.comment:
-                            fields[name].update(help=g.comment)
-                        elems.append('<field name="%s"/>' % name)
-                    elems.append('<newline/>')
-                # replace xml node by new arch
-                new_node = etree.fromstring('<group col="6">' + ''.join(elems) + '</group>')
-                for node in nodes:
-                    node.getparent().replace(node, new_node)
-                res['arch'] = etree.tostring(root)
+                res[name] = {
+                    'type': 'boolean',
+                    'string': g.name,
+                    'help': g.comment,
+                }
         return res
 
 users_view()

From 12ce46102f186ea3f17a128eea097ccffd8c7a70 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 6 Dec 2011 12:05:15 +0100
Subject: [PATCH 036/119] res_users: reintroduce selectors for group fields

bzr revid: rco@openerp.com-20111206110515-4rhub0y2d0lbboac
---
 openerp/addons/base/res/res_users.py | 70 +++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 56ac650d725..59a9793b9d2 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -739,11 +739,15 @@ class groups_view(osv.osv):
             xml = []
             xml.append('<!-- GENERATED AUTOMATICALLY BY GROUPS -->')
             xml.append('<field name="groups_id" position="replace">')
-            for app, gs in self.get_groups_by_application(cr, uid, context):
+            for app, selects in self.get_groups_by_application(cr, uid, context):
                 category = app and app.name or _('Other')
                 xml.append('<separator string="%s" colspan="6"/>' % category)
-                for g in gs:
-                    xml.append('<field name="%s"/>' % name_boolean_group(g.id))
+                for gs in selects:
+                    if len(gs) == 1:
+                        field_name = name_boolean_group(gs[0].id)
+                    else:
+                        field_name = name_selection_groups(map(int, gs))
+                    xml.append('<field name="%s"/>' % field_name)
             xml.append('</field>')
             view.write({'arch': '\n'.join(xml)})
         return True
@@ -758,11 +762,33 @@ class groups_view(osv.osv):
 
     def get_groups_by_application(self, cr, uid, context=None):
         """ return all groups classified by application, as a list of pairs:
-            [(app, [group, ...]), ...], where app and group are browse records.
+            [(app, [[group, ...], ...]), ...], where app and group are browse records.
             The groups of an application are given as sequences (for linear sets of groups);
             those linear sets of groups may be shown on the screen as a selection widget.
             Applications are given in sequence order, and groups are given in reverse implication order.
         """
+        def linearize(groups):
+            groups = set(groups)
+            # determine sequence order: a group appear after its implied groups
+            order = dict.fromkeys(groups, 0)
+            for g in groups:
+                for h in groups.intersection(g.trans_implied_ids):
+                    order[h] -= 1
+            groups = sorted(groups, key=lambda g: order[g])
+            # extract sequences
+            res = []
+            while groups:
+                g = groups.pop()
+                gs, nogs = partition(lambda h: h in g.trans_implied_ids, groups)
+                gs.append(g)
+                # check that gs is truly linear (sequence order are distinct)
+                if len(set(map(lambda h: order[h], gs))) == len(gs):
+                    res.append(gs)
+                    groups = nogs
+                else:
+                    res.append([g])
+            return res
+
         # classify all groups by application
         by_app, others = {}, []
         for g in self.browse(cr, uid, self.search(cr, uid, []), context):
@@ -774,9 +800,9 @@ class groups_view(osv.osv):
         res = []
         apps = sorted(by_app.iterkeys(), key=lambda a: a.sequence or 0)
         for app in apps:
-            res.append((app, sorted(by_app[app], key=lambda g: g.name)))
+            res.append((app, linearize(by_app[app])))
         if others:
-            res.append((False, sorted(others, key=lambda g: g.name)))
+            res.append((False, linearize(others)))
         return res
 
 groups_view()
@@ -833,8 +859,8 @@ class users_view(osv.osv):
                     elif is_boolean_groups(f):
                         record[f] = not user_group_ids.isdisjoint(get_boolean_groups(f))
                     elif is_selection_groups(f):
-                        # TODO
-                        pass
+                        selected = [gid for gid in get_selection_groups(f) if gid in user_group_ids]
+                        record[f] = selected and selected[-1] or False
             return res
 
         return super(users_view, self).read(cr, uid, ids, fields, context=context, load=load)
@@ -842,14 +868,26 @@ class users_view(osv.osv):
     def fields_get(self, cr, uid, allfields=None, context=None, write_access=True):
         res = super(users_view, self).fields_get(cr, uid, allfields, context, write_access)
         # add reified groups fields
-        for app, gs in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
-            for g in gs:
-                name = name_boolean_group(g.id)
-                res[name] = {
-                    'type': 'boolean',
-                    'string': g.name,
-                    'help': g.comment,
-                }
+        for app, selects in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
+            all_gs = reduce(lambda x, y: x + y, selects)
+            res[name_boolean_groups(map(int, all_gs))] = {
+                'type': 'boolean',
+                'string': app and app.name or _('Other'),
+            }
+            for gs in selects:
+                if len(gs) == 1:
+                    g = gs[0]
+                    res[name_boolean_group(g.id)] = {
+                        'type': 'boolean',
+                        'string': g.name,
+                        'help': g.comment,
+                    }
+                else:
+                    res[name_selection_groups(map(int, gs))] = {
+                        'type': 'selection',
+                        'string': _('Role'),
+                        'selection': [(g.id, g.name) for g in gs],
+                    }
         return res
 
 users_view()

From 9e1de990fd9e15cedba8365e2bb01ae402e84e9e Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 6 Dec 2011 12:09:20 +0100
Subject: [PATCH 037/119] [IMP] res_users: add tips in selector group fields

bzr revid: rco@openerp.com-20111206110920-34fp50qt3v1hscef
---
 openerp/addons/base/res/res_users.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 59a9793b9d2..0a8bd2b0684 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -883,10 +883,12 @@ class users_view(osv.osv):
                         'help': g.comment,
                     }
                 else:
+                    tips = ['%s: %s' % (g.name, g.comment or '') for g in gs]
                     res[name_selection_groups(map(int, gs))] = {
                         'type': 'selection',
                         'string': _('Role'),
                         'selection': [(g.id, g.name) for g in gs],
+                        'help': '\n'.join(tips),
                     }
         return res
 

From 788eb62ac2964fa2827bafead1a6aafbab49eb92 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 6 Dec 2011 13:56:42 +0100
Subject: [PATCH 038/119] [IMP] res_users: improve access rights on user form

bzr revid: rco@openerp.com-20111206125642-hatpewnnxsg9nerx
---
 openerp/addons/base/res/res_users.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 0a8bd2b0684..19658c26f0e 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -739,15 +739,17 @@ class groups_view(osv.osv):
             xml = []
             xml.append('<!-- GENERATED AUTOMATICALLY BY GROUPS -->')
             xml.append('<field name="groups_id" position="replace">')
+            xml.append('<group col="6">')
             for app, selects in self.get_groups_by_application(cr, uid, context):
-                category = app and app.name or _('Other')
-                xml.append('<separator string="%s" colspan="6"/>' % category)
+                app_name = app and app.name or _('Other')
+                xml.append('<separator string="%s" colspan="6"/>' % app_name)
                 for gs in selects:
                     if len(gs) == 1:
                         field_name = name_boolean_group(gs[0].id)
                     else:
                         field_name = name_selection_groups(map(int, gs))
                     xml.append('<field name="%s"/>' % field_name)
+            xml.append('</group>')
             xml.append('</field>')
             view.write({'arch': '\n'.join(xml)})
         return True
@@ -869,11 +871,6 @@ class users_view(osv.osv):
         res = super(users_view, self).fields_get(cr, uid, allfields, context, write_access)
         # add reified groups fields
         for app, selects in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
-            all_gs = reduce(lambda x, y: x + y, selects)
-            res[name_boolean_groups(map(int, all_gs))] = {
-                'type': 'boolean',
-                'string': app and app.name or _('Other'),
-            }
             for gs in selects:
                 if len(gs) == 1:
                     g = gs[0]

From 6093f636f73af72fae49bae62207b3308748addc Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 6 Dec 2011 14:51:48 +0100
Subject: [PATCH 039/119] [IMP] res_users: simplify group categorization

bzr revid: rco@openerp.com-20111206135148-uu5vd4w15slr93cg
---
 openerp/addons/base/res/res_users.py | 104 +++++++++++++--------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 19658c26f0e..0ebc42b0c30 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -736,22 +736,25 @@ class groups_view(osv.osv):
         # and introduces the reified group fields
         view = self.get_user_groups_view(cr, uid, context)
         if view:
-            xml = []
-            xml.append('<!-- GENERATED AUTOMATICALLY BY GROUPS -->')
-            xml.append('<field name="groups_id" position="replace">')
-            xml.append('<group col="6">')
-            for app, selects in self.get_groups_by_application(cr, uid, context):
-                app_name = app and app.name or _('Other')
-                xml.append('<separator string="%s" colspan="6"/>' % app_name)
-                for gs in selects:
-                    if len(gs) == 1:
-                        field_name = name_boolean_group(gs[0].id)
-                    else:
-                        field_name = name_selection_groups(map(int, gs))
-                    xml.append('<field name="%s"/>' % field_name)
-            xml.append('</group>')
-            xml.append('</field>')
-            view.write({'arch': '\n'.join(xml)})
+            xml1, xml2 = [], []
+            xml1.append('<!-- GENERATED AUTOMATICALLY BY GROUPS -->')
+            xml1.append('<field name="groups_id" position="replace">')
+            xml1.append('<separator string="%s" colspan="4"/>' % _('Applications'))
+            for app, kind, gs in self.get_groups_by_application(cr, uid, context):
+                if kind == 'selection':
+                    # application name with a selection field
+                    field_name = name_selection_groups(map(int, gs))
+                    xml1.append('<field name="%s"/>' % field_name)
+                    xml1.append('<newline/>')
+                else:
+                    # application separator with boolean fields
+                    app_name = app and app.name or _('Other')
+                    xml2.append('<separator string="%s" colspan="4"/>' % app_name)
+                    for g in gs:
+                        field_name = name_boolean_group(g.id)
+                        xml2.append('<field name="%s"/>' % field_name)
+            xml2.append('</field>')
+            view.write({'arch': '\n'.join(xml1 + xml2)})
         return True
 
     def get_user_groups_view(self, cr, uid, context=None):
@@ -764,32 +767,22 @@ class groups_view(osv.osv):
 
     def get_groups_by_application(self, cr, uid, context=None):
         """ return all groups classified by application, as a list of pairs:
-            [(app, [[group, ...], ...]), ...], where app and group are browse records.
-            The groups of an application are given as sequences (for linear sets of groups);
-            those linear sets of groups may be shown on the screen as a selection widget.
-            Applications are given in sequence order, and groups are given in reverse implication order.
+                [(app, kind, [group, ...]), ...],
+            where app and group are browse records, and kind is either 'boolean' or 'selection'.
+            Applications are given in sequence order.  If kind is 'selection', the groups are
+            given in reverse implication order; otherwise they are given in alphabetic order.
         """
-        def linearize(groups):
-            groups = set(groups)
+        def linearized(gs):
+            gs = set(gs)
             # determine sequence order: a group appear after its implied groups
-            order = dict.fromkeys(groups, 0)
-            for g in groups:
-                for h in groups.intersection(g.trans_implied_ids):
+            order = dict.fromkeys(gs, 0)
+            for g in gs:
+                for h in gs.intersection(g.trans_implied_ids):
                     order[h] -= 1
-            groups = sorted(groups, key=lambda g: order[g])
-            # extract sequences
-            res = []
-            while groups:
-                g = groups.pop()
-                gs, nogs = partition(lambda h: h in g.trans_implied_ids, groups)
-                gs.append(g)
-                # check that gs is truly linear (sequence order are distinct)
-                if len(set(map(lambda h: order[h], gs))) == len(gs):
-                    res.append(gs)
-                    groups = nogs
-                else:
-                    res.append([g])
-            return res
+            # check linearity, i.e., whether sequence orders are distinct
+            if len(set(order.itervalues())) == len(gs):
+                return sorted(gs, key=lambda g: order[g])
+            return None
 
         # classify all groups by application
         by_app, others = {}, []
@@ -802,9 +795,13 @@ class groups_view(osv.osv):
         res = []
         apps = sorted(by_app.iterkeys(), key=lambda a: a.sequence or 0)
         for app in apps:
-            res.append((app, linearize(by_app[app])))
+            gs = linearized(by_app[app])
+            if gs:
+                res.append((app, 'selection', gs))
+            else:
+                res.append((app, 'boolean', sorted(by_app[app], key=lambda g: g.name)))
         if others:
-            res.append((False, linearize(others)))
+            res.append((False, 'boolean', sorted(others, key=lambda g: g.name)))
         return res
 
 groups_view()
@@ -870,23 +867,24 @@ class users_view(osv.osv):
     def fields_get(self, cr, uid, allfields=None, context=None, write_access=True):
         res = super(users_view, self).fields_get(cr, uid, allfields, context, write_access)
         # add reified groups fields
-        for app, selects in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
-            for gs in selects:
-                if len(gs) == 1:
-                    g = gs[0]
+        for app, kind, gs in self.pool.get('res.groups').get_groups_by_application(cr, uid, context):
+            if kind == 'selection':
+                # selection group field
+                tips = ['%s: %s' % (g.name, g.comment or '') for g in gs]
+                res[name_selection_groups(map(int, gs))] = {
+                    'type': 'selection',
+                    'string': app and app.name or _('Other'),
+                    'selection': [(g.id, g.name) for g in gs],
+                    'help': '\n'.join(tips),
+                }
+            else:
+                # boolean group fields
+                for g in gs:
                     res[name_boolean_group(g.id)] = {
                         'type': 'boolean',
                         'string': g.name,
                         'help': g.comment,
                     }
-                else:
-                    tips = ['%s: %s' % (g.name, g.comment or '') for g in gs]
-                    res[name_selection_groups(map(int, gs))] = {
-                        'type': 'selection',
-                        'string': _('Role'),
-                        'selection': [(g.id, g.name) for g in gs],
-                        'help': '\n'.join(tips),
-                    }
         return res
 
 users_view()

From a3424cf3e242a86d96bc7aa4f3092cfcf879a911 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 6 Dec 2011 17:20:20 +0100
Subject: [PATCH 040/119] [IMP] res_users: improve comments

bzr revid: rco@openerp.com-20111206162020-tql7kmggqirq0oy6
---
 openerp/addons/base/res/res_users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 0ebc42b0c30..49b2fc4d430 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -774,12 +774,12 @@ class groups_view(osv.osv):
         """
         def linearized(gs):
             gs = set(gs)
-            # determine sequence order: a group appear after its implied groups
+            # determine sequence order: a group should appear after its implied groups
             order = dict.fromkeys(gs, 0)
             for g in gs:
                 for h in gs.intersection(g.trans_implied_ids):
                     order[h] -= 1
-            # check linearity, i.e., whether sequence orders are distinct
+            # check whether order is total, i.e., sequence orders are distinct
             if len(set(order.itervalues())) == len(gs):
                 return sorted(gs, key=lambda g: order[g])
             return None

From 96878a5fc63dc09bd56599163fd1c10c7aef144f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 6 Dec 2011 17:23:56 +0100
Subject: [PATCH 041/119] [IMP] res_users: remove unused methods get_closure
 and get_maximal

bzr revid: rco@openerp.com-20111206162356-rysxwfb47h3javtg
---
 openerp/addons/base/res/res_users.py | 34 ++++++----------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 49b2fc4d430..d83d3c2b559 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -602,13 +602,6 @@ class groups_implied(osv.osv):
             type='many2many', relation='res.groups', string='Transitively inherits'),
     }
 
-    def get_closure(self, cr, uid, ids, context=None):
-        "return the reflexive transitive closure of implied_ids for group ids"
-        res = set(ids)
-        for g in self.browse(cr, 1, ids):
-            res.update(map(int, g.trans_implied_ids))
-        return list(res)
-
     def create(self, cr, uid, values, context=None):
         users = values.pop('users', None)
         gid = super(groups_implied, self).create(cr, uid, values, context)
@@ -627,20 +620,6 @@ class groups_implied(osv.osv):
                 super(groups_implied, self).write(cr, uid, gids, vals, context)
         return res
 
-    def get_maximal(self, cr, uid, ids, context=None):
-        "return the maximal element among the group ids"
-        max_set, max_closure = set(), set()
-        for gid in ids:
-            if gid not in max_closure:
-                closure = set(self.get_closure(cr, uid, [gid], context))
-                max_set -= closure          # remove implied groups from max_set
-                max_set.add(gid)            # gid is maximal
-                max_closure |= closure      # update closure of max_set
-        if len(max_set) > 1:
-            log = logging.getLogger('res.groups')
-            log.warning('Groups %s are maximal among %s, only one expected.', max_set, ids)
-        return bool(max_set) and max_set.pop()
-
 groups_implied()
 
 class users_implied(osv.osv):
@@ -661,12 +640,13 @@ class users_implied(osv.osv):
         if values.get('groups_id'):
             # add implied groups for all users
             groups_obj = self.pool.get('res.groups')
-            for u in self.browse(cr, uid, ids):
-                old_gids = map(int, u.groups_id)
-                new_gids = groups_obj.get_closure(cr, uid, old_gids, context)
-                if len(old_gids) != len(new_gids):
-                    values = {'groups_id': [(6, 0, new_gids)]}
-                    super(users_implied, self).write(cr, uid, [u.id], values, context)
+            for user in self.browse(cr, uid, ids):
+                groups = set(user.groups_id)
+                for g in user.groups_id:
+                    groups.update(g.trans_implied_ids)
+                if len(groups) != len(user.groups_id):
+                    values = {'groups_id': [(6, 0, map(int, groups))]}
+                    super(users_implied, self).write(cr, uid, [user.id], values, context)
         return res
 
 users_implied()

From fdfcf965dba684e40abae21f9e050b84b01a1ef9 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 6 Dec 2011 17:32:00 +0100
Subject: [PATCH 042/119] [IMP] res_users: remove unused stuff

bzr revid: rco@openerp.com-20111206163200-pmw8n30nlnjn3foy
---
 openerp/addons/base/res/res_users.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index d83d3c2b559..d13b53627df 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -22,11 +22,8 @@
 
 import logging
 from functools import partial
-from xml.sax.saxutils import quoteattr
 
-import simplejson
 import pytz
-from lxml import etree
 
 import netsvc
 import pooler
@@ -683,7 +680,6 @@ def get_boolean_group(name): return int(name[9:])
 def get_boolean_groups(name): return map(int, name[10:].split('_'))
 def get_selection_groups(name): return map(int, name[11:].split('_'))
 
-def encode(s): return s.encode('utf8') if isinstance(s, unicode) else s
 def partition(f, xs):
     "return a pair equivalent to (filter(f, xs), filter(lambda x: not f(x), xs))"
     yes, nos = [], []

From 92ce00ddb5ae878175bae22b2407ab0ab684ef61 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 7 Dec 2011 09:43:32 +0100
Subject: [PATCH 043/119] [IMP] res_users: simplify code

bzr revid: rco@openerp.com-20111207084332-y97sss2jx1cdztt3
---
 openerp/addons/base/res/res_users.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index d13b53627df..f3662d6ea47 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -572,6 +572,12 @@ class cset(object):
     def __iter__(self):
         return iter(self.elements)
 
+def concat(ls):
+    """ return the concatenation of a list of iterables """
+    res = []
+    for l in ls: res.extend(l)
+    return res
+
 
 
 class groups_implied(osv.osv):
@@ -636,14 +642,10 @@ class users_implied(osv.osv):
         res = super(users_implied, self).write(cr, uid, ids, values, context)
         if values.get('groups_id'):
             # add implied groups for all users
-            groups_obj = self.pool.get('res.groups')
             for user in self.browse(cr, uid, ids):
-                groups = set(user.groups_id)
-                for g in user.groups_id:
-                    groups.update(g.trans_implied_ids)
-                if len(groups) != len(user.groups_id):
-                    values = {'groups_id': [(6, 0, map(int, groups))]}
-                    super(users_implied, self).write(cr, uid, [user.id], values, context)
+                gs = set(concat([g.trans_implied_ids for g in user.groups_id]))
+                vals = {'groups_id': [(4, g.id) for g in gs]}
+                super(users_implied, self).write(cr, uid, [user.id], vals, context)
         return res
 
 users_implied()

From c029699c5e212996f60d1d7190c489683ac6292e Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 7 Dec 2011 09:44:19 +0100
Subject: [PATCH 044/119] [FIX] res_users: fix write() on selection group
 fields

bzr revid: rco@openerp.com-20111207084419-14xffbe63qa12g5y
---
 openerp/addons/base/res/res_users.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index f3662d6ea47..14f1f6b62fe 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -807,10 +807,9 @@ class users_view(osv.osv):
                 if not values.pop(k):
                     remove.extend(get_boolean_groups(k))
             elif is_selection_groups(k):
-                gid = values.pop(k)
-                if gid:
-                    remove.extend(get_selection_groups(k))
-                    add.append(gid)
+                remove.extend(get_selection_groups(k))
+                if values[k]:
+                    add.append(values.pop(k))
         if add or remove:
             # remove groups in 'remove' and add groups in 'add'
             gdiff = [(3, id) for id in remove] + [(4, id) for id in add]

From ec12c2d32a8d17ed332747943db57f08200ef591 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 7 Dec 2011 09:50:02 +0100
Subject: [PATCH 045/119] [IMP] res_users: add comments

bzr revid: rco@openerp.com-20111207085002-ft2u77qab1m259d2
---
 openerp/addons/base/res/res_users.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 14f1f6b62fe..9413a4229eb 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -660,6 +660,11 @@ users_implied()
 # - Uncategorized groups are presented as boolean fields and grouped in a
 #   section "Others".
 #
+# The user form view is modified by an inherited view (base.user_groups_view);
+# the inherited view replaces the field 'groups_id' by a set of reified group
+# fields (boolean or selection fields).  The arch of that view is regenerated
+# each time groups are changed.
+#
 # Naming conventions for reified groups fields:
 # - boolean field 'in_group_ID' is True iff
 #       ID is in 'groups_id'

From f1fc682639ac8be5a05400cc84a39a693a232a11 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 7 Dec 2011 13:11:01 +0100
Subject: [PATCH 046/119] [FIX] res_users: do not store field 'full_name' of
 groups, as this would not work with translations

bzr revid: rco@openerp.com-20111207121101-cwjvy6dfu67ryh26
---
 openerp/addons/base/res/res_users.py | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 9413a4229eb..6dc1bf1a40b 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -38,7 +38,6 @@ import openerp.exceptions
 class groups(osv.osv):
     _name = "res.groups"
     _description = "Access Groups"
-    _order = 'full_name'
     _rec_name = 'full_name'
 
     def _get_full_name(self, cr, uid, ids, field, arg, context=None):
@@ -50,12 +49,6 @@ class groups(osv.osv):
                 res[g.id] = g.name
         return res
 
-    def _from_group_ids(self, cr, uid, ids, context=None):
-        return ids
-
-    def _from_category_ids(obj, cr, uid, ids, context=None):
-        return obj.pool.get('res.groups').search(cr, uid, [('category_id', 'in', ids)], context=context)
-
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
@@ -65,15 +58,11 @@ class groups(osv.osv):
         'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
         'comment' : fields.text('Comment',size=250),
         'category_id': fields.many2one('ir.module.category', 'Application', select=True),
-        'full_name': fields.function(_get_full_name, type='char', string='Group Name',
-            store={
-                'res.groups': (_from_group_ids, ['category_id', 'name'], 10),
-                'ir.module.category': (_from_category_ids, ['name'], 10),
-            }),
+        'full_name': fields.function(_get_full_name, type='char', string='Group Name'),
     }
 
     _sql_constraints = [
-        ('name_uniq', 'unique (full_name)', 'The name of the group must be unique !')
+        ('name_uniq', 'unique (COALESCE(category_id, 0), name)', 'The name of the group must be unique !')
     ]
 
     def copy(self, cr, uid, id, default=None, context=None):

From 8059d3cadcedacab612f5e8f6ed1963d1323d6aa Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 7 Dec 2011 13:35:04 +0100
Subject: [PATCH 047/119] [IMP] res_users: improve code for arch view
 generation

bzr revid: rco@openerp.com-20111207123504-g2mvkk4g4cp0exga
---
 openerp/addons/base/res/res_users.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 6dc1bf1a40b..586e4c41584 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -708,9 +708,14 @@ class groups_view(osv.osv):
         # and introduces the reified group fields
         view = self.get_user_groups_view(cr, uid, context)
         if view:
+            xml = u"""<?xml version="1.0" encoding="utf-8"?>
+<!-- GENERATED AUTOMATICALLY BY GROUPS -->
+<field name="groups_id" position="replace">
+%s
+%s
+</field>
+"""
             xml1, xml2 = [], []
-            xml1.append('<!-- GENERATED AUTOMATICALLY BY GROUPS -->')
-            xml1.append('<field name="groups_id" position="replace">')
             xml1.append('<separator string="%s" colspan="4"/>' % _('Applications'))
             for app, kind, gs in self.get_groups_by_application(cr, uid, context):
                 if kind == 'selection':
@@ -725,8 +730,7 @@ class groups_view(osv.osv):
                     for g in gs:
                         field_name = name_boolean_group(g.id)
                         xml2.append('<field name="%s"/>' % field_name)
-            xml2.append('</field>')
-            view.write({'arch': '\n'.join(xml1 + xml2)})
+            view.write({'arch': xml % ('\n'.join(xml1), '\n'.join(xml2))})
         return True
 
     def get_user_groups_view(self, cr, uid, context=None):

From ae4fd210a117fe25da528ea90ac37c05a32a71c0 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Thu, 8 Dec 2011 11:45:46 +0530
Subject: [PATCH 048/119] [IMP] hr_expense: improve test case of expense
 process

bzr revid: jap@tinyerp.com-20111208061546-iuy49ixlowv4cxiz
---
 addons/hr_expense/__openerp__.py           |  2 +-
 addons/hr_expense/hr_expense_demo.xml      |  4 +--
 addons/hr_expense/test/expense_demo.yml    |  6 ++---
 addons/hr_expense/test/expense_process.yml | 30 ++++++++++++++--------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 1114cf3c18a..0d7be99c030 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -63,8 +63,8 @@ re-invoice your customer's expenses if your work by project.
         'hr_expense_demo.xml',
         ],
     'test': [
-             'test/expense_process.yml',
              'test/expense_demo.yml',
+             'test/expense_process.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 7e079b21e14..6e575aec782 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="hr.employee3" model="hr.employee">
+        <record id="hr.employee4" model="hr.employee">
             <field name="address_home_id" ref="base.res_partner_address_1"/>
         </record>
 
@@ -34,7 +34,7 @@
         </record>
 
         <record id="sep_expenses" model="hr.expense.expense">
-            <field name="employee_id" ref="hr.employee3"/>
+            <field name="employee_id" ref="hr.employee4"/>
             <field name="name">September Expenses</field>
             <field name="date" eval="time.strftime('%Y-09-28')"/>
         </record>
diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
index cd88448fefa..c5cc9001a5e 100644
--- a/addons/hr_expense/test/expense_demo.yml
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -1,7 +1,7 @@
 -
-  !record {model: hr.expense.expense, id: hr.employee3, view: False}:
-    employee_id: 'hr.employee3'
-    name : 'Antoine Philippe'
+  !record {model: hr.expense.expense, id: hr_expense01, view: False}:
+    employee_id: 'hr.employee4'
+    name : 'John Smith'
 -
   !record {model: product.product, id: car_travel, view: False}:
     hr_expense_ok: 'True'
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index 654b28bde5e..1c02e4b6f5c 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -1,25 +1,35 @@
 -
-  In Order to test process of "Employee Expenses".
+  I test the process of "Employee Expenses" by processing the expenses of an employee for September month
 -
-  I confirm "Expense Bill of September" for one employee of Marketing Department.
+  I check that state is 'Draft'.
+-
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Draft state}:
+    - state == 'draft'
+-
+  I change the state. 
 -
   !workflow {model: hr.expense.expense, action: confirm, ref: sep_expenses}
 -
-  I check state of expense after confirmed.
+  I check that state is 'Confirm'.
 -
-  !assert {model: hr.expense.expense, id: sep_expenses}:
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Confirm state}:
     - state == 'confirm'
 -
-  I accept this expense.
+  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 after invoiced.
+  I check invoice details.
 -
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
@@ -31,17 +41,17 @@
     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"
 -
-  I paid the expense.
+  I pay the expenses.
 -
   !python {model: hr.expense.expense}: |
     self.expense_paid(cr, uid, [ref('sep_expenses')])
 -
-  I check the expense after paid.
+  I check that state of expenses is 'Paid'.
 -
-  !assert {model: hr.expense.expense, id: sep_expenses}:
+  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Paid state}:
     - state == 'paid'
 -
-  I print this expense.
+  I print a report of the expenses.
 - 
   !python {model: hr.expense.expense}: |
     import netsvc, tools, os

From 5c37c81f5dd6c659861d3c80dd35c2e5c374cf80 Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Thu, 8 Dec 2011 12:20:32 +0530
Subject: [PATCH 049/119] [IMP] hr_expense: improve yml test process

bzr revid: jap@tinyerp.com-20111208065032-wdy6302ojngksw5g
---
 addons/hr_expense/test/expense_demo.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
index c5cc9001a5e..59a7c729bd8 100644
--- a/addons/hr_expense/test/expense_demo.yml
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -1,5 +1,5 @@
 -
-  !record {model: hr.expense.expense, id: hr_expense01, view: False}:
+  !record {model: hr.expense.expense, id: sep_expenses, view: False}:
     employee_id: 'hr.employee4'
     name : 'John Smith'
 -

From 44d56c5bea5ae7948006a90bc8320a3bc4240961 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 9 Dec 2011 13:00:04 +0530
Subject: [PATCH 050/119] [IMP] improvement in code

bzr revid: tpa@tinyerp.com-20111209073004-ll1y70suz5oo0yv5
---
 addons/project/__openerp__.py           |  1 +
 addons/project/project.py               |  5 +++--
 addons/project/test/project_demo.yml    | 12 ++++++++++++
 addons/project/test/project_process.yml | 16 ++++++++++------
 addons/project/test/task_process.yml    | 16 ++++++++++++----
 5 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 addons/project/test/project_demo.yml

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index c9484ae9dd8..1a03232e628 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -63,6 +63,7 @@ Dashboard for project members that includes:
     'test':[
         'test/project_process.yml',
         'test/task_process.yml',
+        'test/project_demo.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project/project.py b/addons/project/project.py
index 1fc83771005..c2dc37b062b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -111,6 +111,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):
@@ -357,7 +358,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])
         )
@@ -1016,7 +1017,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)])
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
index 1c0c7a18713..d162a5e5ba2 100644
--- a/addons/project/test/project_process.yml
+++ b/addons/project/test/project_process.yml
@@ -17,8 +17,7 @@
   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"
-
+    - state == "open"
 -
   I put project in pending.
 -
@@ -28,7 +27,7 @@
   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"
+    - state == "pending"
 -
   I re-open the project.
 -
@@ -38,7 +37,7 @@
   I check state after reopen.
 -
   !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be open.}:
-       - state == "open"
+    - state == "open"
 -
   I close the project.
 -
@@ -48,7 +47,7 @@
   I check state after closed.
 -
   !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be close.}:
-       - state == "close"
+    - state == "close"
 -
   I set project into template.
 -
@@ -59,8 +58,13 @@
 -
   !python {model: project.project}: |
     self.schedule_tasks(cr, uid, [ref("project_integrate_openerp")], context=context)
+-
+  I set 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")])
+    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
index e294b117397..a12877526c1 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -39,6 +39,11 @@
 -
   !record {model: project.task.reevaluate, id: reevaluate_id}:
     remaining_hours : 120
+-
+  I chnge the stage of task to next stage
+-
+  !python {model: project.task}: |
+    self.prev_type(cr, uid, [ref("project_task_1")])
 -
   I reevaluate task with remaining hours.
 -
@@ -49,11 +54,16 @@
 -
   !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
     - remaining_hours == 120.0
+-
+  I chnge the stage of task to next stage
+-
+  !python {model: project.task}: |
+    self.next_type(cr, uid, [ref("project_task_1")])
 -
   I close the task.
 -
   !python {model: project.task}: |
-    self.do_close(cr, uid, [ref("project_task_1")])
+    self.action_close(cr, uid, [ref("project_task_1")])
 -
   I check state after closed.
 -
@@ -63,6 +73,4 @@
   I cancel Task.
 -
   !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_2")])
-
-
+    self.do_cancel(cr, uid, [ref("project_task_2")])
\ No newline at end of file

From e46d052ec0a607d2d8209a59197cdbf62d4a69ce Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 9 Dec 2011 13:03:08 +0530
Subject: [PATCH 051/119] [IMP] improvement in code

bzr revid: tpa@tinyerp.com-20111209073308-e1xw8ay7f4ep6ed6
---
 addons/project_long_term/project_long_term.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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:

From 0940bea6f1895a8dfa7b27b39063d36c088a53e8 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 09:02:39 +0100
Subject: [PATCH 052/119] [IMP] make module category and group names
 translatable

bzr revid: rco@openerp.com-20111209080239-n58y4se9n6pjcll2
---
 openerp/addons/base/module/module.py | 4 ++--
 openerp/addons/base/res/res_users.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index fd69c0750ab..47000e9a358 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -71,12 +71,12 @@ class module_category(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char("Name", size=128, required=True, select=True),
+        'name': fields.char("Name", size=128, required=True, translate=True, select=True),
         'parent_id': fields.many2one('ir.module.category', 'Parent Application', select=True),
         'child_ids': fields.one2many('ir.module.category', 'parent_id', 'Child Applications'),
         'module_nr': fields.function(_module_nbr, method=True, string='Number of Modules', type='integer'),
         'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
-        'description' : fields.text("Description"),
+        'description' : fields.text("Description", translate=True),
         'sequence' : fields.integer('Sequence'),
         'visible' : fields.boolean('Visible'),
     }
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 586e4c41584..121ba9a3998 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -56,7 +56,7 @@ class groups(osv.osv):
         'rule_groups': fields.many2many('ir.rule', 'rule_group_rel',
             'group_id', 'rule_group_id', 'Rules', domain=[('global', '=', False)]),
         'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
-        'comment' : fields.text('Comment',size=250),
+        'comment' : fields.text('Comment', size=250, translate=True),
         'category_id': fields.many2one('ir.module.category', 'Application', select=True),
         'full_name': fields.function(_get_full_name, type='char', string='Group Name'),
     }

From cda72d1e9609ed496fafe608a7bb1af270374681 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 09:03:19 +0100
Subject: [PATCH 053/119] [IMP] res_users: implement sorting on full_name

bzr revid: rco@openerp.com-20111209080319-otm4tr2ezw60109l
---
 openerp/addons/base/res/res_users.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 121ba9a3998..6a36596a4cc 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -65,6 +65,16 @@ class groups(osv.osv):
         ('name_uniq', 'unique (COALESCE(category_id, 0), name)', 'The name of the group must be unique !')
     ]
 
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        # add explicit ordering if search is sorted on full_name
+        if order and order.startswith('full_name'):
+            ids = super(groups, self).search(cr, uid, args, context=context)
+            gs = self.browse(cr, uid, ids, context)
+            gs.sort(key=lambda g: g.full_name, reverse=order.endswith('DESC'))
+            gs = gs[offset:offset+limit] if limit else gs[offset:]
+            return map(int, gs)
+        return super(groups, self).search(cr, uid, args, offset, limit, order, context, count)
+
     def copy(self, cr, uid, id, default=None, context=None):
         group_name = self.read(cr, uid, [id], ['name'])[0]['name']
         default.update({'name': _('%s (copy)')%group_name})

From 823c79f510275e1d4bf79205b1cf6a9e04b039f3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 09:11:10 +0100
Subject: [PATCH 054/119] [FIX] res_users: avoid coalesce in uniqueness
 constraint (not well supported)

bzr revid: rco@openerp.com-20111209081110-88zlxdt46tq4is4l
---
 openerp/addons/base/res/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 6a36596a4cc..be9d4df2f28 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -62,7 +62,7 @@ class groups(osv.osv):
     }
 
     _sql_constraints = [
-        ('name_uniq', 'unique (COALESCE(category_id, 0), name)', 'The name of the group must be unique !')
+        ('name_uniq', 'unique (category_id, name)', 'The name of the group must be unique !')
     ]
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):

From 7b052fa0a3cdc88bf6456526a2e6ff0a8cbcf522 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 9 Dec 2011 14:31:23 +0530
Subject: [PATCH 055/119] [IMP] change string

bzr revid: tpa@tinyerp.com-20111209090123-12kku4od5n0g3ejb
---
 addons/project/test/task_process.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index a12877526c1..0938e649785 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -40,7 +40,7 @@
   !record {model: project.task.reevaluate, id: reevaluate_id}:
     remaining_hours : 120
 -
-  I chnge the stage of task to next stage
+  I chnge the stage of task to previous stage
 -
   !python {model: project.task}: |
     self.prev_type(cr, uid, [ref("project_task_1")])

From 251dc86e6725d36bd6aec3e03400d8bfb1864a87 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 10:27:00 +0100
Subject: [PATCH 056/119] [IMP] res_users: improve get_groups_by_application

bzr revid: rco@openerp.com-20111209092700-v7vbcgmliydmo6up
---
 openerp/addons/base/res/res_users.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index be9d4df2f28..47ced81e32d 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -752,11 +752,11 @@ class groups_view(osv.osv):
         return view
 
     def get_groups_by_application(self, cr, uid, context=None):
-        """ return all groups classified by application, as a list of pairs:
+        """ return all groups classified by application (module category), as a list of pairs:
                 [(app, kind, [group, ...]), ...],
             where app and group are browse records, and kind is either 'boolean' or 'selection'.
             Applications are given in sequence order.  If kind is 'selection', the groups are
-            given in reverse implication order; otherwise they are given in alphabetic order.
+            given in reverse implication order.
         """
         def linearized(gs):
             gs = set(gs)
@@ -785,9 +785,9 @@ class groups_view(osv.osv):
             if gs:
                 res.append((app, 'selection', gs))
             else:
-                res.append((app, 'boolean', sorted(by_app[app], key=lambda g: g.name)))
+                res.append((app, 'boolean', by_app[app]))
         if others:
-            res.append((False, 'boolean', sorted(others, key=lambda g: g.name)))
+            res.append((False, 'boolean', others))
         return res
 
 groups_view()

From 41501317ed25571f11b23886f08b8de369c7707c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 11:30:53 +0100
Subject: [PATCH 057/119] [FIX] res_users: group fields shall be removed before
 write

bzr revid: rco@openerp.com-20111209103053-wnolmypihzj95b9u
---
 openerp/addons/base/res/res_users.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 47ced81e32d..b808db4f2a5 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -816,8 +816,9 @@ class users_view(osv.osv):
                     remove.extend(get_boolean_groups(k))
             elif is_selection_groups(k):
                 remove.extend(get_selection_groups(k))
-                if values[k]:
-                    add.append(values.pop(k))
+                selected = values.pop(k)
+                if selected:
+                    add.append(selected)
         if add or remove:
             # remove groups in 'remove' and add groups in 'add'
             gdiff = [(3, id) for id in remove] + [(4, id) for id in add]

From ace110935c2275ce17781358011c29cdaa3aba00 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 11:35:53 +0100
Subject: [PATCH 058/119] [IMP] module: improve form view of ir.module.category

bzr revid: rco@openerp.com-20111209103553-rizqndp6ucf0mk4n
---
 openerp/addons/base/module/module_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 76aec91b98e..32529880865 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -11,8 +11,10 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <form string="Module Category">
-                    <field colspan="4" name="name"/>
-                    <field colspan="4" name="parent_id"/>
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                    <field name="sequence"/>
+                    <field name="description" colspan="4"/>
                 </form>
             </field>
         </record>

From 978299a26c79e674eac66d90ca502c229316e056 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Fri, 9 Dec 2011 16:43:36 +0530
Subject: [PATCH 059/119] [IMP]:added default icon for kanban and gantt view

lp bug: https://launchpad.net/bugs/901601 fixed

bzr revid: nch@tinyerp.com-20111209111336-8sqgc9z9ska1yer8
---
 openerp/tools/convert.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 66522f47c8b..cad34d0e1f9 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -638,7 +638,9 @@ form: module.record_id""" % (xml_id,)
                     action_mode, = cr.fetchone()
                 if action_type=='tree':
                     values['icon'] = 'STOCK_INDENT'
-                elif action_mode and action_mode.startswith('tree'):
+                elif action_mode and ( action_mode.startswith('tree') 
+                                       or  action_mode.startswith('kanban') 
+                                       or  action_mode.startswith('gantt')):
                     values['icon'] = 'STOCK_JUSTIFY_FILL'
                 elif action_mode and action_mode.startswith('graph'):
                     values['icon'] = 'terp-graph'

From e85fd9b68533e86b9364fd008b2a86da892e0f6b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 13:48:21 +0100
Subject: [PATCH 060/119] [IMP] res_users: add domain when searching for groups
 by application

bzr revid: rco@openerp.com-20111209124821-vcvsjlwacb3xtz90
---
 openerp/addons/base/res/res_users.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index b808db4f2a5..1d898d019bf 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -698,6 +698,9 @@ def partition(f, xs):
 class groups_view(osv.osv):
     _inherit = 'res.groups'
 
+    # this defines a domain for searching all groups in get_groups_by_application()
+    groups_by_application_domain = []
+
     def create(self, cr, uid, values, context=None):
         res = super(groups_view, self).create(cr, uid, values, context)
         self.update_user_groups_view(cr, uid, context)
@@ -771,8 +774,9 @@ class groups_view(osv.osv):
             return None
 
         # classify all groups by application
+        gids = self.search(cr, uid, self.groups_by_application_domain)
         by_app, others = {}, []
-        for g in self.browse(cr, uid, self.search(cr, uid, []), context):
+        for g in self.browse(cr, uid, gids, context):
             if g.category_id:
                 by_app.setdefault(g.category_id, []).append(g)
             else:

From 6f1eebd5a2c18bae40d59d66026bcbc4a88c63b5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 13:57:41 +0100
Subject: [PATCH 061/119] [FIX] share: add domain to hide share groups from the
 res.users form

bzr revid: rco@openerp.com-20111209125741-1b4um49lcdqb3j73
---
 addons/share/res_users.py       |  8 +++++++-
 addons/share/res_users_view.xml | 12 ------------
 2 files changed, 7 insertions(+), 13 deletions(-)

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>

From a15cfa48c65e0ebf90f64693a4f65cc1da887a37 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 14:46:58 +0100
Subject: [PATCH 062/119] [IMP] res_users: improve create, write, read, and
 default_get with group fields

bzr revid: rco@openerp.com-20111209134658-vmvfvlngoa1wd7y1
---
 openerp/addons/base/res/res_users.py | 79 ++++++++++++++--------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 1d898d019bf..8f157881940 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -800,59 +800,60 @@ class users_view(osv.osv):
     _inherit = 'res.users'
 
     def create(self, cr, uid, values, context=None):
-        self._process_values_groups(cr, uid, values, context)
+        self._set_reified_groups(values)
         return super(users_view, self).create(cr, uid, values, context)
 
     def write(self, cr, uid, ids, values, context=None):
-        self._process_values_groups(cr, uid, values, context)
+        self._set_reified_groups(values)
         return super(users_view, self).write(cr, uid, ids, values, context)
 
-    def _process_values_groups(self, cr, uid, values, context=None):
-        """ transform all reified group fields into a 'groups_id', adding 
-            also the implied groups """
+    def _set_reified_groups(self, values):
+        """ reflect reified group fields in values into 'groups_id' """
         add, remove = [], []
-        for k in values.keys():
-            if is_boolean_group(k):
-                target = add if values.pop(k) else remove
-                target.append(get_boolean_group(k))
-            elif is_boolean_groups(k):
-                if not values.pop(k):
-                    remove.extend(get_boolean_groups(k))
-            elif is_selection_groups(k):
-                remove.extend(get_selection_groups(k))
-                selected = values.pop(k)
+        for f in values.keys():
+            if is_boolean_group(f):
+                target = add if values.pop(f) else remove
+                target.append(get_boolean_group(f))
+            elif is_boolean_groups(f):
+                if not values.pop(f):
+                    remove.extend(get_boolean_groups(f))
+            elif is_selection_groups(f):
+                remove.extend(get_selection_groups(f))
+                selected = values.pop(f)
                 if selected:
                     add.append(selected)
-        if add or remove:
-            # remove groups in 'remove' and add groups in 'add'
-            gdiff = [(3, id) for id in remove] + [(4, id) for id in add]
-            values.setdefault('groups_id', []).extend(gdiff)
-        return True
+        # remove groups in 'remove' and add groups in 'add'
+        gdiff = [(3, id) for id in remove] + [(4, id) for id in add]
+        values.setdefault('groups_id', []).extend(gdiff)
+
+    def default_get(self, cr, uid, fields, context=None):
+        group_fields, fields = partition(is_reified_group, fields)
+        fields.append('groups_id')
+        values = super(users_view, self).default_get(cr, uid, fields, context)
+        self._get_reified_groups(group_fields, values)
+        return values
 
     def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
         if not fields:
             fields = self.fields_get(cr, uid, context=context).keys()
         group_fields, fields = partition(is_reified_group, fields)
+        fields.append('groups_id')
+        res = super(users_view, self).read(cr, uid, ids, fields, context=context, load=load)
+        for values in (res if isinstance(res, list) else [res]):
+            self._get_reified_groups(group_fields, values)
+        return res
 
-        if group_fields:
-            # first read the normal fields (and 'groups_id')
-            fields.append('groups_id')
-            res = super(users_view, self).read(cr, uid, ids, fields, context=context, load=load)
-            # add reified groups fields in result(s)
-            records = res if isinstance(res, list) else [res]
-            for record in records:
-                user_group_ids = set(record['groups_id'])
-                for f in group_fields:
-                    if is_boolean_group(f):
-                        record[f] = get_boolean_group(f) in user_group_ids
-                    elif is_boolean_groups(f):
-                        record[f] = not user_group_ids.isdisjoint(get_boolean_groups(f))
-                    elif is_selection_groups(f):
-                        selected = [gid for gid in get_selection_groups(f) if gid in user_group_ids]
-                        record[f] = selected and selected[-1] or False
-            return res
-
-        return super(users_view, self).read(cr, uid, ids, fields, context=context, load=load)
+    def _get_reified_groups(self, fields, values):
+        """ compute the given reified group fields in the dictionary values """
+        gids = set(values.get('groups_id') or [])
+        for f in fields:
+            if is_boolean_group(f):
+                values[f] = get_boolean_group(f) in gids
+            elif is_boolean_groups(f):
+                values[f] = not gids.isdisjoint(get_boolean_groups(f))
+            elif is_selection_groups(f):
+                selected = [gid for gid in get_selection_groups(f) if gid in gids]
+                values[f] = selected and selected[-1] or False
 
     def fields_get(self, cr, uid, allfields=None, context=None, write_access=True):
         res = super(users_view, self).fields_get(cr, uid, allfields, context, write_access)

From 6ae2f3b3e6b06569f28c9117beed6d6305a8502a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 9 Dec 2011 16:18:55 +0100
Subject: [PATCH 063/119] [FIX] res_users: ignore group fields in create and
 write when 'groups_id' is given

bzr revid: rco@openerp.com-20111209151855-hw23dp6a3ycs3pj8
---
 openerp/addons/base/res/res_users.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 8f157881940..d437a0e4351 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -808,7 +808,13 @@ class users_view(osv.osv):
         return super(users_view, self).write(cr, uid, ids, values, context)
 
     def _set_reified_groups(self, values):
-        """ reflect reified group fields in values into 'groups_id' """
+        """ reflect reified group fields in values['groups_id'] """
+        if 'groups_id' in values:
+            # groups are already given, ignore group fields
+            for f in filter(is_reified_group, values.iterkeys()):
+                del values[f]
+            return
+
         add, remove = [], []
         for f in values.keys():
             if is_boolean_group(f):
@@ -823,13 +829,12 @@ class users_view(osv.osv):
                 if selected:
                     add.append(selected)
         # remove groups in 'remove' and add groups in 'add'
-        gdiff = [(3, id) for id in remove] + [(4, id) for id in add]
-        values.setdefault('groups_id', []).extend(gdiff)
+        values['groups_id'] = [(3, id) for id in remove] + [(4, id) for id in add]
 
     def default_get(self, cr, uid, fields, context=None):
         group_fields, fields = partition(is_reified_group, fields)
-        fields.append('groups_id')
-        values = super(users_view, self).default_get(cr, uid, fields, context)
+        fields1 = (fields + ['groups_id']) if group_fields else fields
+        values = super(users_view, self).default_get(cr, uid, fields1, context)
         self._get_reified_groups(group_fields, values)
         return values
 
@@ -844,7 +849,7 @@ class users_view(osv.osv):
         return res
 
     def _get_reified_groups(self, fields, values):
-        """ compute the given reified group fields in the dictionary values """
+        """ compute the given reified group fields from values['groups_id'] """
         gids = set(values.get('groups_id') or [])
         for f in fields:
             if is_boolean_group(f):

From 607fa699d634d0aa4c34a8a00b8f43ff332c5a06 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 9 Dec 2011 17:31:14 +0100
Subject: [PATCH 064/119] [IMP] fire the bbq

bzr revid: chs@openerp.com-20111209163114-23c0orpwbqom4js9
---
 addons/web/__openerp__.py          |   3 +
 addons/web/static/src/js/chrome.js | 114 +++++++++++++++++++++++++++--
 addons/web/static/src/js/core.js   |  16 ++++
 addons/web/static/src/js/views.js  |  81 +++++++++++---------
 4 files changed, 174 insertions(+), 40 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 3767072ff9d..a82759af85f 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -36,6 +36,9 @@
         "static/lib/underscore/underscore.string.js",
         "static/lib/labjs/LAB.src.js",
         "static/lib/py.parse/lib/py.js",
+        #"static/lib/history.js/scripts/bundled/html4+html5/jquery.history.js",
+        #"static/lib/history.js/scripts/uncompressed/history.adapter.jquery.js",
+        #"static/lib/history.js/scripts/uncompressed/history.js",
         "static/src/js/boot.js",
         "static/src/js/core.js",
         "static/src/js/dates.js",
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3c212616496..2bf7451c52a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1011,6 +1011,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.session.on_session_valid.add_last(this.header.do_update);
         this.session.on_session_invalid.add_last(this.header.do_update);
         this.session.on_session_valid.add_last(this.on_logged);
+        this.session.on_session_invalid.add_last(this.on_logged_out);
 
         this.menu = new openerp.web.Menu(this, "oe_menu", "oe_secondary_menu");
         this.menu.on_action.add(this.on_menu_action);
@@ -1047,37 +1048,131 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             this.action_manager.stop();
         this.action_manager = new openerp.web.ActionManager(this);
         this.action_manager.appendTo($("#oe_app"));
-        this.action_manager.do_url_set_hash.add_last(this.do_url_set_hash);
+        //this.action_manager.do_url_set_hash.add_last(this.do_url_set_hash);
 
         // if using saved actions, load the action and give it to action manager
-        var parameters = jQuery.deparam(jQuery.param.querystring());
+        /*var parameters = jQuery.deparam(jQuery.param.querystring());
         if (parameters["s_action"] != undefined) {
             var key = parseInt(parameters["s_action"], 10);
             var self = this;
             this.rpc("/web/session/get_session_action", {key:key}, function(action) {
                 self.action_manager.do_action(action);
             });
-        } else if (openerp._modules_loaded) { // TODO: find better option than this
-            this.load_url_state()
+        } else /**/ if (openerp._modules_loaded) { // TODO: find better option than this
+            //this.load_url_state()
+            this.bind_statechange();
         } else {
-            this.session.on_modules_loaded.add({
-                callback: $.proxy(this, 'load_url_state'),
+            this.session.on_modules_loaded.add({        // XXX what about a $.Deferred ?
+                //callback: $.proxy(this, 'load_url_state'),
+                callback: $.proxy(this, 'bind_statechange'),
                 unique: true,
                 position: 'last'
             })
         }
     },
+
+    //state_change_event: 'popstate', //statechange
+    state_change_event: 'hashchange',
+    
+    bind_statechange: function() {
+        console.log('bind', this.state_change_event);
+        $(window).bind(this.state_change_event, this.on_state_change);
+        var self = this;
+
+        self.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
+        return;
+        //var state = window.History.getState(false, false);
+        //if (state) {
+        //    this.$element.trigger('statechange')
+        //} else 
+        {
+            var ds = new openerp.web.DataSetSearch(this, 'res.users');
+            ds.read_ids([this.session.uid], ['action_id'], function (users) {
+                var home_action = users[0].action_id;
+                if (!home_action) {
+                    self.default_home();
+                    return;
+                }
+                self.do_action(home_action[0]);
+            });
+        }
+
+    },
+
+    on_logged_out: function() {
+        if(this.action_manager)
+            this.action_manager.stop();
+        this.action_manager = null;
+        $(window).unbind(this.state_change_event, this.on_state_change);
+    },
+
+    on_state_change: function(event) {
+        // as this method is bound to a event via jQuery, the argument is the jQuery Event.. we need to get the current state
+        //var state = window.History.getState();
+        //var state = event.getState(true);       // = bbq.getState, in fact only deparam the hash
+        //var state = window.history.state;
+        //if (!state) {
+            // chrome
+        //    state = event.originalEvent.state;
+        //}
+        //var h_state = window.History.getState();
+        //var hash = window.History.getHash();
+        //console.log('getState+Hash', h_state, hash);
+        //var state = $.deparam(hash, true); 
+        var state = $.deparam.fragment(true);
+        console.log('onstatechange', event, state);
+        return this._super(state);
+    },
+
+
+    
+    do_push_state: function(state, extend) {
+        if (extend) {
+            var hash = $.deparam.fragment(true);
+            state = _.extend({}, hash, state);
+        }
+        var url = '#' + $.param(state);
+        //console.log('pushstate', state, url);
+        //window.History.pushState(state, '', url);
+        //window.history.pushState(state, '', url);
+
+        //var state = this.get_state();
+        console.log('pushstate', state);
+        //$.bbq.pushState(state, 0);      // will set the hash, so will call on_state_change
+        window.history.pushState(null, '', url); 
+        //window.location.hash = url;
+
+    },
+
+    /*
+    do_replace_state: function(state) {
+        //var hash = window.History.getHash();
+        var hash = $.deparam.fragment(true);
+        state = _.extend({}, hash, state);
+        var url = '#' + $.param(state);
+        //window.History.replaceState(state, '', url);
+        //window.history.replaceState(state, '', url);
+        
+        //var state = this.get_state();
+        console.log('replacestate', state);
+        //$.bbq.pushState(state, 0);      // FIXME cannot have the "no history" behavior
+        window.history.replaceState(null, '', url);
+        //window.location.hash = url;
+    },
+    /*/
+
     /**
      * Loads state from URL if any, or checks if there is a home action and
      * loads that, assuming we're at the index
      */
-    load_url_state: function () {
+    /*load_url_state: function () {
         var self = this;
         // TODO: add actual loading if there is url state to unpack, test on window.location.hash
         // not logged in
         if (!this.session.uid) { return; }
         self.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
     },
+    */
     default_home: function () {
     },
     /**
@@ -1101,12 +1196,15 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             self.action_manager.do_action(action);
         });
     },
+    /*/
     do_url_set_hash: function(url) {
         if(!this.url_external_hashchange) {
             this.url_internal_hashchange = true;
             jQuery.bbq.pushState(url);
         }
     },
+    //*/
+    /*/
     on_url_hashchange: function() {
         if(this.url_internal_hashchange) {
             this.url_internal_hashchange = false;
@@ -1117,6 +1215,8 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             this.url_external_hashchange = false;
         }
     },
+    //*/
+
     on_menu_action: function(action) {
         this.action_manager.do_action(action);
     },
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index c9255d31949..e3a32342af7 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -985,6 +985,22 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         }
         return false;
     },
+
+    do_push_state: function(state) {
+        // create a new state
+        if (this.widget_parent) {
+            return this.widget_parent.do_push_state.apply(this,arguments);
+        }
+        //this.on_state_change(state); 
+        return null;
+    },
+
+    on_state_change: function(state) {
+        _.each(this.widget_children, function(child) {
+            child.on_state_change(state);
+        });
+    },
+
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index e11c0c20f04..13f74330a21 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -24,6 +24,7 @@ session.web.ActionManager = session.web.Widget.extend({
         this.dialog = null;
         this.dialog_viewmanager = null;
         this.client_widget = null;
+        this.client_widget_name = null;
     },
     render: function() {
         return "<div id='"+this.element_id+"'></div>";
@@ -44,37 +45,39 @@ session.web.ActionManager = session.web.Widget.extend({
         if (this.client_widget) {
             this.client_widget.stop();
             this.client_widget = null;
+            this.client_widget_name = null;
         }
     },
-    url_update: function(action) {
-        var url = {};
-        if(action.id)
-            url.action_id = action.id;
-        // this.url = {
-        //     "model": action.res_model,
-        //     "domain": action.domain,
-        // };
-        // action.res_model
-        // action.domain
-        // action.context
-        // after
-        // action.views
-        // action.res_id
-        // mode
-        // menu
-        this.do_url_set_hash(url);
-    },
-    do_url_set_hash: function(url) {
-    },
-    on_url_hashchange: function(url) {
-        var self = this;
-        if(url && url.action_id) {
-            self.rpc("/web/action/load", { action_id: url.action_id }, function(result) {
-                    self.do_action(result.result);
-                });
+
+    on_state_change: function(state) {
+        console.log(this.identifier_prefix, 'state change', state);
+        
+        if (state.action_id) {
+            var run_action = (!this.inner_viewmanager) || this.inner_viewmanager.action.id !== state.action_id;
+            if (run_action) {
+                this.null_action();
+                this.do_action(state.action_id);
+            }
         }
+        else if (state.client_action) {
+            var run_client = (!this.client_widget) || this.client_widget_name === state.client_action.tag;
+            if (run_client) {
+                this.null_action();
+                this.ir_actions_client(state.client_action);
+            }
+        }
+
+        return this._super.apply(this, arguments);
     },
+
     do_action: function(action, on_close) {
+        if (_.isNumber(action)) {
+            var self = this;
+            self.rpc("/web/action/load", { action_id: action }, function(result) {
+                self.do_action(result.result, on_close);
+            });
+            return;
+        }
         if (!action.type) {
             console.error("No type for action", action);
             return;
@@ -124,14 +127,10 @@ session.web.ActionManager = session.web.Widget.extend({
             this.content_stop();
             this.inner_viewmanager = new session.web.ViewManagerAction(this, action);
             this.inner_viewmanager.appendTo(this.$element);
-            this.url_update(action);
+            if (action.id) {
+                this.do_push_state({action_id: action.id});
+            }
         }
-        /* new window code
-            this.rpc("/web/session/save_session_action", { the_action : action}, function(key) {
-                var url = window.location.protocol + "//" + window.location.host + window.location.pathname + "?" + jQuery.param({ s_action : "" + key });
-                window.open(url,'_blank');
-            });
-        */
     },
     ir_actions_act_window_close: function (action, on_closed) {
         if (!this.dialog && on_closed) {
@@ -152,6 +151,12 @@ session.web.ActionManager = session.web.Widget.extend({
         this.content_stop();
         var ClientWidget = session.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this);
+        this.client_widget_name = action.tag;
+
+        var client_action = {tag: action.tag};
+        if (action.params) _.extend(client_action, {params: action.params});
+
+        this.do_push_state({client_action: client_action});
     },
     ir_actions_report_xml: function(action, on_closed) {
         var self = this;
@@ -301,9 +306,19 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
         $.when(view_promise).then(function () {
             self.$element.find('.oe_view_title_text:first').text(
                     self.display_title());
+            self.do_push_state({view_type: self.active_view}, true);
         });
         return view_promise;
     },
+
+    on_state_change: function(state) {
+        console.log(this.identifier_prefix, 'state change', state);
+        if (state.view_type && state.view_type !== this.active_view) {
+            this.on_mode_switch(state.view_type, true);
+        }
+        return this._super.apply(this, arguments);
+    },
+
     /**
      * Returns to the view preceding the caller view in this manager's
      * navigation history (the navigation history is appended to via

From 053270ae0d6e638789726fc3f0035a1efbf180f0 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 12 Dec 2011 17:27:57 +0530
Subject: [PATCH 065/119] [IMP] improved YML test case of Project

bzr revid: tpa@tinyerp.com-20111212115757-ad9q8xzm8b38k2mo
---
 addons/project/__openerp__.py           | 2 +-
 addons/project/test/project_process.yml | 2 +-
 addons/project/test/task_process.yml    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 1a03232e628..067c0b4d452 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -61,9 +61,9 @@ Dashboard for project members that includes:
         'project_demo.xml',
     ],
     'test':[
+        'test/project_demo.yml',
         'test/project_process.yml',
         'test/task_process.yml',
-        'test/project_demo.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
index d162a5e5ba2..3c51c464b1f 100644
--- a/addons/project/test/project_process.yml
+++ b/addons/project/test/project_process.yml
@@ -59,7 +59,7 @@
   !python {model: project.project}: |
     self.schedule_tasks(cr, uid, [ref("project_integrate_openerp")], context=context)
 -
-  I set copy the tasks of project.
+  I copy the tasks of project.
 -
   !python {model: project.project}: |
     self.template_copy(cr, uid, ref("project_integrate_openerp"))
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index 0938e649785..3d9edb54e57 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -40,10 +40,10 @@
   !record {model: project.task.reevaluate, id: reevaluate_id}:
     remaining_hours : 120
 -
-  I chnge the stage of task to previous stage
+  I change the stage of task to next stage.
 -
   !python {model: project.task}: |
-    self.prev_type(cr, uid, [ref("project_task_1")])
+    self.next_type(cr, uid, [ref("project_task_1")])
 -
   I reevaluate task with remaining hours.
 -
@@ -55,10 +55,10 @@
   !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
     - remaining_hours == 120.0
 -
-  I chnge the stage of task to next stage
+  I change the stage of task to previous stage.
 -
   !python {model: project.task}: |
-    self.next_type(cr, uid, [ref("project_task_1")])
+    self.prev_type(cr, uid, [ref("project_task_1")])
 -
   I close the task.
 -

From 97424370c6dc8646e7e094d9da94eb33eeeabae5 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 12 Dec 2011 17:58:58 +0530
Subject: [PATCH 066/119] [IMP] improved YML test case of Project

bzr revid: tpa@tinyerp.com-20111212122858-hcmybqd9sinpfzs8
---
 addons/project/test/task_process.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index 3d9edb54e57..73250de2963 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -36,14 +36,14 @@
 -
   !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
     - state == "open"
--
-  !record {model: project.task.reevaluate, id: reevaluate_id}:
-    remaining_hours : 120
 -
   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.
 -
@@ -54,11 +54,6 @@
 -
   !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
     - remaining_hours == 120.0
--
-  I change the stage of task to previous stage.
--
-  !python {model: project.task}: |
-    self.prev_type(cr, uid, [ref("project_task_1")])
 -
   I close the task.
 -
@@ -69,6 +64,11 @@
 -
   !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.
 -

From c0755c42187739697de16f90ec970f2e3478a26c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 14:35:23 +0100
Subject: [PATCH 067/119] [IMP] account, analytic, auction: add group
 categories

bzr revid: rco@openerp.com-20111212133523-ea0r5b47mc5tddl7
---
 addons/account/security/account_security.xml         |  9 ++++++---
 .../security/account_payment_security.xml            |  3 ++-
 addons/analytic/security/analytic_security.xml       |  3 ++-
 addons/auction/security/auction_security.xml         | 12 ++++++++++--
 4 files changed, 20 insertions(+), 7 deletions(-)

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/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 4bae0c30ce6..91b65785d7b 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -3,7 +3,8 @@
 <data noupdate="1">
 
     <record id="group_account_payment" model="res.groups">
-        <field name="name">Accounting / Payments</field>
+        <field name="name">Payments</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
     </record>
     <record id="account.group_account_invoice" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('group_account_payment'))]"/>
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>
 

From 857e45e84ce4adf2636686f368da674c901a658d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 14:43:54 +0100
Subject: [PATCH 068/119] [IMP] base_contact, crm, document, event: add group
 categories

bzr revid: rco@openerp.com-20111212134354-49p2gyf93qozplll
---
 .../base_contact/security/base_contact_security.xml  |  6 ++++--
 addons/crm/security/crm_security.xml                 |  9 ++++++---
 addons/document/security/document_security.xml       |  3 ++-
 addons/event/security/event_security.xml             | 12 ++++++++----
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
index 56a995c76a8..29b16893ef2 100644
--- a/addons/base_contact/security/base_contact_security.xml
+++ b/addons/base_contact/security/base_contact_security.xml
@@ -3,11 +3,13 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </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"/>
     </record>
     
 </data>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 8ac32086cfd..635ed5f5fe6 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/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/security/event_security.xml b/addons/event/security/event_security.xml
index c3c70c94d93..091aaef03a1 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -3,20 +3,24 @@
   <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>
 
     <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"/>
     </record>
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
   </data>
 </openerp>

From 084c5d9289e914bf871c5b01802b4e44c164f16b Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 14:49:38 +0100
Subject: [PATCH 069/119] [IMP] hr, idea, knowledge, lunch: add group
 categories

bzr revid: rco@openerp.com-20111212134938-xwfnq4d3ks1awuu9
---
 addons/hr/security/hr_security.xml               |  6 ++++--
 addons/idea/security/idea_security.xml           |  6 ++++--
 addons/knowledge/security/knowledge_security.xml | 15 +++++++++------
 addons/lunch/security/lunch_security.xml         |  6 ++++--
 4 files changed, 21 insertions(+), 12 deletions(-)

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/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..80bce33e7e4 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -1,13 +1,16 @@
 <?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_sale_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
+    </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/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>
 

From 85b3757a60d0672b370f4320a4ce0bdebfd7557d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 14:57:31 +0100
Subject: [PATCH 070/119] [IMP] marketing, mrp, point_of_sale, portal: add
 group categories

bzr revid: rco@openerp.com-20111212135731-gdccm6nwt7ic00t4
---
 addons/marketing/security/marketing_security.xml     |  6 ++++--
 addons/mrp/security/mrp_security.xml                 |  6 ++++--
 .../security/point_of_sale_security.xml              |  6 ++++--
 addons/portal/security/portal_security.xml           | 12 ++++++++++--
 4 files changed, 22 insertions(+), 8 deletions(-)

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/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/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 14c9e96df9e..2516f1e3ddb 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'))]"/>
     </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>

From 5aa61b26e8fd2baeb286c85304cb592941c39ca0 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 15:05:28 +0100
Subject: [PATCH 071/119] [IMP] product, project, purchase,
 purchase_requisition: add group categories

bzr revid: rco@openerp.com-20111212140528-g8oxverkipswionf
---
 addons/product/security/product_security.xml         | 12 ++++++++----
 addons/project/security/project_security.xml         |  9 ++++++---
 addons/purchase/security/purchase_security.xml       |  6 ++++--
 .../security/purchase_tender.xml                     | 12 ++++++++++--
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index d9f14a13225..59d93fd2b3d 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -3,14 +3,17 @@
 <data noupdate="1">
 
     <record id="group_uos" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Useability / Product UoS View</field>
+        <field name="name">Product UoS View</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </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"/>
     </record>
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="product_comp_rule" model="ir.rule">
@@ -21,7 +24,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/project/security/project_security.xml b/addons/project/security/project_security.xml
index 62f74f51d1b..69f4dff9a83 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -3,16 +3,19 @@
 <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>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record model="ir.ui.menu" id="menu_definitions">
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_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>
     

From 00fbd705f645cbbe6b44f7c2940b943c140c1e10 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 15:11:31 +0100
Subject: [PATCH 072/119] [IMP] sale, sale_crm, share, stock: add group
 categories

bzr revid: rco@openerp.com-20111212141131-5yhvgd2pjx60seo1
---
 addons/sale/security/sale_security.xml         |  9 ++++++---
 addons/sale_mrp/security/sale_mrp_security.xml | 10 ++++++----
 addons/share/security/share_security.xml       | 11 +++++++++--
 addons/stock/security/stock_security.xml       |  6 ++++--
 4 files changed, 25 insertions(+), 11 deletions(-)

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_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml
index c0139329d1e..7b5d00c55fc 100644
--- a/addons/sale_mrp/security/sale_mrp_security.xml
+++ b/addons/sale_mrp/security/sale_mrp_security.xml
@@ -2,12 +2,14 @@
 <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_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
+    </record>
     
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
 </data>
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>
 

From 642c8e040a13a1a1eec29f70415ed9d495b72a51 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 12 Dec 2011 15:20:12 +0100
Subject: [PATCH 073/119] [FIX] cleaning url managment

bzr revid: chs@openerp.com-20111212142012-cb5p5oxu2fzmcil2
---
 addons/web/__openerp__.py          |   3 -
 addons/web/static/src/js/chrome.js | 112 +++--------------------------
 addons/web/static/src/js/views.js  |  70 +++++++++++-------
 3 files changed, 54 insertions(+), 131 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index a82759af85f..3767072ff9d 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -36,9 +36,6 @@
         "static/lib/underscore/underscore.string.js",
         "static/lib/labjs/LAB.src.js",
         "static/lib/py.parse/lib/py.js",
-        #"static/lib/history.js/scripts/bundled/html4+html5/jquery.history.js",
-        #"static/lib/history.js/scripts/uncompressed/history.adapter.jquery.js",
-        #"static/lib/history.js/scripts/uncompressed/history.js",
         "static/src/js/boot.js",
         "static/src/js/core.js",
         "static/src/js/dates.js",
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2bf7451c52a..cf7b9d305c1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1048,22 +1048,11 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             this.action_manager.stop();
         this.action_manager = new openerp.web.ActionManager(this);
         this.action_manager.appendTo($("#oe_app"));
-        //this.action_manager.do_url_set_hash.add_last(this.do_url_set_hash);
 
-        // if using saved actions, load the action and give it to action manager
-        /*var parameters = jQuery.deparam(jQuery.param.querystring());
-        if (parameters["s_action"] != undefined) {
-            var key = parseInt(parameters["s_action"], 10);
-            var self = this;
-            this.rpc("/web/session/get_session_action", {key:key}, function(action) {
-                self.action_manager.do_action(action);
-            });
-        } else /**/ if (openerp._modules_loaded) { // TODO: find better option than this
-            //this.load_url_state()
+        if (openerp._modules_loaded) { // TODO: find better option than this
             this.bind_statechange();
         } else {
             this.session.on_modules_loaded.add({        // XXX what about a $.Deferred ?
-                //callback: $.proxy(this, 'load_url_state'),
                 callback: $.proxy(this, 'bind_statechange'),
                 unique: true,
                 position: 'last'
@@ -1071,32 +1060,17 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         }
     },
 
-    //state_change_event: 'popstate', //statechange
     state_change_event: 'hashchange',
     
     bind_statechange: function() {
-        console.log('bind', this.state_change_event);
         $(window).bind(this.state_change_event, this.on_state_change);
-        var self = this;
 
-        self.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
-        return;
-        //var state = window.History.getState(false, false);
-        //if (state) {
-        //    this.$element.trigger('statechange')
-        //} else 
-        {
-            var ds = new openerp.web.DataSetSearch(this, 'res.users');
-            ds.read_ids([this.session.uid], ['action_id'], function (users) {
-                var home_action = users[0].action_id;
-                if (!home_action) {
-                    self.default_home();
-                    return;
-                }
-                self.do_action(home_action[0]);
-            });
+        var state = $.bbq.getState(true);
+        if (! _.isEmpty(state)) {
+            $(window).trigger(this.state_change_event);
+        } else {
+            this.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
         }
-
     },
 
     on_logged_out: function() {
@@ -1108,19 +1082,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
 
     on_state_change: function(event) {
         // as this method is bound to a event via jQuery, the argument is the jQuery Event.. we need to get the current state
-        //var state = window.History.getState();
-        //var state = event.getState(true);       // = bbq.getState, in fact only deparam the hash
-        //var state = window.history.state;
-        //if (!state) {
-            // chrome
-        //    state = event.originalEvent.state;
-        //}
-        //var h_state = window.History.getState();
-        //var hash = window.History.getHash();
-        //console.log('getState+Hash', h_state, hash);
-        //var state = $.deparam(hash, true); 
-        var state = $.deparam.fragment(true);
-        console.log('onstatechange', event, state);
+        var state = event.getState(true);       // = bbq.getState, in fact only deparam the hash
         return this._super(state);
     },
 
@@ -1132,47 +1094,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             state = _.extend({}, hash, state);
         }
         var url = '#' + $.param(state);
-        //console.log('pushstate', state, url);
-        //window.History.pushState(state, '', url);
-        //window.history.pushState(state, '', url);
-
-        //var state = this.get_state();
-        console.log('pushstate', state);
-        //$.bbq.pushState(state, 0);      // will set the hash, so will call on_state_change
-        window.history.pushState(null, '', url); 
-        //window.location.hash = url;
-
+        $.bbq.pushState(url);      // will set the hash, so will call on_state_change
     },
 
-    /*
-    do_replace_state: function(state) {
-        //var hash = window.History.getHash();
-        var hash = $.deparam.fragment(true);
-        state = _.extend({}, hash, state);
-        var url = '#' + $.param(state);
-        //window.History.replaceState(state, '', url);
-        //window.history.replaceState(state, '', url);
-        
-        //var state = this.get_state();
-        console.log('replacestate', state);
-        //$.bbq.pushState(state, 0);      // FIXME cannot have the "no history" behavior
-        window.history.replaceState(null, '', url);
-        //window.location.hash = url;
-    },
-    /*/
-
-    /**
-     * Loads state from URL if any, or checks if there is a home action and
-     * loads that, assuming we're at the index
-     */
-    /*load_url_state: function () {
-        var self = this;
-        // TODO: add actual loading if there is url state to unpack, test on window.location.hash
-        // not logged in
-        if (!this.session.uid) { return; }
-        self.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
-    },
-    */
     default_home: function () {
     },
     /**
@@ -1196,26 +1120,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             self.action_manager.do_action(action);
         });
     },
-    /*/
-    do_url_set_hash: function(url) {
-        if(!this.url_external_hashchange) {
-            this.url_internal_hashchange = true;
-            jQuery.bbq.pushState(url);
-        }
-    },
-    //*/
-    /*/
-    on_url_hashchange: function() {
-        if(this.url_internal_hashchange) {
-            this.url_internal_hashchange = false;
-        } else {
-            var url = jQuery.deparam.fragment();
-            this.url_external_hashchange = true;
-            this.action_manager.on_url_hashchange(url);
-            this.url_external_hashchange = false;
-        }
-    },
-    //*/
 
     on_menu_action: function(action) {
         this.action_manager.do_action(action);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 13f74330a21..86aa8828caa 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -49,21 +49,32 @@ session.web.ActionManager = session.web.Widget.extend({
         }
     },
 
-    on_state_change: function(state) {
-        console.log(this.identifier_prefix, 'state change', state);
-        
-        if (state.action_id) {
-            var run_action = (!this.inner_viewmanager) || this.inner_viewmanager.action.id !== state.action_id;
-            if (run_action) {
-                this.null_action();
-                this.do_action(state.action_id);
-            }
+    handle_state: function() {
+        // Only root ActionManager handle the state
+        return this.widget_parent instanceof session.web.WebClient;
+    },
+
+    do_push_state: function(state, extend) {
+        if (this.handle_state()) {
+            this._super.apply(this, arguments);
         }
-        else if (state.client_action) {
-            var run_client = (!this.client_widget) || this.client_widget_name === state.client_action.tag;
-            if (run_client) {
-                this.null_action();
-                this.ir_actions_client(state.client_action);
+    },
+
+    on_state_change: function(state) {
+        if (this.handle_state()) { 
+            if (state.action_id) {
+                var run_action = (!this.inner_viewmanager) || this.inner_viewmanager.action.id !== state.action_id;
+                if (run_action) {
+                    this.null_action();
+                    this.do_action(state.action_id);
+                }
+            }
+            else if (state.client_action) {
+                var run_client = (!this.client_widget) || this.client_widget_name !== state.client_action.tag;
+                if (run_client) {
+                    this.null_action();
+                    this.ir_actions_client(state.client_action);
+                }
             }
         }
 
@@ -149,13 +160,12 @@ session.web.ActionManager = session.web.Widget.extend({
     },
     ir_actions_client: function (action) {
         this.content_stop();
+        this.client_widget_name = action.tag;
         var ClientWidget = session.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this);
-        this.client_widget_name = action.tag;
 
         var client_action = {tag: action.tag};
         if (action.params) _.extend(client_action, {params: action.params});
-
         this.do_push_state({client_action: client_action});
     },
     ir_actions_report_xml: function(action, on_closed) {
@@ -306,18 +316,10 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
         $.when(view_promise).then(function () {
             self.$element.find('.oe_view_title_text:first').text(
                     self.display_title());
-            self.do_push_state({view_type: self.active_view}, true);
         });
         return view_promise;
     },
 
-    on_state_change: function(state) {
-        console.log(this.identifier_prefix, 'state change', state);
-        if (state.view_type && state.view_type !== this.active_view) {
-            this.on_mode_switch(state.view_type, true);
-        }
-        return this._super.apply(this, arguments);
-    },
 
     /**
      * Returns to the view preceding the caller view in this manager's
@@ -538,8 +540,28 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
             } else {
                 $search_prefix.remove();
             }
+
+            self.do_push_state({view_type: self.active_view}, true);
         });
     },
+
+    handle_state: function() {
+        return (this.widget_parent instanceof session.web.ActionManager) && this.widget_parent.handle_state();
+    },
+
+    do_push_state: function(state, extend) {
+        if (this.handle_state()) {
+            this._super.apply(this, arguments);
+        }
+    },
+
+    on_state_change: function(state) {
+        if (this.handle_state() && state.view_type && state.view_type !== this.active_view) {
+            this.on_mode_switch(state.view_type, true);
+        }
+        return this._super.apply(this, arguments);
+    },
+
     shortcut_check : function(view) {
         var self = this;
         var grandparent = this.widget_parent && this.widget_parent.widget_parent;

From 49a7682479682068c97069c1d7997e7a04ef64a6 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 15:21:21 +0100
Subject: [PATCH 074/119] [IMP] subscription, survey, wiki: add group
 categories

bzr revid: rco@openerp.com-20111212142121-jly0qs05n2tvk1wh
---
 addons/subscription/security/subcription_security.xml | 6 ++++--
 addons/survey/security/survey_security.xml            | 6 ++++--
 addons/wiki/security/wiki_security.xml                | 9 ++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

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>

From 48b53165ea1c16038377217d5e3e517cdaa552df Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 15:39:56 +0100
Subject: [PATCH 075/119] [FIX] account_payment: something wrong with group
 Accounting / Payments

bzr revid: rco@openerp.com-20111212143956-rhiwojhs3m26jmhw
---
 addons/account_payment/security/account_payment_security.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 91b65785d7b..4bae0c30ce6 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -3,8 +3,7 @@
 <data noupdate="1">
 
     <record id="group_account_payment" model="res.groups">
-        <field name="name">Payments</field>
-        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
+        <field name="name">Accounting / Payments</field>
     </record>
     <record id="account.group_account_invoice" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('group_account_payment'))]"/>

From 70bb0dd8109a5fba81ebb13175a3c03398d7a73a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 15:51:28 +0100
Subject: [PATCH 076/119] [IMP] base_contact, event, knowledge, product,
 project, sale_mrp: avoid redefinition of sale groups

bzr revid: rco@openerp.com-20111212145128-zx64v0uwf8n0lwyu
---
 addons/base_contact/__openerp__.py            |  1 -
 .../security/base_contact_security.xml        | 16 -----------
 addons/event/__openerp__.py                   |  1 -
 addons/event/security/event_security.xml      | 27 -------------------
 .../knowledge/security/knowledge_security.xml |  5 ----
 addons/product/security/product_security.xml  |  9 -------
 addons/project/security/project_security.xml  |  5 ----
 addons/sale_mrp/__openerp__.py                |  1 -
 .../sale_mrp/security/sale_mrp_security.xml   | 16 -----------
 9 files changed, 81 deletions(-)
 delete mode 100644 addons/base_contact/security/base_contact_security.xml
 delete mode 100644 addons/event/security/event_security.xml
 delete mode 100644 addons/sale_mrp/security/sale_mrp_security.xml

diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index f5969b6e309..74720eb3011 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 29b16893ef2..00000000000
--- a/addons/base_contact/security/base_contact_security.xml
+++ /dev/null
@@ -1,16 +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">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-    
-</data>
-</openerp>
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index abd3f6393b5..283bd03ce30 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',
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
deleted file mode 100644
index 091aaef03a1..00000000000
--- a/addons/event/security/event_security.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record id="marketing.group_marketing_user" model="res.groups">
-        <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">Manager</field>
-        <field name="category_id" ref="base.module_category_marketing"/>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-  </data>
-</openerp>
-
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index 80bce33e7e4..560fdce0506 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -2,11 +2,6 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </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"/>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 59d93fd2b3d..5c993b9cd61 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -7,15 +7,6 @@
         <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
     <record id="product_comp_rule" model="ir.rule">
         <field name="name" >Product multi-company</field>
         <field name="model_id" ref="model_product_template"/>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 69f4dff9a83..f1e3a6e9b74 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -13,11 +13,6 @@
         <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
     </record>
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </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/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 7b5d00c55fc..00000000000
--- a/addons/sale_mrp/security/sale_mrp_security.xml
+++ /dev/null
@@ -1,16 +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">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-    
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
-</data>
-</openerp>

From 12ce7180882bb6aedc97ff6f1f17b0b5ea4c1929 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 12 Dec 2011 17:44:55 +0100
Subject: [PATCH 077/119] [IMP] limit the hash managment to the actionmanager
 of the webclient (and its viewmanager and views)

bzr revid: chs@openerp.com-20111212164455-44l31w1jr1sm2mg0
---
 addons/web/static/src/js/chrome.js | 30 +++++------
 addons/web/static/src/js/core.js   | 15 ------
 addons/web/static/src/js/views.js  | 83 ++++++++++++++++--------------
 3 files changed, 56 insertions(+), 72 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index cf7b9d305c1..0e332252341 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1047,54 +1047,50 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         if(this.action_manager)
             this.action_manager.stop();
         this.action_manager = new openerp.web.ActionManager(this);
+        this.action_manager.do_push_state.add(this.do_push_state);
         this.action_manager.appendTo($("#oe_app"));
 
         if (openerp._modules_loaded) { // TODO: find better option than this
-            this.bind_statechange();
+            this.bind_hashchange();
         } else {
             this.session.on_modules_loaded.add({        // XXX what about a $.Deferred ?
-                callback: $.proxy(this, 'bind_statechange'),
+                callback: $.proxy(this, 'bind_hashchange'),
                 unique: true,
                 position: 'last'
             })
         }
     },
 
-    state_change_event: 'hashchange',
-    
-    bind_statechange: function() {
-        $(window).bind(this.state_change_event, this.on_state_change);
+    bind_hashchange: function() {
+        $(window).bind('hashchange', this.on_hashchange);
 
         var state = $.bbq.getState(true);
         if (! _.isEmpty(state)) {
-            $(window).trigger(this.state_change_event);
+            $(window).trigger('hashchange');
         } else {
             this.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
         }
     },
 
     on_logged_out: function() {
+        $(window).unbind('hashchange', this.on_hashchange);
         if(this.action_manager)
             this.action_manager.stop();
         this.action_manager = null;
-        $(window).unbind(this.state_change_event, this.on_state_change);
     },
 
-    on_state_change: function(event) {
-        // as this method is bound to a event via jQuery, the argument is the jQuery Event.. we need to get the current state
-        var state = event.getState(true);       // = bbq.getState, in fact only deparam the hash
-        return this._super(state);
+    on_hashchange: function(event) {
+        var state = event.getState(true);
+        this.action_manager.do_load_state(state);
     },
 
-
-    
-    do_push_state: function(state, extend) {
-        if (extend) {
+    do_push_state: function(state, overwrite) {
+        if (!overwrite) {
             var hash = $.deparam.fragment(true);
             state = _.extend({}, hash, state);
         }
         var url = '#' + $.param(state);
-        $.bbq.pushState(url);      // will set the hash, so will call on_state_change
+        $.bbq.pushState(url);
     },
 
     default_home: function () {
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index e3a32342af7..1962cc440c7 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -986,21 +986,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W
         return false;
     },
 
-    do_push_state: function(state) {
-        // create a new state
-        if (this.widget_parent) {
-            return this.widget_parent.do_push_state.apply(this,arguments);
-        }
-        //this.on_state_change(state); 
-        return null;
-    },
-
-    on_state_change: function(state) {
-        _.each(this.widget_children, function(child) {
-            child.on_state_change(state);
-        });
-    },
-
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 86aa8828caa..0c0fc74514e 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -49,36 +49,28 @@ session.web.ActionManager = session.web.Widget.extend({
         }
     },
 
-    handle_state: function() {
-        // Only root ActionManager handle the state
-        return this.widget_parent instanceof session.web.WebClient;
+    do_push_state: function(state, overwrite) {
     },
 
-    do_push_state: function(state, extend) {
-        if (this.handle_state()) {
-            this._super.apply(this, arguments);
-        }
-    },
-
-    on_state_change: function(state) {
-        if (this.handle_state()) { 
-            if (state.action_id) {
-                var run_action = (!this.inner_viewmanager) || this.inner_viewmanager.action.id !== state.action_id;
-                if (run_action) {
-                    this.null_action();
-                    this.do_action(state.action_id);
-                }
+    do_load_state: function(state) {
+        if (state.action_id) {
+            var run_action = (!this.inner_viewmanager) || this.inner_viewmanager.action.id !== state.action_id;
+            if (run_action) {
+                this.null_action();
+                this.do_action(state.action_id);
             }
-            else if (state.client_action) {
-                var run_client = (!this.client_widget) || this.client_widget_name !== state.client_action.tag;
-                if (run_client) {
-                    this.null_action();
-                    this.ir_actions_client(state.client_action);
-                }
+        }
+        else if (state.client_action) {
+            var run_client = (!this.client_widget) || this.client_widget_name !== state.client_action.tag;
+            if (run_client) {
+                this.null_action();
+                this.ir_actions_client(state.client_action);
             }
         }
 
-        return this._super.apply(this, arguments);
+        if (this.inner_viewmanager) {
+            this.inner_viewmanager.do_load_state(state);
+        }
     },
 
     do_action: function(action, on_close) {
@@ -137,9 +129,10 @@ session.web.ActionManager = session.web.Widget.extend({
             this.dialog_stop();
             this.content_stop();
             this.inner_viewmanager = new session.web.ViewManagerAction(this, action);
+            this.inner_viewmanager.do_push_state.add(this.do_push_state);
             this.inner_viewmanager.appendTo(this.$element);
             if (action.id) {
-                this.do_push_state({action_id: action.id});
+                this.do_push_state({action_id: action.id}, true);
             }
         }
     },
@@ -166,7 +159,7 @@ session.web.ActionManager = session.web.Widget.extend({
 
         var client_action = {tag: action.tag};
         if (action.params) _.extend(client_action, {params: action.params});
-        this.do_push_state({client_action: client_action});
+        this.do_push_state({client_action: client_action}, true);
     },
     ir_actions_report_xml: function(action, on_closed) {
         var self = this;
@@ -283,7 +276,7 @@ session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.View
             var container = $("#" + this.element_id + '_view_' + view_type);
             view_promise = controller.appendTo(container);
             this.views[view_type].controller = controller;
-            this.views[view_type].deferred.resolve();
+            this.views[view_type].deferred.resolve(view_type);
             $.when(view_promise).then(function() {
                 self.on_controller_inited(view_type, controller);
                 if (self.searchview && view.controller.searchable !== false) {
@@ -467,6 +460,12 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
 
         var main_view_loaded = this._super();
 
+        _.each(_.keys(this.views), function(view_type) {
+            $.when(self.views[view_type].deferred).done(function(view_type) {
+                self.views[view_type].controller.do_push_state.add(self.do_push_state);
+            });
+        });
+
         var manager_ready = $.when(searchview_loaded, main_view_loaded);
 
         this.$element.find('.oe_get_xml_view').click(function () {
@@ -541,25 +540,23 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
                 $search_prefix.remove();
             }
 
-            self.do_push_state({view_type: self.active_view}, true);
+            self.do_push_state({view_type: self.active_view});
         });
     },
 
-    handle_state: function() {
-        return (this.widget_parent instanceof session.web.ActionManager) && this.widget_parent.handle_state();
+    do_push_state: function(state, overwrite) {
     },
 
-    do_push_state: function(state, extend) {
-        if (this.handle_state()) {
-            this._super.apply(this, arguments);
-        }
-    },
+    do_load_state: function(state) {
+        var self = this,
+            defs = [];
+        if (state.view_type && state.view_type !== this.active_view) {
+            defs.push(this.on_mode_switch(state.view_type, true));
+        } 
 
-    on_state_change: function(state) {
-        if (this.handle_state() && state.view_type && state.view_type !== this.active_view) {
-            this.on_mode_switch(state.view_type, true);
-        }
-        return this._super.apply(this, arguments);
+        $.when(defs).then(function() {
+            self.views[self.active_view].controller.do_load_state(state);
+        });
     },
 
     shortcut_check : function(view) {
@@ -1127,6 +1124,12 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
     },
     sidebar_context: function () {
         return $.Deferred().resolve({}).promise();
+    },
+
+    do_push_state: function(state, overwrite) {
+    },
+
+    do_load_state: function(state) {
     }
 });
 

From faf59411b4c7e3f249925dfaeb666708262c56ab Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 13 Dec 2011 05:33:44 +0100
Subject: [PATCH 078/119] [IMP] Burndown chart & Cumulative Flow, Planned vs
 Remaining Time on kanban

bzr revid: fp@tinyerp.com-20111213043344-2nodtou03uy9zyo8
---
 addons/project/project.py                    | 25 +++++++++------
 addons/project/project_view.xml              |  1 +
 addons/project/report/project_cumulative.xml | 32 ++++++++++++++++++--
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 5c234cf5e26..8688f4ebc9b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -920,21 +920,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 +982,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,
@@ -1158,7 +1162,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 +1191,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..9e58946bf73 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="Open and validate estimated time" type="object" icon="kanban-apply"/>
                                             </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>

From 83d8c1902f4d10011c265fd577a9a7159001fb63 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 13 Dec 2011 05:38:59 +0100
Subject: [PATCH 079/119] [IMP] kanban design

bzr revid: fp@tinyerp.com-20111213043859-rs4ifnro6hcwtsbj
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9e58946bf73..22fc175246e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -378,7 +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="Open and validate estimated time" type="object" icon="kanban-apply"/>
+                                                <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"/>

From 7a05330a305b5b5bce760e4a10d40277cfcd55ac Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 13 Dec 2011 05:47:51 +0100
Subject: [PATCH 080/119] [IMP] better filter on tasks analysis

bzr revid: fp@tinyerp.com-20111213044751-qwi3hz3ocsmb3iyl
---
 addons/project/report/project_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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>
 

From 78f56f29f2469f2e4a398d7d6cbdcafaa622341c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 13 Dec 2011 05:02:09 +0000
Subject: [PATCH 081/119] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111213050134-6nnnre8jpmgfexbf
bzr revid: launchpad_translations_on_behalf_of_openerp-20111213050209-stiq9yo8ce9z4lrl
---
 addons/mrp/i18n/hr.po                        |  583 ++++----
 addons/mrp_jit/i18n/hr.po                    |   27 +-
 addons/mrp_operations/i18n/hr.po             |  233 ++--
 addons/mrp_repair/i18n/hr.po                 |  264 ++--
 addons/mrp_subproduct/i18n/hr.po             |   40 +-
 addons/multi_company/i18n/hr.po              |   27 +-
 addons/outlook/i18n/hr.po                    |  161 +++
 addons/pad/i18n/hr.po                        |   77 ++
 addons/point_of_sale/i18n/hr.po              |  444 +++----
 addons/procurement/i18n/hr.po                |   22 +-
 addons/profile_tools/i18n/hr.po              |  153 +++
 addons/project_issue_sheet/i18n/hr.po        |   77 ++
 addons/project_long_term/i18n/hr.po          |  625 +++++++++
 addons/project_mailgate/i18n/hr.po           |  107 ++
 addons/project_messages/i18n/hr.po           |  144 ++
 addons/project_mrp/i18n/hr.po                |   74 +-
 addons/project_planning/i18n/hr.po           |  180 +--
 addons/project_retro_planning/i18n/hr.po     |   16 +-
 addons/project_timesheet/i18n/hr.po          |  113 +-
 addons/purchase/i18n/hr.po                   |  520 ++++----
 addons/purchase_analytic_plans/i18n/hr.po    |   20 +-
 addons/purchase_double_validation/i18n/hr.po |   88 ++
 addons/report_designer/i18n/hr.po            |  107 ++
 addons/sale_crm/i18n/hr.po                   |   60 +-
 addons/sale_journal/i18n/hr.po               |   63 +-
 openerp/addons/base/i18n/af.po               |    4 +-
 openerp/addons/base/i18n/am.po               |    4 +-
 openerp/addons/base/i18n/ar.po               |    4 +-
 openerp/addons/base/i18n/bg.po               |    4 +-
 openerp/addons/base/i18n/bs.po               |    4 +-
 openerp/addons/base/i18n/ca.po               |    4 +-
 openerp/addons/base/i18n/cs.po               |    4 +-
 openerp/addons/base/i18n/da.po               |   34 +-
 openerp/addons/base/i18n/de.po               |    8 +-
 openerp/addons/base/i18n/el.po               |    4 +-
 openerp/addons/base/i18n/en_GB.po            |    4 +-
 openerp/addons/base/i18n/es.po               |    4 +-
 openerp/addons/base/i18n/es_CL.po            |    4 +-
 openerp/addons/base/i18n/es_EC.po            |    4 +-
 openerp/addons/base/i18n/et.po               |    4 +-
 openerp/addons/base/i18n/eu.po               |    4 +-
 openerp/addons/base/i18n/fa.po               |    4 +-
 openerp/addons/base/i18n/fa_AF.po            |    4 +-
 openerp/addons/base/i18n/fi.po               |    4 +-
 openerp/addons/base/i18n/fr.po               |   63 +-
 openerp/addons/base/i18n/gl.po               |    4 +-
 openerp/addons/base/i18n/he.po               |    4 +-
 openerp/addons/base/i18n/hr.po               |    4 +-
 openerp/addons/base/i18n/hu.po               | 1242 +++++++++---------
 openerp/addons/base/i18n/hy.po               |    4 +-
 openerp/addons/base/i18n/id.po               |    4 +-
 openerp/addons/base/i18n/is.po               |    4 +-
 openerp/addons/base/i18n/it.po               |    4 +-
 openerp/addons/base/i18n/ja.po               |    4 +-
 openerp/addons/base/i18n/kk.po               |    4 +-
 openerp/addons/base/i18n/ko.po               |    4 +-
 openerp/addons/base/i18n/lt.po               |    4 +-
 openerp/addons/base/i18n/lv.po               |    4 +-
 openerp/addons/base/i18n/mk.po               |    4 +-
 openerp/addons/base/i18n/mn.po               |    4 +-
 openerp/addons/base/i18n/nb.po               |    4 +-
 openerp/addons/base/i18n/nl.po               |    4 +-
 openerp/addons/base/i18n/nl_BE.po            |    4 +-
 openerp/addons/base/i18n/pl.po               |    4 +-
 openerp/addons/base/i18n/pt.po               |   41 +-
 openerp/addons/base/i18n/pt_BR.po            |   21 +-
 openerp/addons/base/i18n/ro.po               |    4 +-
 openerp/addons/base/i18n/ru.po               |    4 +-
 openerp/addons/base/i18n/sk.po               |    4 +-
 openerp/addons/base/i18n/sl.po               |    4 +-
 openerp/addons/base/i18n/sq.po               |    4 +-
 openerp/addons/base/i18n/sr.po               |    4 +-
 openerp/addons/base/i18n/sr@latin.po         |    4 +-
 openerp/addons/base/i18n/sv.po               |    4 +-
 openerp/addons/base/i18n/th.po               |    4 +-
 openerp/addons/base/i18n/tlh.po              |    4 +-
 openerp/addons/base/i18n/tr.po               |    4 +-
 openerp/addons/base/i18n/uk.po               |    4 +-
 openerp/addons/base/i18n/ur.po               |    4 +-
 openerp/addons/base/i18n/vi.po               |    4 +-
 openerp/addons/base/i18n/zh_CN.po            |    6 +-
 openerp/addons/base/i18n/zh_HK.po            |    4 +-
 openerp/addons/base/i18n/zh_TW.po            |    4 +-
 83 files changed, 3864 insertions(+), 1980 deletions(-)
 create mode 100644 addons/outlook/i18n/hr.po
 create mode 100644 addons/pad/i18n/hr.po
 create mode 100644 addons/profile_tools/i18n/hr.po
 create mode 100644 addons/project_issue_sheet/i18n/hr.po
 create mode 100644 addons/project_long_term/i18n/hr.po
 create mode 100644 addons/project_mailgate/i18n/hr.po
 create mode 100644 addons/project_messages/i18n/hr.po
 create mode 100644 addons/purchase_double_validation/i18n/hr.po
 create mode 100644 addons/report_designer/i18n/hr.po

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_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/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/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_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/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_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_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/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_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/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index f99afdd5d3d..e2a04bd4468 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:47+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:54+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index f556682977a..481a31a01c2 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:47+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:54+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index dd0faf0f0cd..c04713b5fa3 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ 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-05 05:21+0000\n"
-"X-Generator: Launchpad (build 14418)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:54+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 2177474a3c8..3df6d85b82c 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 6d72e655d95..8ddb998c33e 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 5cf9b043f3a..899a07934b9 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 6c7e2d3b8bc..f0a2837e6aa 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
-"X-Generator: Launchpad (build 14381)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 3a60c74050a..9f6844f0dc4 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -29,12 +29,12 @@ msgstr "Domæne"
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr "Sankt Helena"
+msgstr "St. Helena"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Andre indstillinger"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -64,7 +64,7 @@ msgstr "Vis arkitektur"
 #. module: base
 #: field:base.language.import,code:0
 msgid "Code (eg:en__US)"
-msgstr ""
+msgstr "Kode (f.eks.: en_US)"
 
 #. module: base
 #: view:workflow:0
@@ -79,32 +79,32 @@ msgstr "Arbejdsgang"
 #. module: base
 #: view:partner.sms.send:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "SMS-gateway: clickatell"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
-msgstr ""
+msgstr "Ungarsk / Magyar"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Not Searchable"
-msgstr ""
+msgstr "Ikke søgbar"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (VE) / Español (VE)"
-msgstr ""
+msgstr "Spansk (VE) / Español (VE)"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr ""
+msgstr "Arbejdsgang aktiv"
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
 msgid "Display Menu Tips"
-msgstr ""
+msgstr "Vis menutips"
 
 #. module: base
 #: view:ir.module.module:0
@@ -130,7 +130,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Reference"
 
 #. module: base
 #: field:ir.actions.act_window,target:0
@@ -160,7 +160,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
 msgid "ir.ui.view.custom"
-msgstr ""
+msgstr "ir.ui.view.custom"
 
 #. module: base
 #: model:res.country,name:base.sz
@@ -177,7 +177,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
 msgid "Wood Suppliers"
-msgstr ""
+msgstr "Træleverandører"
 
 #. module: base
 #: code:addons/base/module/module.py:303
@@ -190,7 +190,7 @@ msgstr ""
 #. module: base
 #: field:ir.sequence,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "Nr. stiger med"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_company_tree
@@ -206,7 +206,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Søg kontakt"
 
 #. module: base
 #: code:addons/base/res/res_user.py:132
@@ -223,7 +223,7 @@ msgstr "ny"
 #. module: base
 #: field:ir.actions.report.xml,multi:0
 msgid "On multiple doc."
-msgstr ""
+msgstr "På flere dokumenter"
 
 #. module: base
 #: field:ir.module.category,module_nr:0
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 69a6e81aa08..6d96dbe475b 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:56+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -4470,7 +4470,7 @@ msgstr "Seriennummer"
 #. module: base
 #: selection:res.request,priority:0
 msgid "Low"
-msgstr "Ausreichend"
+msgstr "Niedrig"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_audit
@@ -8525,7 +8525,7 @@ msgstr "Aktionen"
 #. module: base
 #: selection:res.request,priority:0
 msgid "High"
-msgstr "Gut"
+msgstr "Hoch"
 
 #. module: base
 #: field:ir.exports.line,export_id:0
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 56cf6185f12..81557b1becb 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:56+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index ecfc4f378ea..3cc6a829877 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ 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-03 05:13+0000\n"
-"X-Generator: Launchpad (build 14418)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:00+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index e1f7181ed51..ca188a092df 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 6c6cec964cb..a1734de70af 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:00+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index ebc536d97ae..1b9d7bea41e 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:55+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: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 1bd7ed9c6e1..85fd6263337 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index bedab5378d6..17d3d856384 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:54+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 47461d9d2fd..895d9802976 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:58+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 8d80d7ffd3d..ef9bf5a3704 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:55+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: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 80261f1a672..9b7b6840808 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index fa5af7b2630..d4de36742a9 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:56+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -308,7 +308,7 @@ msgstr "Propriétaire"
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Object"
-msgstr "Objet Source"
+msgstr "Objet source"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -605,7 +605,7 @@ msgstr "Serbie"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard View"
-msgstr "Vue Assistant"
+msgstr "Vue assistant"
 
 #. module: base
 #: model:res.country,name:base.kh
@@ -1034,7 +1034,7 @@ msgstr "Operation annulée"
 #. module: base
 #: help:base.language.export,lang:0
 msgid "To export a new language, do not select a language."
-msgstr "Pour exporter une langue, ne sélectionnez aucune langue."
+msgstr "Pour exporter une nouvelle langue, ne sélectionnez aucune langue."
 
 #. module: base
 #: view:res.request:0
@@ -1099,9 +1099,9 @@ msgid ""
 "you select the invoice, then `object.invoice_address_id.email` is the field "
 "which gives the correct address"
 msgstr ""
-"Fournissez les champs qui seront utilisés pour récupéreer l'adresse email. "
-"Exemple: lorsque vous sélectionnez la facture, alors "
-"`object.invoice_address_id.email` es t le champ qui vous donne l'adresse "
+"Fournit les champs qui seront utilisés pour récupérer l'adresse de courriel. "
+"Par exemple lorsque vous sélectionnez la facture, alors "
+"\"object.invoice_address_id.email\" est le champ qui vous donne l'adresse "
 "correcte."
 
 #. module: base
@@ -1545,7 +1545,7 @@ msgid ""
 "newly added modules as well as any change to existing modules."
 msgstr ""
 "Cet assistant va parcourir tous les répertoires de modules pour détecter les "
-"modules ajoutés ainsi que les modifications apportées aix modules existants."
+"modules ajoutés ainsi que les modifications apportées aux modules existants."
 
 #. module: base
 #: field:res.company,logo:0
@@ -1623,7 +1623,7 @@ msgid ""
 "Views allows you to personalize each view of OpenERP. You can add new "
 "fields, move fields, rename them or delete the ones that you do not need."
 msgstr ""
-"Vues vous permettant de personnaler chaque vue d'OpenERP. Vous pouvez "
+"Vues vous permettant de personnaliser chaque écran d'OpenERP. Vous pouvez "
 "ajouter de nouveaux champs, déplacer, renommer ou supprimer ceux dont vous "
 "n'avez pas besoin."
 
@@ -1893,7 +1893,7 @@ msgstr "Correspondances de champ"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Translations"
-msgstr "Export les traductions"
+msgstr "Exporter les traductions"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -2023,7 +2023,7 @@ msgid ""
 "you are working on will be maintained."
 msgstr ""
 "Afficher et gérer la liste de tous les pays pouvant être associés aux "
-"partenaires. Vous pouvez créer ou supprimer des pays pour vous assurez que "
+"partenaires. Vous pouvez créer ou supprimer des pays pour vous assurer que "
 "ceux avec lesquels vous travaillez seront maintenus."
 
 #. module: base
@@ -2202,6 +2202,9 @@ msgid ""
 "separated list of valid field names (optionally followed by asc/desc for the "
 "direction)"
 msgstr ""
+"La propriété \"order\" est incorrecte. \"order\" doit contenir une liste de "
+"noms de champs corrects et séparés par des virgules (éventuellement suivis "
+"de \"asc\" ou \"desc\" pour indiquer le sens)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -2227,9 +2230,9 @@ msgid ""
 "way you want to print them in letters and other documents. Some example: "
 "Mr., Mrs. "
 msgstr ""
-"Gère les titres des contacts dont vous voulez qu'ils soient disponibles dans "
-"le système et comment vous voulez qu'ils soient imprimés sur les lettres et "
-"autres documents. Quelques exemples : M.; Mme. "
+"Gère les civilités des contacts disponibles dans le système et la manière "
+"dont ils seront imprimés sur les lettres et autres documents. Quelques "
+"exemples : M. ; Mme. "
 
 #. module: base
 #: field:res.company,rml_footer1:0
@@ -2507,7 +2510,7 @@ msgstr "Actions planifiées"
 #: field:res.partner.title,name:0
 #: field:res.widget,title:0
 msgid "Title"
-msgstr "Titre"
+msgstr "Civilité"
 
 #. module: base
 #: help:ir.property,res_id:0
@@ -2713,9 +2716,9 @@ msgid ""
 "import a language pack from here. Other OpenERP languages than the official "
 "ones can be found on launchpad."
 msgstr ""
-"Si vous souhaitez une autre langue que l'officielle disponible, vous pouvez "
-"importer la votre ici. Les autres langues OpenERP autre que les officielles "
-"peuvent être trouver sur Launchpad"
+"Si vous souhaitez une autre langue que les langues officielles disponibles, "
+"vous pouvez l'importer à partir d' ici. D'autres langues  peuvent être "
+"trouvées sur Launchpad."
 
 #. module: base
 #: view:ir.module.module:0
@@ -2891,7 +2894,7 @@ msgstr "Action à déclencher"
 #, python-format
 msgid "\"email_from\" needs to be set to send welcome mails to users"
 msgstr ""
-"\"email_from\" doit être positionner pour envoyer un message de bienvenu aux "
+"\"email_from\" doit être rempli pour envoyer un message de bienvenue aux "
 "utilisateurs"
 
 #. module: base
@@ -2903,7 +2906,7 @@ msgstr "Contrainte"
 #: selection:ir.values,key:0
 #: selection:res.partner.address,type:0
 msgid "Default"
-msgstr "Défaut"
+msgstr "Par défaut"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -2920,7 +2923,7 @@ msgstr "Filtres par défaut"
 #. module: base
 #: field:res.request.history,name:0
 msgid "Summary"
-msgstr "Sommaire"
+msgstr "Résumé"
 
 #. module: base
 #: field:multi_company.default,expression:0
@@ -4670,8 +4673,8 @@ msgstr "Contacts"
 msgid ""
 "Unable to delete this document because it is used as a default property"
 msgstr ""
-"Impossible de supprimer ce document, parce qu'il est utilisé dans une "
-"propriété par défaut"
+"Impossible de supprimer ce document, parce qu'il est utilisé comme propriété "
+"par défaut"
 
 #. module: base
 #: view:res.widget.wizard:0
@@ -6405,7 +6408,7 @@ msgstr "Panama"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
 msgid "Ltd"
-msgstr "Ltd"
+msgstr "SARL"
 
 #. module: base
 #: help:workflow.transition,group_id:0
@@ -6604,9 +6607,9 @@ msgid ""
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
-"Gérer les titres des partenaires qui seront disponibles dans votre système. "
-"Les titres de partenaires sont les statuts légaux des sociétés: SARL, SAS, "
-"SA, etc."
+"Gérer les civilités des partenaires qui seront disponibles dans votre "
+"système. Pour les sociétés, les civilités de partenaires sont les formes "
+"légales : SARL, SAS, SA, etc."
 
 #. module: base
 #: view:base.language.export:0
@@ -8294,7 +8297,7 @@ msgstr "5.  %y, %Y ==> 08, 2008"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_ltd
 msgid "ltd"
-msgstr "Ets"
+msgstr "SARL"
 
 #. module: base
 #: field:ir.values,res_id:0
@@ -9617,7 +9620,7 @@ msgstr "Livraison"
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
 msgid "Corp."
-msgstr "Corp."
+msgstr "SA"
 
 #. module: base
 #: model:res.country,name:base.gw
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 9f19c9f93e3..7c0574df689 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-14 05:15+0000\n"
-"X-Generator: Launchpad (build 14277)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:56+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index c14482ac064..33a1052844d 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:56+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 5878b8dac29..189d5544dc7 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:58+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 994114c6fc0..4d2ed982578 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:56+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -34,7 +34,7 @@ msgstr "Szent Ilona"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr "Egyéb beállítások"
+msgstr "Egyéb Beállítások"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -61,7 +61,7 @@ msgstr "Metaadat"
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr "Nézet felépítés"
+msgstr "Architektúra Nézet"
 
 #. module: base
 #: field:base.language.import,code:0
@@ -81,7 +81,7 @@ msgstr "Munkafolyamat"
 #. module: base
 #: view:partner.sms.send:0
 msgid "SMS - Gateway: clickatell"
-msgstr "SMS - Gateway: clickatell"
+msgstr "SMS - hozzáférés: clickatell"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -91,7 +91,7 @@ msgstr "Magyar"
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Not Searchable"
-msgstr "Nem kereshető"
+msgstr "Nem Kereshető"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -101,17 +101,17 @@ msgstr "Spanyol (VE)"
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr "Munkafolyamat"
+msgstr "Munkafolyamat aktív"
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
 msgid "Display Menu Tips"
-msgstr "Display Menu Tips"
+msgstr "Menü Tippek Megjelenítése"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr "Létrehozott nézetek"
+msgstr "Létrehozott Nézetek"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:485
@@ -120,8 +120,8 @@ msgid ""
 "You can not write in this document (%s) ! Be sure your user belongs to one "
 "of these groups: %s."
 msgstr ""
-"You can not write in this document (%s) ! Be sure your user belongs to one "
-"of these groups: %s."
+"Nem szerkesztheti ezt a dokumentumot (%s) ! Bizonyosodjon meg róla, hogy a "
+"felhasználója a következő csoportok egyikébe tartozik: %s."
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -142,7 +142,7 @@ msgstr "Hivatkozás"
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
-msgstr "Cél ablak"
+msgstr "Cél Ablak"
 
 #. module: base
 #: code:addons/base/res/res_user.py:507
@@ -157,8 +157,8 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
-"Properties of base fields cannot be altered in this manner! Please modify "
-"them through Python code, preferably through a custom addon!"
+"Alapmezőket nem lehet megváltoztatni ilyen módon! Kérem, módosítsa Python "
+"kódon keresztül, lehetőleg egyéni modul szerkesztésével!"
 
 #. module: base
 #: code:addons/osv.py:133
@@ -207,7 +207,7 @@ msgstr "Növekmény"
 #: model:ir.actions.act_window,name:base.action_res_company_tree
 #: model:ir.ui.menu,name:base.menu_action_res_company_tree
 msgid "Company's Structure"
-msgstr "Cég struktúra"
+msgstr "Cégstruktúra"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -223,7 +223,7 @@ msgstr "Partner keresés"
 #: code:addons/base/res/res_user.py:132
 #, python-format
 msgid "\"smtp_server\" needs to be set to send mails to users"
-msgstr "email küldés lehetőségéhez \"SMTP szerver\"-t szükséges beállítani"
+msgstr "email küldés lehetőségéhez \"smtp_server\" beállítása szükséges"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:60
@@ -239,12 +239,12 @@ msgstr "Több dokumentumon"
 #. module: base
 #: field:ir.module.category,module_nr:0
 msgid "Number of Modules"
-msgstr "Modulok száma"
+msgstr "Modulok Száma"
 
 #. module: base
 #: help:multi_company.default,company_dest_id:0
 msgid "Company to store the current record"
-msgstr "Company to store the current record"
+msgstr "Vállalat a jelenlegi rekord tárolására"
 
 #. module: base
 #: field:res.partner.bank.type.field,size:0
@@ -263,8 +263,8 @@ msgid ""
 "Save this document to a %s file and edit it with a specific software or a "
 "text editor. The file encoding is UTF-8."
 msgstr ""
-"Save this document to a %s file and edit it with a specific software or a "
-"text editor. The file encoding is UTF-8."
+"Mentse el ezt a dokumentumot egy %s fájlba és szerkessze egy meghatározott "
+"szoftverrel vagy szövegszerkesztővel. A fájlkódolás UTF-8."
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -279,7 +279,7 @@ msgstr "aktív"
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
 msgid "Wizard Name"
-msgstr "Varázsló neve"
+msgstr "Varázsló Neve"
 
 #. module: base
 #: code:addons/orm.py:2160
@@ -295,7 +295,7 @@ msgstr "Hitelkeret"
 #. module: base
 #: field:ir.model.data,date_update:0
 msgid "Update Date"
-msgstr "Módosítás dátuma"
+msgstr "Frissítés Dátuma"
 
 #. module: base
 #: view:ir.attachment:0
@@ -305,12 +305,12 @@ msgstr "Tulajdonos"
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Object"
-msgstr "Forrás objektum"
+msgstr "Forrás Objektum"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Config Wizard Steps"
-msgstr "Konfigurációs varázsló lépések"
+msgstr "Konfigurációs Varázsló Lépések"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_sc
@@ -321,7 +321,7 @@ msgstr "ir.ui.view_sc"
 #: field:res.widget.user,widget_id:0
 #: field:res.widget.wizard,widgets_list:0
 msgid "Widget"
-msgstr "Widget"
+msgstr "Grafikus elem"
 
 #. module: base
 #: view:ir.model.access:0
@@ -341,7 +341,7 @@ msgstr "Mező név"
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
 msgid "Select Action Type"
-msgstr "Select Action Type"
+msgstr "Válassza ki a Művelet Tipusát"
 
 #. module: base
 #: model:res.country,name:base.tv
@@ -351,12 +351,12 @@ msgstr "Tuvalu"
 #. module: base
 #: selection:ir.model,state:0
 msgid "Custom Object"
-msgstr "Egyéni objektum"
+msgstr "Egyéni Objektum"
 
 #. module: base
 #: field:res.lang,date_format:0
 msgid "Date Format"
-msgstr "Dátum formátum"
+msgstr "Dátum Formátum"
 
 #. module: base
 #: field:res.bank,email:0
@@ -400,8 +400,8 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
-"If you check this, then the second time the user prints with same attachment "
-"name, it returns the previous report."
+"Ha ezt bejelöli, akkor a második alkalommal, amikor a felhasználó ugyanezzel "
+"a csatolmánynévvel nyomtat, az előző jelentéssel tér vissza."
 
 #. module: base
 #: code:addons/orm.py:904
@@ -428,7 +428,7 @@ msgstr "Szöveg"
 #. module: base
 #: field:res.country,name:0
 msgid "Country Name"
-msgstr "Ország név"
+msgstr "Országnév"
 
 #. module: base
 #: model:res.country,name:base.co
@@ -438,7 +438,7 @@ msgstr "Kolumbia"
 #. module: base
 #: view:ir.module.module:0
 msgid "Schedule Upgrade"
-msgstr "Frissítés beütemezése"
+msgstr "Fejlesztés Beütemezése"
 
 #. module: base
 #: code:addons/orm.py:838
@@ -452,8 +452,8 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
-"Két betűs ISO kód.\n"
-"Gyorskereséshez használható."
+"Két betűs ISO országkód.\n"
+"Ez a mező gyorskereséshez használható."
 
 #. module: base
 #: model:res.country,name:base.pw
@@ -498,7 +498,7 @@ msgstr "Egyéni mező nevének 'x_'-el kell kezdődnie!"
 #. module: base
 #: help:ir.actions.server,action_id:0
 msgid "Select the Action Window, Report, Wizard to be executed."
-msgstr "Select the Action Window, Report, Wizard to be executed."
+msgstr "Válassza ki végrehajtásra a műveleti ablakot, jelentést, varázslót."
 
 #. module: base
 #: view:res.config.users:0
@@ -520,7 +520,8 @@ msgstr "Model leírás"
 msgid ""
 "Optional model name of the objects on which this action should be visible"
 msgstr ""
-"Optional model name of the objects on which this action should be visible"
+"Opcionális modelnév azon objektumoknak, amelyeken ez a művelet látható kell "
+"hogy legyen"
 
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
@@ -561,7 +562,7 @@ msgstr "ir.actions.actions"
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Want to check Ean ? "
-msgstr "Akarja az EAN-t ellenőrizni? "
+msgstr "Kívánja az EAN-t ellenőrizni? "
 
 #. module: base
 #: field:ir.values,key2:0
@@ -581,7 +582,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,title:0
 msgid "Partner Form"
-msgstr "Cégforma"
+msgstr "Partner űrlap"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -681,14 +682,13 @@ msgstr "Import / Export"
 #: help:ir.actions.act_window,domain:0
 msgid ""
 "Optional domain filtering of the destination data, as a Python expression"
-msgstr ""
-"Optional domain filtering of the destination data, as a Python expression"
+msgstr "A céladat, mint Python-kifejezés opcionális tartományszűrése"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr "Module Upgrade"
+msgstr "Modul frissítés"
 
 #. module: base
 #: view:res.config.users:0
@@ -696,8 +696,8 @@ msgid ""
 "Groups are used to define access rights on objects and the visibility of "
 "screens and menus"
 msgstr ""
-"Groups are used to define access rights on objects and the visibility of "
-"screens and menus"
+"A csoportok használatával beállíthatók objektumokhoz való hozzáférések, "
+"valamint a képernyők és menük láthatósága"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -734,7 +734,7 @@ msgstr "Munkanapok"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other OSI Approved Licence"
-msgstr "Other OSI Approved Licence"
+msgstr "Egyéb OSI Által Engedélyezett Licensz"
 
 #. module: base
 #: help:res.config.users,context_lang:0
@@ -767,7 +767,7 @@ msgstr "India"
 #: model:ir.actions.act_window,name:base.res_request_link-act
 #: model:ir.ui.menu,name:base.menu_res_request_link_act
 msgid "Request Reference Types"
-msgstr "Üzenet hivatkozás típusok"
+msgstr "Hivatkozás típusok kérése"
 
 #. module: base
 #: view:ir.values:0
@@ -793,7 +793,7 @@ msgstr "ir.config_parameter"
 #. module: base
 #: selection:base.language.export,format:0
 msgid "TGZ Archive"
-msgstr "TGZ Archive"
+msgstr "TGZ Archívum"
 
 #. module: base
 #: view:res.lang:0
@@ -840,7 +840,7 @@ msgstr "HR vezérlőpult"
 #: code:addons/base/res/res_user.py:507
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr "Setting empty passwords is not allowed for security reasons!"
+msgstr "Üres jelszó beállítása biztonsági okokból nem engedélyezett!"
 
 #. module: base
 #: selection:ir.actions.server,state:0
@@ -879,7 +879,7 @@ msgstr "Record #%d of %s not found, cannot copy!"
 #. module: base
 #: field:ir.module.module,contributors:0
 msgid "Contributors"
-msgstr "Contributors"
+msgstr "Közreműködők"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -890,7 +890,7 @@ msgstr "Karakter"
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_form
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract
 msgid "Contracts"
-msgstr "Contracts"
+msgstr "Szerződések"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -905,7 +905,7 @@ msgstr "Uganda"
 #. module: base
 #: field:ir.model.access,perm_unlink:0
 msgid "Delete Access"
-msgstr "Törlés"
+msgstr "Törlési hozzáférés"
 
 #. module: base
 #: model:res.country,name:base.ne
@@ -967,7 +967,7 @@ msgstr "Művelet URL"
 #. module: base
 #: field:base.module.import,module_name:0
 msgid "Module Name"
-msgstr "Modul név"
+msgstr "Modulnév"
 
 #. module: base
 #: model:res.country,name:base.mh
@@ -1016,12 +1016,12 @@ msgstr ""
 #: code:addons/base/res/res_user.py:206
 #, python-format
 msgid "Operation Canceled"
-msgstr "Operation Canceled"
+msgstr "Művelet Visszavonva"
 
 #. module: base
 #: help:base.language.export,lang:0
 msgid "To export a new language, do not select a language."
-msgstr "To export a new language, do not select a language."
+msgstr "Új nyelv exportálásához ne válasszon ki nyelvet."
 
 #. module: base
 #: view:res.request:0
@@ -1036,12 +1036,12 @@ msgstr "Vezérlőpult"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_purchase_root
 msgid "Purchases"
-msgstr "Beszerzés"
+msgstr "Beszerzések"
 
 #. module: base
 #: model:res.country,name:base.md
 msgid "Moldavia"
-msgstr "Moldávia"
+msgstr "Moldova"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1059,7 +1059,7 @@ msgstr "Verzió"
 #: field:ir.model.access,perm_read:0
 #: view:ir.rule:0
 msgid "Read Access"
-msgstr "Olvasási hozzáférés"
+msgstr "Olvasási Hozzáférés"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1085,9 +1085,9 @@ msgid ""
 "you select the invoice, then `object.invoice_address_id.email` is the field "
 "which gives the correct address"
 msgstr ""
-"Provides the fields that will be used to fetch the email address, e.g. when "
-"you select the invoice, then `object.invoice_address_id.email` is the field "
-"which gives the correct address"
+"Gondoskodik a mezőkről, amiket az email címek kinyerésére használhatunk, pl. "
+"amikor kiválaszt egy számlát a `object.invoice_address_id.email` az a mező, "
+"amely megadja megfelelő címet."
 
 #. module: base
 #: view:res.lang:0
@@ -1124,7 +1124,7 @@ msgstr "Create _Menu"
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
-msgstr "Fizetési feltétel (rövid név)"
+msgstr "Fizetési feltétel (rövidített név)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
@@ -1150,7 +1150,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main report file path"
-msgstr "Main report file path"
+msgstr "Jelentésfájl elsődleges útvonala"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -1166,8 +1166,8 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
-"If set to true, the action will not be displayed on the right toolbar of a "
-"form view."
+"Ha igazra van állítva, a művelet nem fog megjelenni a jobb oldali "
+"eszköztárban az űrlap nézet alatt."
 
 #. module: base
 #: field:workflow,on_create:0
@@ -1181,8 +1181,8 @@ msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
-"'%s' contains too many dots. XML ids should not contain dots ! These are "
-"used to refer to other modules data, as in module.reference_id"
+"'%s' túl sok pontot tartalmaz. XML azonosítók nem tartalmazhatnak pontot! A "
+"pontokkal más modeladatokra hivatkozunk, mint pl. a module.reference_id"
 
 #. module: base
 #: field:partner.sms.send,user:0
@@ -1197,13 +1197,13 @@ msgid ""
 "Access all the fields related to the current object using expressions, i.e. "
 "object.partner_id.name "
 msgstr ""
-"Access all the fields related to the current object using expressions, "
-"például object.partner_id.name "
+"A jelenlegi objektumhoz tartozó összes mező hozzáférése kifejezések "
+"használatával, pl. object.partner_id.name "
 
 #. module: base
 #: model:ir.model,name:base.model_res_country_state
 msgid "Country state"
-msgstr "Country state"
+msgstr "Állam"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1233,13 +1233,13 @@ msgid ""
 "Do not display this log if it belongs to the same object the user is working "
 "on"
 msgstr ""
-"Do not display this log if it belongs to the same object the user is working "
-"on"
+"Ne jelenítse meg ezt a naplót, ha az ugyanahhoz az objektumhoz tartozik, "
+"amin a felhasználó éppen dolgozik"
 
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr "Kelet Timor"
+msgstr "Kelet-Timor"
 
 #. module: base
 #: model:res.company,follow_up_msg:base.main_company
@@ -1305,7 +1305,7 @@ msgstr "Maldív-szigetek"
 #. module: base
 #: help:ir.values,res_id:0
 msgid "Keep 0 if the action must appear on all resources."
-msgstr "Keep 0 if the action must appear on all resources."
+msgstr "Maradjon 0 ha a műveletnek minden erőforráson meg kell jelennie."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1323,8 +1323,8 @@ msgid ""
 "Condition that is to be tested before action is executed, e.g. "
 "object.list_price > object.cost_price"
 msgstr ""
-"Condition that is to be tested before action is executed, e.g. "
-"object.list_price > object.cost_price"
+"Feltétel, amely tesztelésre szorul mielőtt a művelet végrehajtásra kerül, "
+"pl. object.list_price > object.cost_price"
 
 #. module: base
 #: code:addons/base/res/partner/partner.py:155
@@ -1354,7 +1354,7 @@ msgstr "Bal szülő"
 #: model:ir.actions.act_window,name:base.res_widget_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_act_window
 msgid "Homepage Widgets"
-msgstr "Homepage Widgets"
+msgstr "Honlap grafikus elemei"
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1362,7 +1362,7 @@ msgid ""
 "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 "object.partner_id.name ]]`"
 msgstr ""
-"Specify the message. You can use the fields from the object. e.g. `Dear [[ "
+"Adja meg az üzenetet. Használhatja a mezőket az objektumból. Pl. `Kedves [[ "
 "object.partner_id.name ]]`"
 
 #. module: base
@@ -1378,7 +1378,7 @@ msgstr "Tartomány beállítás"
 #. module: base
 #: field:ir.actions.server,trigger_name:0
 msgid "Trigger Name"
-msgstr "Trigger Name"
+msgstr "Indító név"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -1433,7 +1433,7 @@ msgstr "Cím típusa"
 #. module: base
 #: view:ir.ui.menu:0
 msgid "Full Path"
-msgstr "Teljes név"
+msgstr "Teljes elérés"
 
 #. module: base
 #: view:res.request:0
@@ -1453,7 +1453,7 @@ msgstr ""
 #. module: base
 #: view:ir.ui.view:0
 msgid "Advanced"
-msgstr "Advanced"
+msgstr "Haladó"
 
 #. module: base
 #: model:res.country,name:base.fi
@@ -1467,19 +1467,20 @@ msgstr "Finnország"
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Tree"
-msgstr "Tree"
+msgstr "Fa"
 
 #. module: base
 #: help:res.config.users,password:0
 msgid ""
 "Keep empty if you don't want the user to be able to connect on the system."
 msgstr ""
-"Keep empty if you don't want the user to be able to connect on the system."
+"Hagyja üresen, ha nem akarja, hogy a felhasználó csatlakozni tudjon a "
+"rendszerhez."
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Create / Write / Copy"
-msgstr "Create / Write / Copy"
+msgstr "Létrehozás / Írás / Másolás"
 
 #. module: base
 #: view:base.language.export:0
@@ -1489,7 +1490,7 @@ msgstr "https://help.launchpad.net/Translations"
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
 msgid "View Mode"
-msgstr "Nézet mód"
+msgstr "Nézet Mód"
 
 #. module: base
 #: view:base.language.import:0
@@ -1497,8 +1498,8 @@ msgid ""
 "When using CSV format, please also check that the first line of your file is "
 "one of the following:"
 msgstr ""
-"When using CSV format, please also check that the first line of your file is "
-"one of the following:"
+"CSV formátum használata esetén kérem ellenőrizze, hogy a fájl első sora a "
+"következők egyike:"
 
 #. module: base
 #: code:addons/fields.py:114
@@ -1509,7 +1510,7 @@ msgstr "Not implemented search_memory method !"
 #. module: base
 #: view:res.log:0
 msgid "Logs"
-msgstr "Logok"
+msgstr "Naplók"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1527,8 +1528,8 @@ msgid ""
 "This wizard will scan all module repositories on the server side to detect "
 "newly added modules as well as any change to existing modules."
 msgstr ""
-"Ez a varázsló végignézi a modul tárolókat új modulokat és a meglévők "
-"frissítéseit keresve."
+"Ez a varázsló végignézi a modul tárolókat a szerveroldalon, új modulokat és "
+"a meglévők frissítéseit keresve."
 
 #. module: base
 #: field:res.company,logo:0
@@ -1538,7 +1539,7 @@ msgstr "Logó"
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr "Kapcsolattartó keresés"
+msgstr "Kapcsolattartó Keresés"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1549,7 +1550,7 @@ msgstr "Eltávolít (beta)"
 #: selection:ir.actions.act_window,target:0
 #: selection:ir.actions.url,target:0
 msgid "New Window"
-msgstr "Új ablak"
+msgstr "Új Ablak"
 
 #. module: base
 #: model:res.country,name:base.bs
@@ -1562,7 +1563,8 @@ msgstr "Bahamák"
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
 msgstr ""
-"Couldn't generate the next id because some partners have an alphabetic id !"
+"Nem lehetséges a következő azonosító generálása, mert bizonyos partnerek "
+"betűvel jelzett azonosítóval rendelkeznek !"
 
 #. module: base
 #: view:ir.attachment:0
@@ -1572,7 +1574,7 @@ msgstr "Melléklet"
 #. module: base
 #: model:res.country,name:base.ie
 msgid "Ireland"
-msgstr "írország"
+msgstr "Írország"
 
 #. module: base
 #: field:base.module.update,update:0
@@ -1605,8 +1607,9 @@ msgid ""
 "Views allows you to personalize each view of OpenERP. You can add new "
 "fields, move fields, rename them or delete the ones that you do not need."
 msgstr ""
-"Views allows you to personalize each view of OpenERP. You can add new "
-"fields, move fields, rename them or delete the ones that you do not need."
+"A nézetek lehetővé teszik, hogy az OpenERP-ben minden egyes nézetet "
+"testreszabjon. Hozzáadhat új mezőket, mozgathatja, átnevezheti, vagy "
+"törölheti őket."
 
 #. module: base
 #: field:ir.actions.act_window,groups_id:0
@@ -1641,9 +1644,10 @@ msgid ""
 "access to selected functionalities within the system. Click on 'Done' if you "
 "do not wish to add more users at this stage, you can always do this later."
 msgstr ""
-"Create additional users and assign them groups that will allow them to have "
-"access to selected functionalities within the system. Click on 'Done' if you "
-"do not wish to add more users at this stage, you can always do this later."
+"Hozzon létre további felhasználókat és rendeljen hozzá csoportokat, amelyek "
+"lehetővé teszik, hogy hozzáférjenek meghatározott funkciókhoz a rendszeren "
+"belül. Kattintson a Kész gombra, ha nem akar több felhasználót felvenni "
+"ebben a szakaszban, később bármikor megteheti."
 
 #. module: base
 #: model:res.country,name:base.bz
@@ -1666,8 +1670,8 @@ msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
 msgstr ""
-"Comma-separated list of allowed view modes, such as 'form', 'tree', "
-"'calendar', etc. (Default: tree,form)"
+"Vesszővel elválasztott lista az engedélyezett nézetekről, mint például "
+"'űrlap', 'fa', 'naptár', etc. (Alapértelmezett: fa, űrlap)"
 
 #. module: base
 #: code:addons/orm.py:3147
@@ -1698,9 +1702,9 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
-"Enter the field/expression that will return the list. E.g. select the sale "
-"order in Object, and you can have loop on the sales order line. Expression = "
-"`object.order_line`."
+"Adja meg a mezőt/kifejezést, ami visszaadja a listát. Pl. válassza ki az "
+"értékesítési megbízást az Objektumban, és a ciklus lehet az értékesítési "
+"megbízási soron. Kifejezés= 'object.orde_line'."
 
 #. module: base
 #: field:ir.property,fields_id:0
@@ -1724,17 +1728,17 @@ msgstr "Feröer-szigetek"
 #: selection:res.config.view,view:0
 #: selection:res.users,view:0
 msgid "Simplified"
-msgstr "Egyszerű"
+msgstr "Egyszerűsített"
 
 #. module: base
 #: model:res.country,name:base.st
 msgid "Saint Tome (Sao Tome) and Principe"
-msgstr "Saint Tome (Sao Tome) and Principe"
+msgstr "Sao Tome és Principe"
 
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Invoice"
-msgstr "Számlázási"
+msgstr "Számlázás"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1757,12 +1761,13 @@ msgstr "Madagaszkár"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"The Object name must start with x_ and not contain any special character !"
+"Az objektum nevének x_-el kell kezdődnie és nem tartalmazhat semmilyen "
+"speciális karaktert!"
 
 #. module: base
 #: field:ir.actions.configuration.wizard,note:0
 msgid "Next Wizard"
-msgstr "Következő varázsló"
+msgstr "Következő Varázsló"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
@@ -1774,12 +1779,12 @@ msgstr "Menü"
 #. module: base
 #: field:res.currency,rate:0
 msgid "Current Rate"
-msgstr "Aktuális árfolyam"
+msgstr "Aktuális Árfolyam"
 
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
 msgid "Original View"
-msgstr "Eredeti nézet"
+msgstr "Eredeti Nézet"
 
 #. module: base
 #: view:ir.values:0
@@ -1799,12 +1804,12 @@ msgstr "Anguilla"
 #. module: base
 #: field:ir.ui.view_sc,name:0
 msgid "Shortcut Name"
-msgstr "Billentyűkombináció neve"
+msgstr "Gyorsbillentyű Neve"
 
 #. module: base
 #: help:ir.actions.act_window,limit:0
 msgid "Default limit for the list view"
-msgstr "Default limit for the list view"
+msgstr "Alapértelmezett limit a lista nézethez"
 
 #. module: base
 #: help:ir.actions.server,write_id:0
@@ -1812,8 +1817,8 @@ msgid ""
 "Provide the field name that the record id refers to for the write operation. "
 "If it is empty it will refer to the active id of the object."
 msgstr ""
-"Provide the field name that the record id refers to for the write operation. "
-"If it is empty it will refer to the active id of the object."
+"Adja meg a mező nevét, amire a rekord azonosító hivatkozik az írási "
+"művelethez. Ha ez üres, akkor az objektum aktív azonosítójára fog hivatkozni."
 
 #. module: base
 #: model:res.country,name:base.zw
@@ -1829,12 +1834,12 @@ msgstr "Legyen türelemmel, mivel ez a művelet több másodpercig is eltarthat.
 #: help:ir.values,action_id:0
 msgid "This field is not used, it only helps you to select the right action."
 msgstr ""
-"This field is not used, it only helps you to select the right action."
+"Ez a mező nem használható, csupán a megfelelő művelet kiválasztásában segít."
 
 #. module: base
 #: field:ir.actions.server,email:0
 msgid "Email Address"
-msgstr "Email cím"
+msgstr "Emailcím"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1865,12 +1870,12 @@ msgstr "Értékek"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mappings"
-msgstr "Field Mappings"
+msgstr "Mező leképezések"
 
 #. module: base
 #: view:base.language.export:0
 msgid "Export Translations"
-msgstr "Fordítások exportálása"
+msgstr "Fordítások Exportálása"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -1902,7 +1907,7 @@ msgstr "Litvánia"
 #: model:ir.model,name:base.model_partner_clear_ids
 #: view:partner.clear.ids:0
 msgid "Clear IDs"
-msgstr "Clear IDs"
+msgstr "Tiszta Azonosítók"
 
 #. module: base
 #: help:ir.cron,model:0
@@ -1910,8 +1915,8 @@ msgid ""
 "Name of object whose function will be called when this scheduler will run. "
 "e.g. 'res.partener'"
 msgstr ""
-"Name of object whose function will be called when this scheduler will run. "
-"e.g. 'res.partener'"
+"Azon objektum neve melynek funkciója lehívásra kerül, amikor ez az ütemező "
+"lefut. Pl. 'res.partner'"
 
 #. module: base
 #: code:addons/orm.py:1040
@@ -1970,7 +1975,7 @@ msgstr "Ismétlési műveletek"
 #. module: base
 #: help:multi_company.default,company_id:0
 msgid "Company where the user is connected"
-msgstr "Company where the user is connected"
+msgstr "A vállalat, ahová a felhasználó kapcsolódik"
 
 #. module: base
 #: field:publisher_warranty.contract,date_stop:0
@@ -1999,9 +2004,9 @@ msgid ""
 "partner records. You can create or delete countries to make sure the ones "
 "you are working on will be maintained."
 msgstr ""
-"Display and manage the list of all countries that can be assigned to your "
-"partner records. You can create or delete countries to make sure the ones "
-"you are working on will be maintained."
+"Jelenítse meg és kezelje minden ország listáját amelyek hozzárendelhetők az "
+"ön partner rekordjaihoz. Létrehozhat és törölhet országokat, hogy amiken "
+"jelenleg dolgozik, biztosan karban legyenek tartva."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -2021,13 +2026,13 @@ msgstr "Koreai (KR) / 한국어 (KR)"
 #. module: base
 #: help:ir.model.fields,model:0
 msgid "The technical name of the model this field belongs to"
-msgstr "The technical name of the model this field belongs to"
+msgstr "A model technikai neve, amihez ez a mező tartozik"
 
 #. module: base
 #: field:ir.actions.server,action_id:0
 #: selection:ir.actions.server,state:0
 msgid "Client Action"
-msgstr "Client Action"
+msgstr "Kliens művelet"
 
 #. module: base
 #: model:res.country,name:base.bd
@@ -2042,7 +2047,7 @@ msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Valid"
-msgstr "Valid"
+msgstr "Érvényes"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -2079,7 +2084,7 @@ msgstr "Örményország"
 #: model:ir.actions.act_window,name:base.ir_property_form
 #: model:ir.ui.menu,name:base.menu_ir_property_form_all
 msgid "Configuration Parameters"
-msgstr "Konfiguráció paraméterek"
+msgstr "Konfiguráció Paraméterek"
 
 #. module: base
 #: constraint:ir.cron:0
@@ -2129,7 +2134,7 @@ msgstr "Kép"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Action Configuration"
-msgstr "Ismétlési művelet konfigurációja"
+msgstr "Ismétlési művelet beállítása"
 
 #. module: base
 #: selection:publisher_warranty.contract,state:0
@@ -2207,9 +2212,9 @@ msgid ""
 "way you want to print them in letters and other documents. Some example: "
 "Mr., Mrs. "
 msgstr ""
-"Manage the contact titles you want to have available in your system and the "
-"way you want to print them in letters and other documents. Some example: "
-"Mr., Mrs. "
+"Kezelje a kontakt megnevezéseket, amelyeket a rendszerében el akar érni, "
+"illetve ahogyan azt levelekre és egyéb dokumentumokra szeretné nyomtatni. "
+"Néhány példa: Mr., Mrs. "
 
 #. module: base
 #: field:res.company,rml_footer1:0
@@ -2237,12 +2242,12 @@ msgstr "Függőségek"
 #. module: base
 #: field:multi_company.default,company_id:0
 msgid "Main Company"
-msgstr ""
+msgstr "Fő vállalat"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
 msgid "Web Icon File (hover)"
-msgstr "Web ikon file (föléhúzáskor)"
+msgstr "Web ikon fájl (föléhúzáskor)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2250,8 +2255,8 @@ msgid ""
 "If you use a formula type, use a python expression using the variable "
 "'object'."
 msgstr ""
-"If you use a formula type, use a python expression using the variable "
-"'object'."
+"Ha egy formulatípust használ, használjon egy python kifejezést az 'object' "
+"változót alkalmazva."
 
 #. module: base
 #: field:res.partner.address,birthdate:0
@@ -2289,8 +2294,8 @@ msgid ""
 "Reference of the target resource, whose model/table depends on the 'Resource "
 "Name' field."
 msgstr ""
-"Reference of the target resource, whose model/table depends on the 'Resource "
-"Name' field."
+"Referencia a célerőforrásra, aminek a modelje/táblája 'Erőforrás neve' "
+"mezőtől függ."
 
 #. module: base
 #: field:ir.model.fields,select_level:0
@@ -2310,7 +2315,7 @@ msgstr "Finn / Suomi"
 #. module: base
 #: field:ir.rule,perm_write:0
 msgid "Apply For Write"
-msgstr "Alkalmazás Íráshoz"
+msgstr "Alkalmazás íráshoz"
 
 #. module: base
 #: field:ir.sequence,prefix:0
@@ -2325,12 +2330,12 @@ msgstr "Német / Deutsch"
 #. module: base
 #: help:ir.actions.server,trigger_name:0
 msgid "Select the Signal name that is to be used as the trigger."
-msgstr "Select the Signal name that is to be used as the trigger."
+msgstr "Válassza ki a Jelzés nevét, amely indítóként fog működni."
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Fields Mapping"
-msgstr "Fields Mapping"
+msgstr "Mező leképezés"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -2357,7 +2362,7 @@ msgstr "ID Ref."
 #: model:ir.actions.server,name:base.action_start_configurator
 #: model:ir.ui.menu,name:base.menu_view_base_module_configuration
 msgid "Start Configuration"
-msgstr "Start Configuration"
+msgstr "Beállítás indítása"
 
 #. module: base
 #: model:res.country,name:base.mt
@@ -2367,7 +2372,7 @@ msgstr "Málta"
 #. module: base
 #: field:ir.actions.server,fields_lines:0
 msgid "Field Mappings."
-msgstr "Field Mappings."
+msgstr "Mező leképezések."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
@@ -2405,7 +2410,7 @@ msgstr "Antarktisz"
 #. module: base
 #: field:ir.actions.report.xml,auto:0
 msgid "Custom python parser"
-msgstr "Custom python parser"
+msgstr "Egyéni python értelmező"
 
 #. module: base
 #: view:base.language.import:0
@@ -2425,7 +2430,7 @@ msgstr "Elválasztó formátum"
 #. module: base
 #: selection:publisher_warranty.contract,state:0
 msgid "Unvalidated"
-msgstr "Unvalidated"
+msgstr "Érvénytelen"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_9
@@ -2437,7 +2442,7 @@ msgstr "Adatbázis struktúra"
 #: model:ir.model,name:base.model_partner_wizard_spam
 #: view:partner.wizard.spam:0
 msgid "Mass Mailing"
-msgstr "Email küldés"
+msgstr "Tömeges email küldés"
 
 #. module: base
 #: model:res.country,name:base.yt
@@ -2448,7 +2453,7 @@ msgstr "Mayotte"
 #: code:addons/base/ir/ir_actions.py:597
 #, python-format
 msgid "Please specify an action to launch !"
-msgstr "Please specify an action to launch !"
+msgstr "Kérem nevezzen meg egy végrehajtandó műveletet !"
 
 #. module: base
 #: view:res.payterm:0
@@ -2492,7 +2497,8 @@ msgstr "Megsz."
 #. module: base
 #: help:ir.property,res_id:0
 msgid "If not set, acts as a default value for new resources"
-msgstr "If not set, acts as a default value for new resources"
+msgstr ""
+"Ha nincs beállítva, alapértelmezett értékként szolgál az új erőforrásoknak"
 
 #. module: base
 #: code:addons/orm.py:3448
@@ -2504,7 +2510,7 @@ msgstr "Recursivity Detected."
 #: code:addons/base/module/module.py:262
 #, python-format
 msgid "Recursion error in modules dependencies !"
-msgstr "Recursion error in modules dependencies !"
+msgstr "Rekurziós hiba a modul függőségekben !"
 
 #. module: base
 #: view:base.language.install:0
@@ -2519,7 +2525,7 @@ msgstr ""
 #. module: base
 #: view:ir.model:0
 msgid "Create a Menu"
-msgstr "Menü létrehozás"
+msgstr "Menü létrehozása"
 
 #. module: base
 #: help:res.partner,vat:0
@@ -2559,7 +2565,7 @@ msgstr "Országok"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "RML  (deprecated - use Report)"
-msgstr "RML  (deprecated - use Report)"
+msgstr "RML  (érvénytelenítve - használjon Jelentést)"
 
 #. module: base
 #: view:ir.rule:0
@@ -2569,12 +2575,12 @@ msgstr "Rekord szabályok"
 #. module: base
 #: view:ir.property:0
 msgid "Field Information"
-msgstr "Mező információ"
+msgstr "Mező Információ"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Search Actions"
-msgstr "Search Actions"
+msgstr "Műveletek keresése"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_partner_wizard_ean_check
@@ -2615,7 +2621,7 @@ msgstr "Tadzsikisztán"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-2 or later version"
-msgstr "GPL-2 or later version"
+msgstr "GPL-2 vagy korábbi verzió"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_sir
@@ -2651,7 +2657,7 @@ msgstr "Nauru"
 #: code:addons/base/module/module.py:200
 #, python-format
 msgid "The certificate ID of the module must be unique !"
-msgstr "The certificate ID of the module must be unique !"
+msgstr "A modulnak egyedi tanúsítvány azonosítóval kell rendelkeznie !"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -2670,7 +2676,7 @@ msgstr "Űrlap"
 #. module: base
 #: model:res.country,name:base.me
 msgid "Montenegro"
-msgstr "Montenegro"
+msgstr "Montenegró"
 
 #. module: base
 #: view:ir.cron:0
@@ -2699,7 +2705,7 @@ msgstr ""
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be upgraded"
-msgstr "Frissíteni"
+msgstr "Frissítendő"
 
 #. module: base
 #: model:res.country,name:base.ly
@@ -2720,7 +2726,7 @@ msgstr "Liechtenstein"
 #: model:ir.model,name:base.model_partner_sms_send
 #: view:partner.sms.send:0
 msgid "Send SMS"
-msgstr "Send SMS"
+msgstr "SMS küldése"
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -2743,12 +2749,12 @@ msgstr "Portugália"
 msgid ""
 "You cannot have multiple records with the same id for the same module !"
 msgstr ""
-"You cannot have multiple records with the same id for the same module !"
+"Nem lehet ugyanazzal az azonosítóval több rekordja ugyanahhoz a modulhoz !"
 
 #. module: base
 #: field:ir.module.module,certificate:0
 msgid "Quality Certificate"
-msgstr "Minőségi Tanúsítvány"
+msgstr "Minőségi tanúsítvány"
 
 #. module: base
 #: view:res.lang:0
@@ -2759,7 +2765,7 @@ msgstr "6.  %d, %m         ==> 05, 12"
 #: field:res.config.users,date:0
 #: field:res.users,date:0
 msgid "Last Connection"
-msgstr "Utolsó kapcsolat dátuma"
+msgstr "Legutolsó kapcsolat"
 
 #. module: base
 #: field:ir.actions.act_window,help:0
@@ -2769,7 +2775,7 @@ msgstr "Művelet leírás"
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
-msgstr "Jelölje be, ha a partner vevő."
+msgstr "Jelölje be, ha a partner vásárlók."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_lang_act_window
@@ -2788,7 +2794,7 @@ msgstr "Xor"
 #. module: base
 #: model:res.country,name:base.ec
 msgid "Ecuador"
-msgstr "Ecuador"
+msgstr "Ekvádor"
 
 #. module: base
 #: code:addons/base/module/wizard/base_export_language.py:52
@@ -2798,9 +2804,9 @@ msgid ""
 "spreadsheet software. The file encoding is UTF-8. You have to translate the "
 "latest column before reimporting it."
 msgstr ""
-"Save this document to a .CSV file and open it with your favourite "
-"spreadsheet software. The file encoding is UTF-8. You have to translate the "
-"latest column before reimporting it."
+"Mentse el ezt a dokumentumot egy .CSV fájlba és nyissa meg kedvenc "
+"táblázatkezelő szoftverével. A fájl kódolása UTF-8. Le kell fordítania a "
+"legutóbbi oszlopot mielőtt újra importálja."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -2808,7 +2814,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr "Vevők"
+msgstr "Vásárlók"
 
 #. module: base
 #: model:res.country,name:base.au
@@ -2828,7 +2834,7 @@ msgstr ""
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Menu :"
-msgstr "Menü:"
+msgstr "Menü :"
 
 #. module: base
 #: selection:ir.model.fields,state:0
@@ -2838,7 +2844,7 @@ msgstr "Alap mező"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Validate"
-msgstr "Validate"
+msgstr "Jóváhagy"
 
 #. module: base
 #: field:ir.actions.todo,restart:0
@@ -2866,12 +2872,14 @@ msgstr "Indítandó művelet"
 #: code:addons/base/res/res_user.py:136
 #, python-format
 msgid "\"email_from\" needs to be set to send welcome mails to users"
-msgstr "\"email_from\" needs to be set to send welcome mails to users"
+msgstr ""
+"\"email_from\" be kell állítani a felhasználóknak történő üdvözlő üzenet "
+"küldéséhez"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Constraint"
-msgstr "Constraint"
+msgstr "Kikötés"
 
 #. module: base
 #: selection:ir.values,key:0
@@ -2889,7 +2897,7 @@ msgstr "Kötelező"
 #. module: base
 #: view:res.users:0
 msgid "Default Filters"
-msgstr "Alapértelmezett szűrők"
+msgstr "Alapértelmezett Szűrők"
 
 #. module: base
 #: field:res.request.history,name:0
@@ -2899,7 +2907,7 @@ msgstr "Összegzés"
 #. module: base
 #: field:multi_company.default,expression:0
 msgid "Expression"
-msgstr "Expression"
+msgstr "Kifejezés"
 
 #. module: base
 #: help:ir.actions.server,subject:0
@@ -2907,7 +2915,7 @@ msgid ""
 "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
 "object.partner_id.name ]]`"
 msgstr ""
-"Specify the subject. You can use fields from the object, e.g. `Hello [[ "
+"Nevezze meg a tárgyat. Használhatja az objektum mezőit, pl. `Helló [[ "
 "object.partner_id.name ]]`"
 
 #. module: base
@@ -2921,8 +2929,8 @@ msgid ""
 "Optional help text for the users with a description of the target view, such "
 "as its usage and purpose."
 msgstr ""
-"Optional help text for the users with a description of the target view, such "
-"as its usage and purpose."
+"Opcionális segédszöveg felhasználóknak. Tartalmaz egy leírást a célnézetről, "
+"úgy mint a használata és célja."
 
 #. module: base
 #: model:res.country,name:base.va
@@ -2932,12 +2940,12 @@ msgstr "Vatikánváros"
 #. module: base
 #: field:base.module.import,module_file:0
 msgid "Module .ZIP file"
-msgstr "Module .ZIP file"
+msgstr "Modul .ZIP fájl"
 
 #. module: base
 #: field:ir.ui.view,xml_id:0
 msgid "XML ID"
-msgstr "XML ID"
+msgstr "XML azonosító"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_16
@@ -2947,18 +2955,18 @@ msgstr "Telekommunikációs szektor"
 #. module: base
 #: field:workflow.transition,trigger_model:0
 msgid "Trigger Object"
-msgstr "Trigger Object"
+msgstr "Objektum Indítása"
 
 #. module: base
 #: view:res.users:0
 msgid "Current Activity"
-msgstr "Pillanatnyi tevékenység"
+msgstr "Jelenlegi tevékenység"
 
 #. module: base
 #: view:workflow.activity:0
 #: field:workflow.activity,in_transitions:0
 msgid "Incoming Transitions"
-msgstr "Incoming Transitions"
+msgstr "Bejövő átmenetek"
 
 #. module: base
 #: model:res.country,name:base.sr
@@ -3009,7 +3017,7 @@ msgstr "Mindig"
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr "SQL Constraint"
+msgstr "SQL feltétel"
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -3034,7 +3042,7 @@ msgstr "A kulcsnak egyedinek kell lennie."
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Open a Window"
-msgstr "Open a Window"
+msgstr "Ablak megnyitása"
 
 #. module: base
 #: model:res.country,name:base.gq
@@ -3045,7 +3053,7 @@ msgstr "Egyenlítői Guinea"
 #: view:base.module.import:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_import
 msgid "Module Import"
-msgstr "Modul Importálás"
+msgstr "Modul importálás"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -3078,9 +3086,9 @@ msgid ""
 "\n"
 "Click 'Continue' and enjoy your OpenERP experience..."
 msgstr ""
-"Your database is now fully configured.\n"
+"Az adatbázis most már teljesen beállításra került.\n"
 "\n"
-"Click 'Continue' and enjoy your OpenERP experience..."
+"Kattintson a 'Folytatás' gombra és élvezze az OpenERP nyújtotta élményt..."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3123,7 +3131,8 @@ msgstr "Szabályok"
 #: code:addons/base/module/module.py:216
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
-msgstr "You try to remove a module that is installed or will be installed"
+msgstr ""
+"Ön megpróbál eltávolítani egy telepített vagy telepítésre váró modult"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -3151,7 +3160,7 @@ msgstr "Munkafolyamatok"
 #. module: base
 #: field:ir.translation,xml_id:0
 msgid "XML Id"
-msgstr "XML Id"
+msgstr "XML azonosító"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_config_user_form
@@ -3197,7 +3206,7 @@ msgstr "Lesotho"
 #: code:addons/base/ir/ir_model.py:114
 #, python-format
 msgid "You can not remove the model '%s' !"
-msgstr "You can not remove the model '%s' !"
+msgstr "Nem távolíthatja el a '%s' modelt !"
 
 #. module: base
 #: model:res.country,name:base.ke
@@ -3253,7 +3262,7 @@ msgstr "Peru"
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Set NULL"
-msgstr "Set NULL"
+msgstr "NULL-ra állítás"
 
 #. module: base
 #: model:res.country,name:base.bj
@@ -3264,12 +3273,12 @@ msgstr "Benin"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:281
 #, python-format
 msgid "That contract is already registered in the system."
-msgstr "That contract is already registered in the system."
+msgstr "A szerződés már fel van véve a rendszerbe."
 
 #. module: base
 #: help:ir.sequence,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr "Suffix value of the record for the sequence"
+msgstr "A rekord toldalékértéke a számsorhoz"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3289,7 +3298,7 @@ msgstr "RML fejléc"
 #. module: base
 #: field:partner.sms.send,app_id:0
 msgid "API ID"
-msgstr "API ID"
+msgstr "API azonosító"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:486
@@ -3298,8 +3307,8 @@ msgid ""
 "You can not create this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
-"You can not create this document (%s) ! Be sure your user belongs to one of "
-"these groups: %s."
+"Nem hozhatja létre ezt a dokumentumot (%s) ! Bizonyosodjon meg róla, hogy a "
+"következő csoportok egyikéhez tartozik: %s."
 
 #. module: base
 #: model:res.country,name:base.mu
@@ -3387,7 +3396,7 @@ msgstr "Köv. szám"
 #. module: base
 #: help:workflow.transition,condition:0
 msgid "Expression to be satisfied if we want the transition done."
-msgstr "Expression to be satisfied if we want the transition done."
+msgstr "A kifejezésnek teljesülnie kell, hogy az átmenet végbemenjen."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3417,9 +3426,9 @@ msgid ""
 "invoice, then `object.invoice_address_id.mobile` is the field which gives "
 "the correct mobile number"
 msgstr ""
-"Provides fields that be used to fetch the mobile number, e.g. you select the "
-"invoice, then `object.invoice_address_id.mobile` is the field which gives "
-"the correct mobile number"
+"Olyan mezőkről gondoskodik, amelyek használhatók a mobilszám megszerzésére, "
+"pl. kiválasztja a számlát, majd az `object.invoice_address_id.mobile` mező "
+"kiadja a helyes mobilszámot"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -3490,12 +3499,12 @@ msgid ""
 "to see. Whether they can have a read, write, create and delete access right "
 "can be managed from here."
 msgstr ""
-"A group is a set of functional areas that will be assigned to the user in "
-"order to give them access and rights to specific applications and tasks in "
-"the system. You can create custom groups or edit the ones existing by "
-"default in order to customize the view of the menu that users will be able "
-"to see. Whether they can have a read, write, create and delete access right "
-"can be managed from here."
+"A csoport funkcionális területek együttese, amely a felhasználóhoz rendelve "
+"hozzáférést és jogokat biztosít neki meghatározott alkalmazásokhoz és "
+"feladatokhoz a rendszerben. Létrehozhat egyéni csoportokat vagy a "
+"meglévőeket módosíthatja, hogy testreszabja a felhasználó számára megjelenő "
+"menük nézetét. Az írási, olvasási, létrehozási és törlési hozzáférési jogok "
+"innen kezelhetők."
 
 #. module: base
 #: view:res.partner:0
@@ -3575,7 +3584,7 @@ msgstr "Metaadatok"
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
 msgid "Shortcut for this menu already exists!"
-msgstr "Shortcut for this menu already exists!"
+msgstr "Ehhez a mneühöz már létezik billentyűparancs!"
 
 #. module: base
 #: model:res.country,name:base.ve
@@ -3602,12 +3611,12 @@ msgstr "A felhasználó, aki felelős a partnerrel való kapcsolattartásért."
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Parent Partner"
-msgstr "Fölérendelt Partner"
+msgstr "Fölérendelt partner"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
-msgstr "Frissítés megszakítása"
+msgstr "Fejlesztés megszakítása"
 
 #. module: base
 #: model:res.country,name:base.ci
@@ -3677,8 +3686,8 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view"
 msgstr ""
-"If set to true, the action will not be displayed on the right toolbar of a "
-"form view"
+"Ha igazra van állítva, a művelet nem fog megjelenni az űrlap nézet jobb "
+"oldali eszköztárában"
 
 #. module: base
 #: model:res.country,name:base.ms
@@ -3692,13 +3701,14 @@ msgid ""
 "The Selection Options expression is not a valid Pythonic expression.Please "
 "provide an expression in the [('key','Label'), ...] format."
 msgstr ""
-"The Selection Options expression is not a valid Pythonic expression.Please "
-"provide an expression in the [('key','Label'), ...] format."
+"A Kiválasztási lehetőségek kifejezés nem egy érvényes Python kifejezés. "
+"Kérem adjon meg egy kifejezést a következő formátumban [('key','Label'), "
+"...]."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
 msgid "Application Terms"
-msgstr "Alkalmazás szövegelemek"
+msgstr "Alkalmazás feltételek"
 
 #. module: base
 #: help:res.config.users,context_tz:0
@@ -3706,7 +3716,9 @@ msgstr "Alkalmazás szövegelemek"
 msgid ""
 "The user's timezone, used to perform timezone conversions between the server "
 "and the client."
-msgstr "A felhasználó időzónája."
+msgstr ""
+"A felhasználó időzónája, az időzóna átváltására szolgál a szerver és a "
+"kliens között."
 
 #. module: base
 #: field:ir.module.module,demo:0
@@ -3729,8 +3741,8 @@ msgid ""
 "Source activity. When this activity is over, the condition is tested to "
 "determine if we can start the ACT_TO activity."
 msgstr ""
-"Source activity. When this activity is over, the condition is tested to "
-"determine if we can start the ACT_TO activity."
+"Forrás tevékenység. Ha ez a tevékenység véget ér, a feltétel tesztelésre "
+"kerül annak eldöntésére, hogy elindíthatjuk-e az ACT_TO tevékenységet."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_3
@@ -3743,8 +3755,8 @@ msgid ""
 "For one2many fields, the field on the target model that implement the "
 "opposite many2one relationship"
 msgstr ""
-"For one2many fields, the field on the target model that implement the "
-"opposite many2one relationship"
+"A one2many mezőknél, a célmodel mezője, amely implementálja az ellentétes "
+"many2one kapcsolatot"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_view
@@ -3774,12 +3786,12 @@ msgstr "Etiópia"
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in three chars.\n"
-msgstr "The state code in three chars.\n"
+msgstr "Az állam kódja három karakterben.\n"
 
 #. module: base
 #: model:res.country,name:base.sj
 msgid "Svalbard and Jan Mayen Islands"
-msgstr "Svalbard and Jan Mayen Islands"
+msgstr "Spicbergák és Jan Mayen Szigetek"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
@@ -3800,7 +3812,7 @@ msgstr "Csoportosítás..."
 #: view:res.config:0
 #: view:res.config.installer:0
 msgid "title"
-msgstr "title"
+msgstr "cím"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
@@ -3815,7 +3827,7 @@ msgstr "Fordítás"
 #. module: base
 #: selection:res.request,state:0
 msgid "closed"
-msgstr "closed"
+msgstr "lezárt"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -3825,7 +3837,7 @@ msgstr "get"
 #. module: base
 #: help:ir.model.fields,on_delete:0
 msgid "On delete property for many2one fields"
-msgstr "On delete property for many2one fields"
+msgstr "Törlés tulajdonság many2one mezőkhöz"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
@@ -3846,7 +3858,7 @@ msgstr "Tartomány érték"
 #. module: base
 #: view:ir.actions.server:0
 msgid "SMS Configuration"
-msgstr "SMS konfiguráció"
+msgstr "SMS beállítás"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3857,12 +3869,12 @@ msgstr "Spanyol (BO) / Español (BO)"
 #: model:ir.actions.act_window,name:base.ir_access_act
 #: model:ir.ui.menu,name:base.menu_ir_access_act
 msgid "Access Controls List"
-msgstr "Access Controls List"
+msgstr "Hozzáférési szabályok listája"
 
 #. module: base
 #: model:res.country,name:base.um
 msgid "USA Minor Outlying Islands"
-msgstr "USA Minor Outlying Islands"
+msgstr "USA kisebb félreeső szigetei"
 
 #. module: base
 #: field:res.partner.bank,state:0
@@ -3881,12 +3893,12 @@ msgstr "A csoport neve nem kezdődhet \"-\"-al."
 #: view:ir.ui.view_sc:0
 #: field:res.partner.title,shortcut:0
 msgid "Shortcut"
-msgstr "Shortcut"
+msgstr "Gyorsbillentyű"
 
 #. module: base
 #: field:ir.model.data,date_init:0
 msgid "Init Date"
-msgstr "Init Date"
+msgstr "Kezdő dátum"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3899,7 +3911,8 @@ msgstr "Gujarati / ગુજરાતી"
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
 msgstr ""
-"Unable to process module \"%s\" because an external dependency is not met: %s"
+"A modul futtatása nem lehetséges \"%s\" mert nem felel meg a külső "
+"függőségeknek.: %s"
 
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
@@ -3926,7 +3939,7 @@ msgstr "Bankszámla tulajdonos"
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form
 msgid "Client Actions Connections"
-msgstr "Client Actions Connections"
+msgstr "Kliens műveleti kapcsolatok"
 
 #. module: base
 #: field:ir.attachment,res_name:0
@@ -3942,7 +3955,7 @@ msgstr "Órák"
 #. module: base
 #: model:res.country,name:base.gp
 msgid "Guadeloupe (French)"
-msgstr "Guadeloupe (French)"
+msgstr "Guadeloupe (Francia)"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:157
@@ -3959,9 +3972,9 @@ msgid ""
 "form, signal tests the name of the pressed button. If signal is NULL, no "
 "button is necessary to validate this transition."
 msgstr ""
-"When the operation of transition comes from a button pressed in the client "
-"form, signal tests the name of the pressed button. If signal is NULL, no "
-"button is necessary to validate this transition."
+"Ha a műveleti átmenet a kliens űrlapon található gomb megnyomásával "
+"történik, a jelző ellenőrzi a megnyomott gomb nevét. Ha a jel NULLA, nem "
+"szükséges gomb az átmenet érvényesítéséhez."
 
 #. module: base
 #: help:multi_company.default,object_id:0
@@ -3971,7 +3984,7 @@ msgstr "A szabály által érintett objektum"
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Directory"
-msgstr "Directory"
+msgstr "Mappa"
 
 #. module: base
 #: field:wizard.ir.model.menu.create,name:0
@@ -3991,7 +4004,7 @@ msgstr "Hónap"
 #. module: base
 #: model:res.country,name:base.my
 msgid "Malaysia"
-msgstr "Malájzia"
+msgstr "Malajzia"
 
 #. module: base
 #: view:base.language.install:0
@@ -4007,7 +4020,7 @@ msgstr "res.request.history"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Client Action Configuration"
-msgstr "Client Action Configuration"
+msgstr "Ügyfél müveleti beállítás"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_address
@@ -4021,8 +4034,8 @@ msgid ""
 "Whether values for this field can be translated (enables the translation "
 "mechanism for that field)"
 msgstr ""
-"Whether values for this field can be translated (enables the translation "
-"mechanism for that field)"
+"Ennek a mezőnek az értékeit fordítani lehet ( ezt ennek a mezőnek a fordító "
+"mechanizmusa teszi lehetővé"
 
 #. module: base
 #: view:res.lang:0
@@ -4056,7 +4069,7 @@ msgstr "ir.actions.url"
 #. module: base
 #: model:res.widget,title:base.currency_converter_widget
 msgid "Currency Converter"
-msgstr "Pénznem konvertáló"
+msgstr "Valuta váltó"
 
 #. module: base
 #: code:addons/orm.py:156
@@ -4078,7 +4091,7 @@ msgstr "A hozzáadott modulok száma"
 #. module: base
 #: view:res.currency:0
 msgid "Price Accuracy"
-msgstr "Értékek számítási pontossága"
+msgstr "Ár pontosság"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4110,7 +4123,7 @@ msgstr "Feladat"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Set as Todo"
-msgstr "Set as Todo"
+msgstr "Beállítás tennivalóként"
 
 #. module: base
 #: field:ir.actions.act_window.view,act_window_id:0
@@ -4126,7 +4139,7 @@ msgstr "Művelet"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Email Configuration"
-msgstr "Email konfiguráció"
+msgstr "Email beállítás"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_cron
@@ -4146,12 +4159,13 @@ msgstr "Aktuális év század nélkül: %(y)s"
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
 msgid "Trigger On"
-msgstr "Trigger On"
+msgstr "Indító bekapcsolva"
 
 #. module: base
 #: sql_constraint:ir.rule:0
 msgid "Rule must have at least one checked access right !"
-msgstr "Rule must have at least one checked access right !"
+msgstr ""
+"A szabálynak tartalmaznia kell legalább egy bejelölt hozzáférési jogot !"
 
 #. module: base
 #: model:res.country,name:base.fj
@@ -4198,7 +4212,7 @@ msgstr "Izrael"
 #. module: base
 #: model:ir.actions.wizard,name:base.wizard_server_action_create
 msgid "Create Action"
-msgstr "Create Action"
+msgstr "Művelet létrehozása"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_model
@@ -4210,7 +4224,7 @@ msgstr "Objektumok"
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
-msgstr "Idő formátum"
+msgstr "Idő Formátum"
 
 #. module: base
 #: view:ir.module.module:0
@@ -4271,12 +4285,12 @@ msgstr "Kimaradt ismétlése"
 #. module: base
 #: help:ir.actions.server,state:0
 msgid "Type of the Action that is to be executed"
-msgstr "Type of the Action that is to be executed"
+msgstr "A végrehajtandó művelet típusa"
 
 #. module: base
 #: field:ir.server.object.lines,server_id:0
 msgid "Object Mapping"
-msgstr "Object Mapping"
+msgstr "Objektum feltérképezése"
 
 #. module: base
 #: help:res.currency,rate:0
@@ -4321,12 +4335,12 @@ msgstr "Partner cégformák"
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
-msgstr "Add an auto-refresh on the view"
+msgstr "Automatikus frissítést ad a nézethez."
 
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if the partner is an Employee."
-msgstr "Jelöld be, ha a partner egy alkalmazott."
+msgstr "Jelölje be, ha a partner egy alkalmazott."
 
 #. module: base
 #: field:ir.actions.report.xml,report_rml_content:0
@@ -4343,7 +4357,7 @@ msgstr "Feladatok"
 #. module: base
 #: field:base.language.export,advice:0
 msgid "Advice"
-msgstr "Advice"
+msgstr "Tanács"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_attachment
@@ -4376,13 +4390,13 @@ msgid ""
 "Provide the field name where the record id is stored after the create "
 "operations. If it is empty, you can not track the new record."
 msgstr ""
-"Provide the field name where the record id is stored after the create "
-"operations. If it is empty, you can not track the new record."
+"Adja meg a mezőnevet, ahol a record azonosító tárolásra kerül a létrehozás "
+"művlet után. Ha üres, az új recordot nem lehet nyomon követni"
 
 #. module: base
 #: help:ir.model.fields,relation:0
 msgid "For relationship fields, the technical name of the target model"
-msgstr "For relationship fields, the technical name of the target model"
+msgstr "A kapcsolat mezőknél a cél model műszaki neve."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4392,12 +4406,12 @@ msgstr "Indonéz / Bahasa Indonesia"
 #. module: base
 #: field:ir.ui.view,inherit_id:0
 msgid "Inherited View"
-msgstr "Örökölt nézet"
+msgstr "Örökölt Nézet"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Source Term"
-msgstr "Angol kifejezés"
+msgstr "Forrás feltétel"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_main_pm
@@ -4427,13 +4441,13 @@ msgstr "Felhasználó létrehozás"
 #. module: base
 #: view:partner.clear.ids:0
 msgid "Want to Clear Ids ? "
-msgstr "Want to Clear Ids ? "
+msgstr "Törölni kívánja az azonosítókat? "
 
 #. module: base
 #: field:publisher_warranty.contract,name:0
 #: field:publisher_warranty.contract.wizard,name:0
 msgid "Serial Key"
-msgstr "Sorozat szám"
+msgstr "Sorozatszám"
 
 #. module: base
 #: selection:res.request,priority:0
@@ -4443,7 +4457,7 @@ msgstr "Alacsony"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_audit
 msgid "Audit"
-msgstr "Audit"
+msgstr "Vizsgálat"
 
 #. module: base
 #: model:res.country,name:base.lc
@@ -4453,13 +4467,14 @@ msgstr "Saint Lucia"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Maintenance Contract"
-msgstr "Maintenance Contract"
+msgstr "Karbantartási szerződés"
 
 #. module: base
 #: help:ir.actions.server,trigger_obj_id:0
 msgid "Select the object from the model on which the workflow will executed."
 msgstr ""
-"Select the object from the model on which the workflow will executed."
+"Kiválasztja azt az objektumot a modelből, amelyen a munkafolyamat el lesz "
+"végezve."
 
 #. module: base
 #: field:res.partner,employee:0
@@ -4469,12 +4484,12 @@ msgstr "Alkalmazott"
 #. module: base
 #: field:ir.model.access,perm_create:0
 msgid "Create Access"
-msgstr "Létrehozás"
+msgstr "Létrehozási hozzáférés"
 
 #. module: base
 #: field:res.partner.address,state_id:0
 msgid "Fed. State"
-msgstr "Szöv. Állam"
+msgstr "Szöv. állam"
 
 #. module: base
 #: field:ir.actions.server,copy_object:0
@@ -4489,7 +4504,7 @@ msgstr "Memóriában tárolt model"
 #. module: base
 #: view:partner.clear.ids:0
 msgid "Clear Ids"
-msgstr "Clear Ids"
+msgstr "Aznosítók törlése"
 
 #. module: base
 #: model:res.country,name:base.io
@@ -4506,12 +4521,12 @@ msgstr "Felhasználói felület"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mapping"
-msgstr "Field Mapping"
+msgstr "Mező leképezés"
 
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Refresh Validation Dates"
-msgstr "Refresh Validation Dates"
+msgstr "Érvényesítési dátumok frissítése"
 
 #. module: base
 #: view:ir.model:0
@@ -4582,7 +4597,7 @@ msgstr "_Ok"
 #. module: base
 #: help:ir.filters,user_id:0
 msgid "False means for every user"
-msgstr "False means for every user"
+msgstr "Minden felhasználó számára hibás"
 
 #. module: base
 #: code:addons/base/module/module.py:198
@@ -4648,7 +4663,7 @@ msgstr "Beütemezett frissítések alkalmazása."
 #. module: base
 #: view:res.widget:0
 msgid "Widgets"
-msgstr "Widgets"
+msgstr "Grafikus elem"
 
 #. module: base
 #: model:res.country,name:base.cz
@@ -4658,7 +4673,7 @@ msgstr "Cseh Köztársaság"
 #. module: base
 #: view:res.widget.wizard:0
 msgid "Widget Wizard"
-msgstr "Widget Wizard"
+msgstr "Grafikus elem varázsló"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
@@ -4667,9 +4682,9 @@ msgid ""
 "OpenERP. They are launched during the installation of new modules, but you "
 "can choose to restart some wizards manually from this menu."
 msgstr ""
-"The configuration wizards are used to help you configure a new instance of "
-"OpenERP. They are launched during the installation of new modules, but you "
-"can choose to restart some wizards manually from this menu."
+"A beállítóvarázsló az OpenERP új példányának beállításában segít. Az új "
+"modulok installálása alatt indulnak el, de választhatod azt is, hogy néhány "
+"varázslót manuálisan indítasz újra ebből a menüből."
 
 #. module: base
 #: code:addons/base/res/res_user.py:206
@@ -4678,8 +4693,8 @@ msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
-"Please use the change password wizard (in User Preferences or User menu) to "
-"change your own password."
+"Kérlek, válaszd a jelszóváltoztató varázslót (a Felhasználói beállításokban "
+"vagy a Felhasználói menüben), hogy megváltoztasd a jelszavadat."
 
 #. module: base
 #: code:addons/orm.py:1350
@@ -4698,14 +4713,14 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another data field"
 msgstr ""
-"The path to the main report file (depending on Report Type) or NULL if the "
-"content is in another data field"
+"Az elérési út a fő jelentés fájlhoz(a Jelentés típusától függően) vagy NULL "
+"érték, ha a tartalom egy másik adatmezőben van."
 
 #. module: base
 #: help:res.config.users,company_id:0
 #: help:res.users,company_id:0
 msgid "The company this user is currently working for."
-msgstr "The company this user is currently working for."
+msgstr "A vállalat,amelynek a jelenlegi felhasznál dolgozik."
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
@@ -4720,7 +4735,7 @@ msgstr "Átmenet"
 #. module: base
 #: field:res.groups,menu_access:0
 msgid "Access Menu"
-msgstr "Access Menu"
+msgstr "Hozzáférési menü"
 
 #. module: base
 #: model:res.country,name:base.na
@@ -4766,7 +4781,7 @@ msgstr "Spanyol (MX) / Español (MX)"
 #. module: base
 #: view:res.log:0
 msgid "My Logs"
-msgstr "Logjaim"
+msgstr "Naplóim"
 
 #. module: base
 #: model:res.country,name:base.bt
@@ -4786,22 +4801,22 @@ msgstr "Textilipari szállítók"
 #. module: base
 #: selection:ir.actions.url,target:0
 msgid "This Window"
-msgstr "This Window"
+msgstr "Ez az ablak"
 
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contracts"
-msgstr "Publisher Warranty Contracts"
+msgstr "Kiadási garancia szerződések"
 
 #. module: base
 #: help:res.log,name:0
 msgid "The logging message."
-msgstr "The logging message."
+msgstr "A bejelentkező üzenet"
 
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
-msgstr "File Formátum"
+msgstr "Fájlformátum"
 
 #. module: base
 #: field:res.lang,iso_code:0
@@ -4831,9 +4846,8 @@ msgid ""
 "federal states you are working on from here. Each state is attached to one "
 "country."
 msgstr ""
-"If you are working on the American market, you can manage the different "
-"federal states you are working on from here. Each state is attached to one "
-"country."
+"Ha az amerikiai piacon dolgozik akkor innen kezelheti a különböző szövetségi "
+"államokat, melyekkel dolgozik. Minden állam egy országhoz van csatolva."
 
 #. module: base
 #: view:workflow.workitem:0
@@ -4872,7 +4886,8 @@ msgstr "Alkalmazottak"
 msgid ""
 "If this log item has been read, get() should not send it to the client"
 msgstr ""
-"If this log item has been read, get() should not send it to the client"
+"Ha ez a naplóelem elolvasásra került, a get() nem kell hogy elküldje az "
+"ügyfélnek"
 
 #. module: base
 #: field:res.company,rml_header2:0
@@ -4883,7 +4898,7 @@ msgstr "RML belső fejléc"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr "Search View Ref."
+msgstr "Nézet hivatkozás keresése"
 
 #. module: base
 #: field:ir.module.module,installed_version:0
@@ -4897,9 +4912,10 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
-"Track from where is coming your leads and opportunities by creating specific "
-"channels that will be maintained at the creation of a document in the "
-"system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
+"Kövesse nyomon, hogy honnan érkeznek a lehetőségei egy speciális csatorna "
+"létrehozásával, amely  rendszerben egy dokumentum megalkotásával lesz "
+"fenntartva. Néhány példa a csatornákra: weboldal, telefonhívás, újraküldő "
+"stb."
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field
@@ -4952,13 +4968,13 @@ msgstr "Ismeretlen"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_users_my
 msgid "Change My Preferences"
-msgstr "Change My Preferences"
+msgstr "Változtassa meg a beállításaimat"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:164
 #, python-format
 msgid "Invalid model name in the action definition."
-msgstr "Invalid model name in the action definition."
+msgstr "Érvénytelen model név a műveleti meghatározásban"
 
 #. module: base
 #: field:partner.sms.send,text:0
@@ -4988,7 +5004,7 @@ msgstr "Egyéni mező"
 #. module: base
 #: field:ir.module.module,web:0
 msgid "Has a web component"
-msgstr "Has a web component"
+msgstr "Van egy webes összetevője"
 
 #. module: base
 #: model:res.country,name:base.cc
@@ -5027,18 +5043,18 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"This addon is already installed on your system"
+"Ez az addon már telepítve van az Ön rendszerében"
 
 #. module: base
 #: help:ir.cron,interval_number:0
 msgid "Repeat every x."
-msgstr "Repeat every x."
+msgstr "Ismételjen minden x-et."
 
 #. module: base
 #: wizard_view:server.action.create,step_1:0
 #: wizard_field:server.action.create,step_1,report:0
 msgid "Select Report"
-msgstr "Select Report"
+msgstr "Válasszon jelentést"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -5048,7 +5064,7 @@ msgstr "1cm 28cm 20cm 28cm"
 #. module: base
 #: field:ir.module.module,maintainer:0
 msgid "Maintainer"
-msgstr "Maintainer"
+msgstr "Karbantartó"
 
 #. module: base
 #: field:ir.sequence,suffix:0
@@ -5092,13 +5108,13 @@ msgid ""
 "If specified, this action will be opened at logon for this user, in addition "
 "to the standard menu."
 msgstr ""
-"If specified, this action will be opened at logon for this user, in addition "
-"to the standard menu."
+"Ha meghatározásra kerül, ez a művelet meg lesz nyitva bejelentkezéskor ennél "
+"a felhasználónál, a standard menü mellett."
 
 #. module: base
 #: view:ir.values:0
 msgid "Client Actions"
-msgstr "Client Actions"
+msgstr "Kliens műveletek"
 
 #. module: base
 #: code:addons/orm.py:1806
@@ -5113,8 +5129,8 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
-"You try to upgrade a module that depends on the module: %s.\n"
-"But this module is not available in your system."
+"Ön egy olyan modult próbál frissíteni, ami a következő modultól függ: %s.\n"
+"Ez a modul azonban nem elérhető az Ön rendszerében."
 
 #. module: base
 #: field:workflow.transition,act_to:0
@@ -5124,7 +5140,7 @@ msgstr "Cél tevékenység"
 #. module: base
 #: view:ir.values:0
 msgid "Connect Events to Actions"
-msgstr "Connect Events to Actions"
+msgstr "Összeköti az eseményeket a műveletekkel."
 
 #. module: base
 #: model:ir.model,name:base.model_base_update_translations
@@ -5135,7 +5151,7 @@ msgstr "base.update.translations"
 #: field:ir.module.category,parent_id:0
 #: field:res.partner.category,parent_id:0
 msgid "Parent Category"
-msgstr "Fölérendelt kategória"
+msgstr "Szülő kategória"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -5185,7 +5201,7 @@ msgstr "ir.server.object.lines"
 #: code:addons/base/module/module.py:531
 #, python-format
 msgid "Module %s: Invalid Quality Certificate"
-msgstr "Module %s: Invalid Quality Certificate"
+msgstr "Module %s: Érvénytelen minőségi bizonyítvány"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -5204,9 +5220,10 @@ msgid ""
 "Keep empty to not save the printed reports. You can use a python expression "
 "with the object and time variables."
 msgstr ""
-"This is the filename of the attachment used to store the printing result. "
-"Keep empty to not save the printed reports. You can use a python expression "
-"with the object and time variables."
+"Ez a fáljneve annak a csatolmánynak, ami tartalmazta rakáron a nyomtatott "
+"eredményeket. Tartsa üresen,hogy a nyomtatott jelentések ne legyenek "
+"elmentve. Használhat egy python kifejezést az objektumml és a változókkal "
+"kapcsolatban."
 
 #. module: base
 #: selection:ir.property,type:0
@@ -5222,7 +5239,7 @@ msgstr "Nigéria"
 #: code:addons/base/ir/ir_model.py:250
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
-msgstr "For selection fields, the Selection Options must be given!"
+msgstr "A kiválasztás mezőkhöz a Kiválasztás opciót meg kell adni!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_sms_send
@@ -5242,7 +5259,7 @@ msgstr "Web ikon"
 #. module: base
 #: view:ir.values:0
 msgid "Values for Event Type"
-msgstr "Values for Event Type"
+msgstr "Értékek az Esemény típus számára"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
@@ -5257,7 +5274,9 @@ msgstr "Hong Kong"
 #. module: base
 #: help:ir.actions.server,name:0
 msgid "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
-msgstr "Easy to Refer action by name e.g. One Sales Order -> Many Invoices"
+msgstr ""
+"Könnyen lehet hivatkozni név szerint műveletre,pl.:értékesítési megbízás -> "
+"számlák"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_address_form
@@ -5270,13 +5289,14 @@ msgid ""
 "installed the CRM, with the history tab, you can track all the interactions "
 "with a partner such as opportunities, emails, or sales orders issued."
 msgstr ""
-"Customers (also called Partners in other areas of the system) helps you "
-"manage your address book of companies whether they are prospects, customers "
-"and/or suppliers. The partner form allows you to track and record all the "
-"necessary information to interact with your partners from the company "
-"address to their contacts as well as pricelists, and much more. If you "
-"installed the CRM, with the history tab, you can track all the interactions "
-"with a partner such as opportunities, emails, or sales orders issued."
+"A vásárlók (a rendszer más területein Partnerek) segít kezelni a vállalatok "
+"címjegyzékeit, legyenek azok lehetséges ügyfelek, ügyfelek és / vagy "
+"szállítók. A patner űrlap lehetővé teszi, hogy nyomon kövesse és rögzítse az "
+"összes szükséges információt a partnereivel való érintkezéshez, a vállalat "
+"címétől kezdve, a kontaktjaikon keresztül  az árlistáig stb.Ha installálta a "
+"CRM-et, az Előzmények füllel nyomon követheti az összes interakciót a "
+"partnereivel, mint például, lehetőségek, emailek vagy értéksítési "
+"megrendelések."
 
 #. module: base
 #: model:res.country,name:base.ph
@@ -5317,7 +5337,7 @@ msgstr "workflow.transition"
 #. module: base
 #: view:res.lang:0
 msgid "%a - Abbreviated weekday name."
-msgstr "%a - Nap rövid neve"
+msgstr "%a - Hét napjának rövidített neve"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -5344,13 +5364,13 @@ msgstr ""
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this scheduler"
-msgstr "Next planned execution date for this scheduler"
+msgstr "A következő, tervezett végrehajási dátum ezen ütemező szerint"
 
 #. module: base
 #: help:res.config.users,view:0
 #: help:res.users,view:0
 msgid "Choose between the simplified interface and the extended one"
-msgstr "Choose between the simplified interface and the extended one"
+msgstr "Válasszon az egyszerűsített és a bővített kezelőfelület közül"
 
 #. module: base
 #: model:res.country,name:base.np
@@ -5379,9 +5399,9 @@ msgid ""
 "groups. If this field is empty, OpenERP will compute visibility based on the "
 "related object's read access."
 msgstr ""
-"If you have groups, the visibility of this menu will be based on these "
-"groups. If this field is empty, OpenERP will compute visibility based on the "
-"related object's read access."
+"Ha vannak csoportjai, akkor ezen menü láthatósága ezektől a csoportoktól "
+"függ. Ha ez a mező üres, az OpenERP a kapcsolódó objektumok olvasási "
+"hozzáférése alapján számítja ki a láthatóságot."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_ui_view_custom
@@ -5411,7 +5431,8 @@ msgstr "Modullista frissítés"
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
 msgstr ""
-"Unable to upgrade module \"%s\" because an external dependency is not met: %s"
+"Nem lehet a \"%s\" modult frissíteni, mert nem felel meg egy külső "
+"feltételnek: %s"
 
 #. module: base
 #: code:addons/base/res/res_user.py:257
@@ -5422,10 +5443,11 @@ msgid ""
 "sure to save and close all forms before switching to a different company. "
 "(You can click on Cancel in the User Preferences now)"
 msgstr ""
-"Please keep in mind that documents currently displayed may not be relevant "
-"after switching to another company. If you have unsaved changes, please make "
-"sure to save and close all forms before switching to a different company. "
-"(You can click on Cancel in the User Preferences now)"
+"Kérem vegye figyelembe, hogy a jelenleg megjelenített dokumentumok nem "
+"lesznek aktuálisak miután átváltott egy másik vállalatra. Ha van mentetlen "
+"változtatása, kérem mentsen és zárjon be minden űrlapot, mielőtt átvált egy "
+"másik vállalatra. (Most rákattinthat a Mégse gombra a Felhasználói "
+"beállításokban)"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -5451,7 +5473,7 @@ msgstr "Szlovén / slovenščina"
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
 msgid "Reload from Attachment"
-msgstr "Reload from Attachment"
+msgstr "Töltse újra a csatolmányból"
 
 #. module: base
 #: model:res.country,name:base.bv
@@ -5467,7 +5489,7 @@ msgstr "Melléklet neve"
 #: field:base.language.export,data:0
 #: field:base.language.import,data:0
 msgid "File"
-msgstr "File"
+msgstr "Fájl"
 
 #. module: base
 #: view:res.config.users:0
@@ -5477,7 +5499,7 @@ msgstr "Felhasználó hozzáadása"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
 msgid "Module Upgrade Install"
-msgstr "Module Upgrade Install"
+msgstr "Modulfejlesztés installálása"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_configuration_wizard
@@ -5501,7 +5523,7 @@ msgstr "Szállító"
 #: view:ir.actions.server:0
 #: selection:ir.actions.server,state:0
 msgid "Multi Actions"
-msgstr "Multi Actions"
+msgstr "Többféle művelet"
 
 #. module: base
 #: view:base.language.export:0
@@ -5513,7 +5535,7 @@ msgstr "_Close"
 #. module: base
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr "Alapértelmezett vállalat"
+msgstr "Alapértelmezett Vállalat"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5523,13 +5545,13 @@ msgstr "Spanyol (EC) / Español (EC)"
 #. module: base
 #: help:ir.ui.view,xml_id:0
 msgid "ID of the view defined in xml file"
-msgstr "ID of the view defined in xml file"
+msgstr "Az xml fájlban meghatározott nézet azonosítója"
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_import
 #: model:ir.ui.menu,name:base.menu_view_base_module_import
 msgid "Import Module"
-msgstr "Modul importálás"
+msgstr "Modul Importálás"
 
 #. module: base
 #: model:res.country,name:base.as
@@ -5539,17 +5561,17 @@ msgstr "Amerikai Szamoa"
 #. module: base
 #: help:ir.actions.act_window,res_model:0
 msgid "Model name of the object to open in the view window"
-msgstr "Model name of the object to open in the view window"
+msgstr "Az objektum model neve a nézet ablakban való megnyitásához."
 
 #. module: base
 #: field:res.log,secondary:0
 msgid "Secondary Log"
-msgstr "Secondary Log"
+msgstr "Másodlagos napló"
 
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr "Selectable"
+msgstr "választható"
 
 #. module: base
 #: view:res.request.link:0
@@ -5601,7 +5623,7 @@ msgstr "Réunion (Francia)"
 msgid ""
 "New column name must still start with x_ , because it is a custom field!"
 msgstr ""
-"New column name must still start with x_ , because it is a custom field!"
+"Az új oszlopnévnek még mindig x_-sal kell kezdődnie, mert ez egy egyéni mező!"
 
 #. module: base
 #: view:ir.model.access:0
@@ -5629,7 +5651,7 @@ msgstr "Salamon-szigetek"
 #: code:addons/orm.py:3817
 #, python-format
 msgid "AccessError"
-msgstr "AccessError"
+msgstr "Hozzáférési hiba"
 
 #. module: base
 #: view:res.request:0
@@ -5693,12 +5715,12 @@ msgstr "Modul kategória"
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Ignore"
-msgstr "Ignore"
+msgstr "Mellőz"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Reference Guide"
-msgstr "Reference Guide"
+msgstr "Hivatkozási útmutató"
 
 #. module: base
 #: view:ir.ui.view:0
@@ -5719,10 +5741,10 @@ msgid ""
 "Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
 "be possible to email new users."
 msgstr ""
-"If an email is provided, the user will be sent a message welcoming him.\n"
+"Ha rendelkezésre áll email, a felhasználó üdvözlő üzenetet kap.\n"
 "\n"
-"Warning: if \"email_from\" and \"smtp_server\" aren't configured, it won't "
-"be possible to email new users."
+"Figyelem: ha \"email_from\" és \"smtp_server\" nincs beállítva, nem "
+"lehetséges az üzenetküldés új felhasználóknak."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5742,7 +5764,7 @@ msgstr "Tokelau"
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL path"
-msgstr "XSL path"
+msgstr "XSL elérési út"
 
 #. module: base
 #: model:res.country,name:base.bn
@@ -5777,7 +5799,7 @@ msgstr "ir.actions.todo"
 #: code:addons/base/res/res_config.py:94
 #, python-format
 msgid "Couldn't find previous ir.actions.todo"
-msgstr "Couldn't find previous ir.actions.todo"
+msgstr "Nem található a korábbi ir.actions.todo"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5787,7 +5809,7 @@ msgstr "Általános beállítások"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration_shortcut
 msgid "Custom Shortcuts"
-msgstr "Custom Shortcuts"
+msgstr "Egyéni gyorsbillentyűk"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5857,7 +5879,7 @@ msgstr "A %s model nem létezik!"
 #: code:addons/base/res/res_lang.py:159
 #, python-format
 msgid "You cannot delete the language which is User's Preferred Language !"
-msgstr "You cannot delete the language which is User's Preferred Language !"
+msgstr "Nem törölheti a nyelvet, mivel ez a felhasználó preferált nyelve !"
 
 #. module: base
 #: code:addons/fields.py:103
@@ -5870,7 +5892,7 @@ msgstr "Not implemented get_memory method !"
 #: field:ir.actions.server,code:0
 #: selection:ir.actions.server,state:0
 msgid "Python Code"
-msgstr "Python Code"
+msgstr "Python kód"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:67
@@ -5881,7 +5903,7 @@ msgstr "Nem lehet létrehozni a modul file-: %s !"
 #. module: base
 #: model:ir.module.module,description:base.module_meta_information
 msgid "The kernel of OpenERP, needed for all installation."
-msgstr "The kernel of OpenERP, needed for all installation."
+msgstr "Az OpenERP kernelje, minden telepítéshez szükséges."
 
 #. module: base
 #: view:base.language.install:0
@@ -5900,7 +5922,7 @@ msgstr "Mégsem"
 #. module: base
 #: selection:base.language.export,format:0
 msgid "PO File"
-msgstr "PO File"
+msgstr "PO fájl"
 
 #. module: base
 #: model:res.country,name:base.nt
@@ -5920,7 +5942,7 @@ msgstr "Egyéni"
 #. module: base
 #: view:res.request:0
 msgid "Current"
-msgstr "Current"
+msgstr "Jelenlegi"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
@@ -5952,7 +5974,7 @@ msgstr "Izland"
 #: model:ir.actions.act_window,name:base.ir_action_window
 #: model:ir.ui.menu,name:base.menu_ir_action_window
 msgid "Window Actions"
-msgstr "Window Actions"
+msgstr "Ablak műveletek"
 
 #. module: base
 #: view:res.lang:0
@@ -5962,7 +5984,7 @@ msgstr "%I - Óra (12 órás) [01,12]."
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
 msgid "Finished"
-msgstr "Finished"
+msgstr "Kész"
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5982,7 +6004,7 @@ msgstr "Rossz vevők"
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Reports :"
-msgstr "Jelentések:"
+msgstr "Jelentések :"
 
 #. module: base
 #: model:res.country,name:base.gy
@@ -5995,19 +6017,20 @@ msgid ""
 "View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
 "views"
 msgstr ""
-"View type: set to 'tree' for a hierarchical tree view, or 'form' for other "
-"views"
+"Nézet típus: 'fa' gombra állítás a hierarchikus fa nézethez, vagy 'űrlap' "
+"más nézetekhez"
 
 #. module: base
 #: code:addons/base/res/res_config.py:421
 #, python-format
 msgid "Click 'Continue' to configure the next addon..."
-msgstr "Click 'Continue' to configure the next addon..."
+msgstr ""
+"Kattintson a 'Folytatás' gombra, hogy beállítsa a következő addont..."
 
 #. module: base
 #: field:ir.actions.server,record_id:0
 msgid "Create Id"
-msgstr "Create Id"
+msgstr "Létrehozási azonosító"
 
 #. module: base
 #: model:res.country,name:base.hn
@@ -6058,7 +6081,7 @@ msgstr "Logikai"
 #. module: base
 #: view:ir.model:0
 msgid "Fields Description"
-msgstr "Mező leírás"
+msgstr "Mező Leírás"
 
 #. module: base
 #: view:ir.attachment:0
@@ -6095,7 +6118,7 @@ msgstr "Nézet"
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be installed"
-msgstr "Telepíteni"
+msgstr "Telepítendő"
 
 #. module: base
 #: help:ir.actions.act_window,display_menu_tip:0
@@ -6103,8 +6126,8 @@ msgid ""
 "It gives the status if the tip has to be displayed or not when a user "
 "executes an action"
 msgstr ""
-"It gives the status if the tip has to be displayed or not when a user "
-"executes an action"
+"Kijelzi az állapotot, ha a tippet meg kell jeleníteni vagy nem, amikor egy "
+"felhasználó végrehajt egy műveletet."
 
 #. module: base
 #: view:ir.model:0
@@ -6184,12 +6207,13 @@ msgstr "Segítség"
 msgid ""
 "If specified, the action will replace the standard menu for this user."
 msgstr ""
-"If specified, the action will replace the standard menu for this user."
+"Ha meg van határozva, akkor a művelet felváltja az általános menüt ennél a "
+"felhasználónál."
 
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Write Object"
-msgstr "Write Object"
+msgstr "Írás objektum"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_fundrising
@@ -6213,8 +6237,8 @@ msgid ""
 "All pending configuration wizards have been executed. You may restart "
 "individual wizards via the list of configuration wizards."
 msgstr ""
-"All pending configuration wizards have been executed. You may restart "
-"individual wizards via the list of configuration wizards."
+"Minden függőben lévő beállítás-varázsló végrehajtásra került. Újraindíthatja "
+"az egyges varázslókat a beállítás-varázslók listáján keresztül."
 
 #. module: base
 #: wizard_button:server.action.create,step_1,create:0
@@ -6229,7 +6253,7 @@ msgstr "Aktuális év századdal: %(year)s"
 #. module: base
 #: field:ir.exports,export_fields:0
 msgid "Export ID"
-msgstr "Export ID"
+msgstr "Export azonosító"
 
 #. module: base
 #: model:res.country,name:base.fr
@@ -6245,7 +6269,7 @@ msgstr "res.log"
 #: help:ir.translation,module:0
 #: help:ir.translation,xml_id:0
 msgid "Maps to the ir_model_data for which this translation is provided."
-msgstr "Maps to the ir_model_data for which this translation is provided."
+msgstr "Leképez az ir_model_data-hoz, amihez ez a fordítás készül"
 
 #. module: base
 #: view:workflow.activity:0
@@ -6272,7 +6296,7 @@ msgstr "Hiba!"
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_contry
 msgid "country_id"
-msgstr "country_id"
+msgstr "ország_id"
 
 #. module: base
 #: field:ir.cron,interval_type:0
@@ -6313,8 +6337,8 @@ msgid ""
 "Select the action that will be executed. Loop action will not be avaliable "
 "inside loop."
 msgstr ""
-"Select the action that will be executed. Loop action will not be avaliable "
-"inside loop."
+"Válassza ki a végrehajtandó műveletet. Ciklus művelet nem elérhető ciklus "
+"műveleten belül."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6356,13 +6380,16 @@ msgstr "Kft."
 msgid ""
 "The group that a user must have to be authorized to validate this transition."
 msgstr ""
-"The group that a user must have to be authorized to validate this transition."
+"A csoport amihez egy felhasználónak hozzá kell tudni férni, hogy jóvá hagyja "
+"ezt az átmenetet."
 
 #. module: base
 #: constraint:res.config.users:0
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A kiválasztott vállalat nincs a felhasználó számára engedélyezett vállalatok "
+"között."
 
 #. module: base
 #: model:res.country,name:base.gi
@@ -6372,12 +6399,12 @@ msgstr "Gibraltár"
 #. module: base
 #: field:ir.actions.report.xml,report_name:0
 msgid "Service Name"
-msgstr "Service Name"
+msgstr "Szolgáltatás név"
 
 #. module: base
 #: model:res.country,name:base.pn
 msgid "Pitcairn Island"
-msgstr "Pitcairn sziget"
+msgstr "Pitcairn-sziget"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -6417,13 +6444,13 @@ msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
 msgstr ""
-"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
-"get the required padding size."
+"Az OpenERP automatikusan hozzárak egy '0'-át a 'Következő szám' bal "
+"oldalára, hogy megkapjuk a megfelelő távolságméretet."
 
 #. module: base
 #: view:res.lang:0
 msgid "%A - Full weekday name."
-msgstr "%A - Nap neve"
+msgstr "%A - A hét napjának teljes neve"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -6433,7 +6460,7 @@ msgstr "Hónapok"
 #. module: base
 #: field:ir.actions.act_window,search_view:0
 msgid "Search View"
-msgstr "Search View"
+msgstr "Keresés nézet"
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -6547,8 +6574,8 @@ msgid ""
 "Manage the partner titles you want to have available in your system. The "
 "partner titles is the legal status of the company: Private Limited, SA, etc."
 msgstr ""
-"Manage the partner titles you want to have available in your system. The "
-"partner titles is the legal status of the company: Private Limited, SA, etc."
+"Kezelje a partner neveket, amelyeket szeretné, hogy elérhetők legyenek a "
+"rendszerben. A partner nevek a vállalat jogi formája: kft, Rt., stb"
 
 #. module: base
 #: view:base.language.export:0
@@ -6562,8 +6589,8 @@ msgid ""
 "You can not read this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
-"You can not read this document (%s) ! Be sure your user belongs to one of "
-"these groups: %s."
+"Nem tudja olvasni ezt a dokumentumot (%s) ! Bizonyosodjon meg róla, hogy a "
+"felhasználója a következő csoportok egyikébe tartozik: %s."
 
 #. module: base
 #: view:res.bank:0
@@ -6582,12 +6609,12 @@ msgstr "Telepített verzió"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Mongolian / монгол"
-msgstr "Mongól / монгол"
+msgstr "Mongol / монгол"
 
 #. module: base
 #: model:res.country,name:base.mr
 msgid "Mauritania"
-msgstr "Mauritania"
+msgstr "Mauritánia"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_translation
@@ -6609,7 +6636,7 @@ msgstr "Tevékenység"
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Postal Address"
-msgstr "Postai cím"
+msgstr "Postai Cím"
 
 #. module: base
 #: field:res.company,parent_id:0
@@ -6639,7 +6666,7 @@ msgstr "Példák"
 #. module: base
 #: field:ir.default,value:0
 msgid "Default Value"
-msgstr "Alapértelmezett érték"
+msgstr "Alapértelmezett Érték"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
@@ -6669,15 +6696,15 @@ msgid ""
 "Customized views are used when users reorganize the content of their "
 "dashboard views (via web client)"
 msgstr ""
-"Customized views are used when users reorganize the content of their "
-"dashboard views (via web client)"
+"Az egyéni nézetek akkor használatosak, amikor a felhasználók újrarendezik a "
+"műszerfal nézetük tartalmát (web kliensen keresztül)"
 
 #. module: base
 #: field:ir.model,name:0
 #: field:ir.model.fields,model:0
 #: field:ir.values,model:0
 msgid "Object Name"
-msgstr "Objektum neve"
+msgstr "Objektumnév"
 
 #. module: base
 #: help:ir.actions.server,srcmodel_id:0
@@ -6685,8 +6712,8 @@ msgid ""
 "Object in which you want to create / write the object. If it is empty then "
 "refer to the Object field."
 msgstr ""
-"Object in which you want to create / write the object. If it is empty then "
-"refer to the Object field."
+"Objektum amiben létre akar hozni / törölni akar objektumot. Ha ez üres, "
+"hivatkozzon az objektum mezőre."
 
 #. module: base
 #: view:ir.module.module:0
@@ -6699,7 +6726,7 @@ msgstr "Nem telepített"
 #: view:workflow.activity:0
 #: field:workflow.activity,out_transitions:0
 msgid "Outgoing Transitions"
-msgstr "Outgoing Transitions"
+msgstr "Kimenő átmenetek"
 
 #. module: base
 #: field:ir.ui.menu,icon:0
@@ -6709,12 +6736,12 @@ msgstr "Ikon"
 #. module: base
 #: help:ir.model.fields,model_id:0
 msgid "The model this field belongs to"
-msgstr "The model this field belongs to"
+msgstr "Az ehhez a modelhez tartozó mező"
 
 #. module: base
 #: model:res.country,name:base.mq
 msgid "Martinique (French)"
-msgstr "Martinique (French)"
+msgstr "Martinique (Francia)"
 
 #. module: base
 #: view:ir.sequence.type:0
@@ -6732,7 +6759,9 @@ msgstr "Üzenetek"
 #. module: base
 #: model:res.country,name:base.ye
 msgid "Yemen"
-msgstr "Jemen"
+msgstr ""
+"Jemen. module: bas: selection:workflow.activity,split_mode:sgid \"Orsgstr "
+"\"Vagy"
 
 #. module: base
 #: selection:workflow.activity,split_mode:0
@@ -6743,7 +6772,7 @@ msgstr "Vagy"
 #: model:ir.actions.act_window,name:base.res_log_act_window
 #: model:ir.ui.menu,name:base.menu_res_log_act_window
 msgid "Client Logs"
-msgstr "Client Logs"
+msgstr "Ügyfél naplók"
 
 #. module: base
 #: model:res.country,name:base.al
@@ -6753,7 +6782,7 @@ msgstr "Albánia"
 #. module: base
 #: model:res.country,name:base.ws
 msgid "Samoa"
-msgstr "Samoa"
+msgstr "Szamoa"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:161
@@ -6762,8 +6791,8 @@ msgid ""
 "You cannot delete the language which is Active !\n"
 "Please de-activate the language first."
 msgstr ""
-"You cannot delete the language which is Active !\n"
-"Please de-activate the language first."
+"Ön nem törölhet Aktív nyelvet !\n"
+"Kérjük először deaktiválja a nyelvet."
 
 #. module: base
 #: view:base.language.install:0
@@ -6773,19 +6802,19 @@ msgid ""
 "number of modules currently installed)..."
 msgstr ""
 "Kérjük legyen türelemmel, mivel ez a művelet több percig is tarthat a "
-"betöltött modulok számától függően"
+"telepített modulok számától függően"
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
 msgid "Child IDs"
-msgstr "Child IDs"
+msgstr "Gyermek elem azonosítók"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:713
 #: code:addons/base/ir/ir_actions.py:716
 #, python-format
 msgid "Problem in configuration `Record Id` in Server Action!"
-msgstr "Problem in configuration `Record Id` in Server Action!"
+msgstr "Probléma a 'Rekord Azonosító' beállításánál a Szerver müveletben!"
 
 #. module: base
 #: code:addons/orm.py:2306
@@ -6803,7 +6832,8 @@ msgstr "Modulok megnyitása"
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_bank_form
 msgid "Manage bank records you want to be used in the system."
-msgstr "Manage bank records you want to be used in the system."
+msgstr ""
+"A banki rekordok kezelése, amelyeket Ön szeretne alkalmazni a rendszerben."
 
 #. module: base
 #: view:base.module.import:0
@@ -6813,7 +6843,7 @@ msgstr "Modul importálás"
 #. module: base
 #: field:ir.actions.server,loop_action:0
 msgid "Loop Action"
-msgstr "Loop Action"
+msgstr "Ciklus művelet"
 
 #. module: base
 #: help:ir.actions.report.xml,report_file:0
@@ -6821,8 +6851,8 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another field"
 msgstr ""
-"The path to the main report file (depending on Report Type) or NULL if the "
-"content is in another field"
+"Az elérési út a fő jelentési fájlhoz (a Jelentés Típustól függően) vagy "
+"NULLA ha a tartalom egy másik mezőn belül található"
 
 #. module: base
 #: model:res.country,name:base.la
@@ -6872,7 +6902,7 @@ msgstr "Togo"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Other Proprietary"
-msgstr "Other Proprietary"
+msgstr "Egyéb tulajdonos"
 
 #. module: base
 #: selection:workflow.activity,kind:0
@@ -6926,8 +6956,8 @@ msgid ""
 "Enable this if you want to execute missed occurences as soon as the server "
 "restarts."
 msgstr ""
-"Enable this if you want to execute missed occurences as soon as the server "
-"restarts."
+"Engedélyezze ezt, ha szeretné végrehajtani a kihagyott előfordulásokat, "
+"amint a szerver újraindul."
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -6938,7 +6968,7 @@ msgstr "Frissítés indítása"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:144
 #, python-format
 msgid "Contract validation error"
-msgstr "Contract validation error"
+msgstr "Szerződés érvényesítési hiba"
 
 #. module: base
 #: field:res.country.state,name:0
@@ -6948,7 +6978,7 @@ msgstr "Állam neve"
 #. module: base
 #: field:workflow.activity,join_mode:0
 msgid "Join Mode"
-msgstr "Join Mode"
+msgstr "Csatlakozási mód"
 
 #. module: base
 #: field:res.config.users,context_tz:0
@@ -6980,7 +7010,9 @@ msgstr "Hiba! Nem hozhat létre rekurzív társult tagokat."
 #. module: base
 #: help:res.lang,code:0
 msgid "This field is used to set/get locales for user"
-msgstr "This field is used to set/get locales for user"
+msgstr ""
+"Ez a mező használatos a helyszínek felhasználóhoz való "
+"beállításához/csatolásához"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
@@ -6998,7 +7030,8 @@ msgstr "HR menedzser vezérlőpult"
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
 msgstr ""
-"Unable to install module \"%s\" because an external dependency is not met: %s"
+"Nem lehetséges a \"%s\" modul telepítése, mivel egy külső függőség nem "
+"került teljesítésre: %s"
 
 #. module: base
 #: view:ir.module.module:0
@@ -7028,10 +7061,11 @@ msgid ""
 "not connect to the system. You can assign them groups in order to give them "
 "specific access to the applications they need to use in the system."
 msgstr ""
-"Create and manage users that will connect to the system. Users can be "
-"deactivated should there be a period of time during which they will/should "
-"not connect to the system. You can assign them groups in order to give them "
-"specific access to the applications they need to use in the system."
+"Hozza létre és kezelje a felhasználókat, akik csatlakozni fognak a "
+"rendszerhez. A felhasználók deaktiválhatóak, ha eltelik egy időszak amelynek "
+"során nem csatlakoznak a rendszerhez. Csoportokhoz rendelheti őket, amely "
+"külön hozzáféréseket biztosít az alkalmazásokhoz, amelyekre szükségük van a "
+"rendszer használatához."
 
 #. module: base
 #: selection:res.request,priority:0
@@ -7107,7 +7141,7 @@ msgstr "Grenada"
 #. module: base
 #: model:res.country,name:base.wf
 msgid "Wallis and Futuna Islands"
-msgstr "Wallis and Futuna Islands"
+msgstr "Wallis és Futuna-szigetek"
 
 #. module: base
 #: selection:server.action.create,init,type:0
@@ -7191,12 +7225,12 @@ msgstr "Adatbázis azonosító nem létezik: %s : %s"
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 2"
-msgstr "GPL Version 2"
+msgstr "GPL Verzió 2"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL Version 3"
-msgstr "GPL Version 3"
+msgstr "GPL Verzió 3"
 
 #. module: base
 #: code:addons/orm.py:836
@@ -7207,7 +7241,7 @@ msgstr "key '%s' not found in selection field '%s'"
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Correct EAN13"
-msgstr "Correct EAN13"
+msgstr "EAN13 kijavítása"
 
 #. module: base
 #: code:addons/orm.py:2317
@@ -7237,7 +7271,7 @@ msgstr "Rövid leírás"
 #: field:ir.actions.act_window,context:0
 #: field:ir.filters,context:0
 msgid "Context Value"
-msgstr "Context Value"
+msgstr "Kontextus érték"
 
 #. module: base
 #: view:ir.sequence:0
@@ -7247,12 +7281,12 @@ msgstr "Óra (00-24): %(h24)s"
 #. module: base
 #: field:ir.cron,nextcall:0
 msgid "Next Execution Date"
-msgstr "Köv. futás ideje"
+msgstr "Következő végrehajtás dátuma"
 
 #. module: base
 #: help:multi_company.default,field_id:0
 msgid "Select field property"
-msgstr "Select field property"
+msgstr "Mező tulajdonság kiválasztása"
 
 #. module: base
 #: field:res.request.history,date_sent:0
@@ -7311,7 +7345,7 @@ msgstr "Telepítés megszakítása"
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Selection Options"
-msgstr "Kiválasztási feltételek"
+msgstr "Választási lehetőségek"
 
 #. module: base
 #: field:res.partner.category,parent_right:0
@@ -7321,12 +7355,12 @@ msgstr "Jobb szülő"
 #. module: base
 #: view:res.lang:0
 msgid "Legends for Date and Time Formats"
-msgstr "Útmutató a dátum és idő formátumokhoz"
+msgstr "Útmutató a Dátum és Idő formátumokhoz"
 
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Copy Object"
-msgstr "Copy Object"
+msgstr "Objektum másolása"
 
 #. module: base
 #: code:addons/base/res/res_user.py:581
@@ -7334,7 +7368,8 @@ msgstr "Copy Object"
 msgid ""
 "Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
 msgstr ""
-"Group(s) cannot be deleted, because some user(s) still belong to them: %s !"
+"A csoport(ok) nem törölhető(ek), mivel néhány felhasználó még mindig oda "
+"tartozik: %s !"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_country_state
@@ -7351,7 +7386,7 @@ msgstr "Hozzáférési szabályok"
 #. module: base
 #: field:ir.default,ref_table:0
 msgid "Table Ref."
-msgstr "Table Ref."
+msgstr "Táblázat Ref."
 
 #. module: base
 #: field:ir.actions.act_window,res_model:0
@@ -7421,7 +7456,7 @@ msgid ""
 "Number of time the function is called,\n"
 "a negative number indicates no limit"
 msgstr ""
-"A művelet indításának száma,\n"
+"A függvény hívásának száma,\n"
 "negatív szám esetén nincs korlát."
 
 #. module: base
@@ -7436,7 +7471,7 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view_sc,user_id:0
 msgid "User Ref."
-msgstr "Felhasználó ref."
+msgstr "Felhasználó Ref."
 
 #. module: base
 #: code:addons/base/res/res_user.py:580
@@ -7447,7 +7482,7 @@ msgstr "Figyelem!"
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
 msgid "Google Maps"
-msgstr "Google Maps"
+msgstr "Google Térképek"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -7458,7 +7493,7 @@ msgstr "Google Maps"
 #: model:ir.ui.menu,name:base.menu_marketing_config_root
 #: view:res.company:0
 msgid "Configuration"
-msgstr "Konfiguráció"
+msgstr "Beállítások"
 
 #. module: base
 #: model:ir.model,name:base.model_publisher_warranty_contract_wizard
@@ -7468,7 +7503,7 @@ msgstr "publisher_warranty.contract.wizard"
 #. module: base
 #: field:ir.actions.server,expression:0
 msgid "Loop Expression"
-msgstr "Loop Expression"
+msgstr "Ciklus kifejezés"
 
 #. module: base
 #: field:publisher_warranty.contract,date_start:0
@@ -7577,7 +7612,7 @@ msgstr "várakozik"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report file"
-msgstr "Jelentés file"
+msgstr "Jelentés fájl"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_triggers
@@ -7588,7 +7623,7 @@ msgstr "workflow.triggers"
 #: code:addons/base/ir/ir_model.py:62
 #, python-format
 msgid "Invalid search criterions"
-msgstr "Invalid search criterions"
+msgstr "Érvénytelen keresési kritériumok"
 
 #. module: base
 #: view:ir.attachment:0
@@ -7601,8 +7636,8 @@ msgid ""
 "If set to true, the wizard will not be displayed on the right toolbar of a "
 "form view."
 msgstr ""
-"If set to true, the wizard will not be displayed on the right toolbar of a "
-"form view."
+"Ha igazra van állítva, a varázsló nem fogja megjeleníteni a jobb oldali "
+"eszköztáron az űrlap nézetet."
 
 #. module: base
 #: view:base.language.import:0
@@ -7622,7 +7657,7 @@ msgstr "Nézet hiv."
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Selection"
-msgstr "Selection"
+msgstr "Kiválasztás"
 
 #. module: base
 #: field:res.company,rml_header1:0
@@ -7649,15 +7684,15 @@ msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
 "But the latter module is not available in your system."
 msgstr ""
-"You try to install module '%s' that depends on module '%s'.\n"
-"But the latter module is not available in your system."
+"Ön a '%s' modult próbálja telepíteni, amely a '%s' modulon alapszik.\n"
+"De az utóbbi modul nem elérhető az Ön rendszerén belül."
 
 #. module: base
 #: view:base.language.import:0
 #: model:ir.actions.act_window,name:base.action_view_base_import_language
 #: model:ir.ui.menu,name:base.menu_view_base_import_language
 msgid "Import Translation"
-msgstr "Fordítás importálás"
+msgstr "Fordítás importálása"
 
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
@@ -7696,14 +7731,14 @@ msgstr "Feltételek"
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_other_form
 msgid "Other Partners"
-msgstr "Egyéb partnerek"
+msgstr "Egyéb Partnerek"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_currency_form
 #: model:ir.ui.menu,name:base.menu_action_currency_form
 #: view:res.currency:0
 msgid "Currencies"
-msgstr "Pénznemek"
+msgstr "Valuták"
 
 #. module: base
 #: sql_constraint:res.groups:0
@@ -7723,7 +7758,7 @@ msgstr "Az aktív mező segítségével el lehet rejteni a kapcsolattartót."
 #. module: base
 #: model:ir.model,name:base.model_res_widget_wizard
 msgid "Add a widget for User"
-msgstr "Add a widget for User"
+msgstr "Grafikus elem hozzáadása a felhasználónál"
 
 #. module: base
 #: model:res.country,name:base.dk
@@ -7769,8 +7804,9 @@ msgid ""
 "Only specify a value if you want to change the user password. This user will "
 "have to logout and login again!"
 msgstr ""
-"Only specify a value if you want to change the user password. This user will "
-"have to logout and login again!"
+"Csak egy értéket adjon meg, ha szeretné megváltoztatni a felhasználói "
+"jelszót. Ennek a felhasználónak ki kell jelentkeznie és ismét be kell "
+"jelentkeznie!"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_madam
@@ -7790,7 +7826,7 @@ msgstr "Vezérlőpultok"
 #. module: base
 #: help:ir.attachment,type:0
 msgid "Binary File or external URL"
-msgstr "Bináris file vagy külső URL"
+msgstr "Bináris fájl vagy külső URL"
 
 #. module: base
 #: field:res.config.users,new_password:0
@@ -7811,7 +7847,7 @@ msgstr "Alacsony színtű objektumok"
 #. module: base
 #: view:res.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr "A vállalat logója (kb. 450 x 150 képpont)."
+msgstr "A vállalat logója (a méret kb. 450 x 150 képpont legyen)."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_values
@@ -7821,7 +7857,7 @@ msgstr "ir.values"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Occitan (FR, post 1500) / Occitan"
-msgstr "Occitan (FR, post 1500) / Occitan"
+msgstr "Okcitán (FR, 1500 után) / Occitan"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
@@ -7831,10 +7867,11 @@ msgid ""
 "button \"Schedule for Installation\" from the form view, then click on "
 "\"Apply Scheduled Upgrades\" to migrate your system."
 msgstr ""
-"You can install new modules in order to activate new features, menu, reports "
-"or data in your OpenERP instance. To install some modules, click on the "
-"button \"Schedule for Installation\" from the form view, then click on "
-"\"Apply Scheduled Upgrades\" to migrate your system."
+"Ön telepíthet új modulokat annak érdekében, hogy új tartozékokat, menüket, "
+"jelentések vagy adatokat aktiváljon az ön OpenERP példányán belül. Modulok "
+"telepítéséhez kattintson a \"Telepítésre kijelöl\" gombra az űrlap nézeten "
+"belül, majd kattintson a \"Beütemezett Frissítések Alkalmazása\", gombra, "
+"hogy migrálja a rendszerét."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_emails
@@ -7867,7 +7904,7 @@ msgstr "Japán"
 #. module: base
 #: field:ir.cron,numbercall:0
 msgid "Number of Calls"
-msgstr "Indítások száma"
+msgstr "Hívások száma"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -7881,8 +7918,8 @@ msgid ""
 "Important when you deal with multiple actions, the execution order will be "
 "decided based on this, low number is higher priority."
 msgstr ""
-"Important when you deal with multiple actions, the execution order will be "
-"decided based on this, low number is higher priority."
+"Fontos, hogy amikor többféle művelettel foglalkozik, a végrehajtási sorrend "
+"ennek alapján dől el, az alacsonyabb szám magasabb prioritást jelöl."
 
 #. module: base
 #: field:ir.actions.report.xml,header:0
@@ -7897,12 +7934,12 @@ msgstr "Görögország"
 #. module: base
 #: field:res.request,trigger_date:0
 msgid "Trigger Date"
-msgstr "Trigger Date"
+msgstr "Indítási dátum"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Croatian / hrvatski jezik"
-msgstr "Horvát / hrvatski jezik"
+msgstr "Horvát / Hrvatski jezik"
 
 #. module: base
 #: field:base.language.install,overwrite:0
@@ -7912,7 +7949,7 @@ msgstr "Meglévő kifejezések felülírása"
 #. module: base
 #: help:ir.actions.server,code:0
 msgid "Python code to be executed"
-msgstr "Python code to be executed"
+msgstr "Végrehajtandó Python kód"
 
 #. module: base
 #: sql_constraint:res.country:0
@@ -7933,7 +7970,7 @@ msgstr "Partner kategória"
 #: view:ir.actions.server:0
 #: selection:ir.actions.server,state:0
 msgid "Trigger"
-msgstr "Trigger"
+msgstr "Indítás"
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_update
@@ -7969,9 +8006,9 @@ msgid ""
 "defining a list of (key, label) pairs. For example: "
 "[('blue','Blue'),('yellow','Yellow')]"
 msgstr ""
-"List of options for a selection field, specified as a Python expression "
-"defining a list of (key, label) pairs. For example: "
-"[('blue','Blue'),('yellow','Yellow')]"
+"Opciólista egy kiválasztási mezőhöz, Python kifejezésként megadva, melyben "
+"lista párokat (kulcs, címke) határozunk meg. Például:  "
+"[('kék','Kék'),('sárga','Sárga')]"
 
 #. module: base
 #: selection:base.language.export,state:0
@@ -7984,8 +8021,8 @@ msgid ""
 "Indicates whether this object model lives in memory only, i.e. is not "
 "persisted (osv.osv_memory)"
 msgstr ""
-"Indicates whether this object model lives in memory only, i.e. is not "
-"persisted (osv.osv_memory)"
+"Megmutatja, hogy az objektum model kizárólag a memóriában van-e jelen azaz "
+"nem állandó-e (osv.osv_memory)"
 
 #. module: base
 #: field:res.partner,child_ids:0
@@ -8030,7 +8067,7 @@ msgstr "ir.model.data"
 #: view:ir.rule:0
 #: view:res.groups:0
 msgid "Access Rights"
-msgstr "Hozzáférési engedélyek"
+msgstr "Hozzáférési jogok"
 
 #. module: base
 #: model:res.country,name:base.gl
@@ -8064,9 +8101,9 @@ msgid ""
 "loading a new language it becomes available as default interface language "
 "for users and partners."
 msgstr ""
-"This wizard helps you add a new language to you OpenERP system. After "
-"loading a new language it becomes available as default interface language "
-"for users and partners."
+"Ez a varázsló segít Önnek egy új nyelv hozzáadásához az OpenERP rendszerben. "
+"Miután betöltötte az új nyelvet, elérhetővé válik alapértelmezett "
+"kezelőfelületi nyelvként a felhasználók és partnerek számára."
 
 #. module: base
 #: field:ir.actions.server,subject:0
@@ -8103,8 +8140,8 @@ msgid ""
 "Name of the method to be called on the object when this scheduler is "
 "executed."
 msgstr ""
-"Name of the method to be called on the object when this scheduler is "
-"executed."
+"A metódus neve, amelyen keresztül az objektum meghívásra kerül, amikor az "
+"ütemezőt elindítják."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:219
@@ -8113,8 +8150,8 @@ msgid ""
 "The Selection Options expression is must be in the [('key','Label'), ...] "
 "format!"
 msgstr ""
-"The Selection Options expression is must be in the [('key','Label'), ...] "
-"format!"
+"A Kiválasztási opciók kifejezést [('key','Label'), ...] formátumban "
+"szükséges megadni!"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -8152,8 +8189,9 @@ msgid ""
 "Create and manage the companies that will be managed by OpenERP from here. "
 "Shops or subsidiaries can be created and maintained from here."
 msgstr ""
-"Create and manage the companies that will be managed by OpenERP from here. "
-"Shops or subsidiaries can be created and maintained from here."
+"Hozza létre és rendszerezze azokat a cégeket, melyeket ezentúl az OpenERP "
+"fogja kezelni. Az üzletek és leányvállalatok létrehozhatóak és "
+"karbantarthatóak erről a pontról."
 
 #. module: base
 #: model:res.country,name:base.id
@@ -8167,9 +8205,9 @@ msgid ""
 "you can then add translations manually or perform a complete export (as a "
 "template for a new language example)."
 msgstr ""
-"This wizard will detect new terms to translate in the application, so that "
-"you can then add translations manually or perform a complete export (as a "
-"template for a new language example)."
+"Ez a varázsló észlelni fogja az új fordítandó terminusokat az alkalmazásban, "
+"így Ön manuálisan is hozzáadhat fordításokat vagy végrehajthat teljes "
+"exportálást (mint egy sablont egy új nyelvi példánál)."
 
 #. module: base
 #: help:multi_company.default,expression:0
@@ -8177,8 +8215,8 @@ msgid ""
 "Expression, must be True to match\n"
 "use context.get or user (browse)"
 msgstr ""
-"Expression, must be True to match\n"
-"use context.get or user (browse)"
+"Kifejezés, aminek igaznak kell lennie, hogy egyezzen\n"
+"használja a context.get-et vagy a felhasználót (böngészés)"
 
 #. module: base
 #: model:res.country,name:base.bg
@@ -8188,7 +8226,7 @@ msgstr "Bulgária"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr "Publisher warranty contract successfully registered!"
+msgstr "A Kiadói garancia szerződés sikeresen regisztrációra került!"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -8198,7 +8236,7 @@ msgstr "Angola"
 #. module: base
 #: model:res.country,name:base.tf
 msgid "French Southern Territories"
-msgstr "Francia déli és antarktiszi területek"
+msgstr "Francia Déli Területek"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency
@@ -8208,7 +8246,7 @@ msgstr "Francia déli és antarktiszi területek"
 #: field:res.currency,name:0
 #: field:res.currency.rate,currency_id:0
 msgid "Currency"
-msgstr "Pénznem"
+msgstr "Valuta"
 
 #. module: base
 #: field:res.partner.canal,name:0
@@ -8229,7 +8267,7 @@ msgstr "Kft."
 #: field:ir.values,res_id:0
 #: field:res.log,res_id:0
 msgid "Object ID"
-msgstr "Object ID"
+msgstr "Objektum azonosító"
 
 #. module: base
 #: view:res.company:0
@@ -8255,7 +8293,7 @@ msgstr "Irán"
 #: model:ir.actions.act_window,name:base.res_widget_user_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_user_act_window
 msgid "Widgets per User"
-msgstr "Widgets per User"
+msgstr "Felhasználónkénti grafikus elemek"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8288,7 +8326,7 @@ msgstr "Fordítás szinkronizálása"
 #. module: base
 #: field:ir.ui.view_sc,res_id:0
 msgid "Resource Ref."
-msgstr "Elem ref."
+msgstr "Erőforrás ref."
 
 #. module: base
 #: model:res.country,name:base.ki
@@ -8325,7 +8363,7 @@ msgstr "ir.sequence.type"
 #. module: base
 #: selection:base.language.export,format:0
 msgid "CSV File"
-msgstr "CSV File"
+msgstr "CSV Fájl"
 
 #. module: base
 #: field:res.company,account_no:0
@@ -8341,12 +8379,12 @@ msgstr "Az alap nyelvet ('en_US') nem lehet törölni!"
 #. module: base
 #: selection:ir.model,state:0
 msgid "Base Object"
-msgstr "Alap Objektum"
+msgstr "Alap objektum"
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "Dependencies :"
-msgstr "Függőségek:"
+msgstr "Függőségek :"
 
 #. module: base
 #: field:ir.model.fields,field_description:0
@@ -8361,7 +8399,7 @@ msgstr "Dzsibuti"
 #. module: base
 #: field:ir.translation,value:0
 msgid "Translation Value"
-msgstr "Translation Value"
+msgstr "Fordítási érték"
 
 #. module: base
 #: model:res.country,name:base.ag
@@ -8389,7 +8427,7 @@ msgstr "Zaire"
 #: field:workflow.instance,res_id:0
 #: field:workflow.triggers,res_id:0
 msgid "Resource ID"
-msgstr "Erőforrás azon"
+msgstr "Erőforrás azonosító"
 
 #. module: base
 #: view:ir.cron:0
@@ -8400,12 +8438,12 @@ msgstr "Információ"
 #. module: base
 #: view:res.widget.user:0
 msgid "User Widgets"
-msgstr "User Widgets"
+msgstr "Felhasználó Grafikus Elemei"
 
 #. module: base
 #: view:base.module.update:0
 msgid "Update Module List"
-msgstr "Modul lista frissítése"
+msgstr "Modullista frissítése"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -8450,7 +8488,7 @@ msgstr "Diagram"
 #. module: base
 #: help:multi_company.default,name:0
 msgid "Name it to easily find a record"
-msgstr "Name it to easily find a record"
+msgstr "Nevezze meg a rekord könnyű megtalálásához"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.grant_menu_access
@@ -8461,7 +8499,7 @@ msgstr "Menü elemek"
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr "Rules are not supported for osv_memory objects !"
+msgstr "Az osv_memory objektumok nem támogatják a szabályokat !"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_association
@@ -8538,7 +8576,7 @@ msgstr "Hiba"
 #. module: base
 #: model:res.country,name:base.pm
 msgid "Saint Pierre and Miquelon"
-msgstr "Saint Pierre and Miquelon"
+msgstr "Saint Pierre és Miquelon"
 
 #. module: base
 #: help:ir.actions.report.xml,header:0
@@ -8574,7 +8612,7 @@ msgstr "Dán / Dansk"
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Advanced Search (deprecated)"
-msgstr "Advanced Search (deprecated)"
+msgstr "Összetett keresés (érvénytelenített)"
 
 #. module: base
 #: model:res.country,name:base.cx
@@ -8584,7 +8622,7 @@ msgstr "Karácsony-sziget"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Other Actions Configuration"
-msgstr "Egyéb műveletek konfigurációja"
+msgstr "Egyéb műveletek beállítása"
 
 #. module: base
 #: view:res.config.installer:0
@@ -8602,13 +8640,13 @@ msgstr "Csatornák"
 #. module: base
 #: view:ir.ui.view:0
 msgid "Extra Info"
-msgstr "Extra Info"
+msgstr "Extra információ"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 msgid "Client Events"
-msgstr "Client Events"
+msgstr "Ügyfél események"
 
 #. module: base
 #: view:ir.module.module:0
@@ -8624,12 +8662,14 @@ msgstr "EAN ellenőrzés"
 #: sql_constraint:res.config.users:0
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "You can not have two users with the same login !"
+msgstr ""
+"Ön nem rendelkezhet két, azonos bejelentkezési névvel felvett felhasználóval "
+"!"
 
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
 msgid "Default multi company"
-msgstr "Default multi company"
+msgstr "Alapértelmezett multi vállalat"
 
 #. module: base
 #: view:res.request:0
@@ -8650,7 +8690,8 @@ msgstr "Forrás"
 #. module: base
 #: help:res.partner.address,partner_id:0
 msgid "Keep empty for a private address, not related to partner."
-msgstr "Hagyja üresen privát címhez, ami nem tartozik egy partnerhez sem."
+msgstr ""
+"Hagyja üresen egy magáncím számára, amely nem tartozik egy partnerhez sem."
 
 #. module: base
 #: model:res.country,name:base.vu
@@ -8669,13 +8710,13 @@ msgid ""
 "Save this document to a .tgz file. This archive containt UTF-8 %s files and "
 "may be uploaded to launchpad."
 msgstr ""
-"Save this document to a .tgz file. This archive containt UTF-8 %s files and "
-"may be uploaded to launchpad."
+"Mentse el ezt a dokumentumot egy .tgz fájlban. Ez az archívum UTF-8 %s "
+"fájlokat tartalmaz és feltölthető a launchpad-ra."
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Start configuration"
-msgstr "Konfiguráció indítása"
+msgstr "Beállítások megkezdése"
 
 #. module: base
 #: view:base.language.export:0
@@ -8687,7 +8728,7 @@ msgstr "_Export"
 #: field:base.module.import,state:0
 #: field:base.module.update,state:0
 msgid "state"
-msgstr "álam"
+msgstr "állapot"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -8725,18 +8766,18 @@ msgid ""
 "Check this box if the partner is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
-"Jelölje be, ha a partner szállító, különben a szállítói megrendelés űrlapon "
-"nem jelenik meg a szállítók között."
+"Jelölje be ezt a mezőt, ha a partner szállító, különben a szállítói "
+"megrendelés űrlapon nem jelenik meg a szállítók között."
 
 #. module: base
 #: field:ir.model.fields,relation_field:0
 msgid "Relation Field"
-msgstr "Kapcsoló mező"
+msgstr "Kapcsolati mező"
 
 #. module: base
 #: view:res.partner.event:0
 msgid "Event Logs"
-msgstr "Esemény logok"
+msgstr "Esemény naplók"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_configuration.py:37
@@ -8747,7 +8788,7 @@ msgstr "Rendszer konfigurálása kész"
 #. module: base
 #: field:workflow.triggers,instance_id:0
 msgid "Destination Instance"
-msgstr "Cél példány"
+msgstr "Célpéldány"
 
 #. module: base
 #: field:ir.actions.act_window,multi:0
@@ -8763,12 +8804,12 @@ msgstr "https://translations.launchpad.net/openobject"
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML path"
-msgstr "XML path"
+msgstr "XML elérési út"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "On Skip"
-msgstr "On Skip"
+msgstr "Átugrásra"
 
 #. module: base
 #: model:res.country,name:base.gn
@@ -8785,20 +8826,21 @@ msgstr "Luxemburg"
 msgid ""
 "The kind of action or button in the client side that will trigger the action."
 msgstr ""
-"The kind of action or button in the client side that will trigger the action."
+"A művelet vagy gomb típus a kliens oldalon, ami el fogja indítani a "
+"műveletet."
 
 #. module: base
 #: code:addons/base/ir/ir_ui_menu.py:285
 #, python-format
 msgid "Error ! You can not create recursive Menu."
-msgstr "Hiba! Nem hozhat létre rekurzív menüket."
+msgstr "Hiba ! Nem hozhat létre rekurzív menüket."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr "Register a Contract"
+msgstr "Szerződés regisztrálása"
 
 #. module: base
 #: view:ir.rule:0
@@ -8807,7 +8849,7 @@ msgid ""
 "with logical OR operator"
 msgstr ""
 "3. Ha a felhasználó több csoportnak is tagja, akkor a 2. lépés eredményei "
-"logikai ÉS kapcsolattal összegződnek"
+"logikai VAGY kapcsolattal kombinálódnak"
 
 #. module: base
 #: code:addons/base/publisher_warranty/publisher_warranty.py:145
@@ -8863,7 +8905,7 @@ msgstr "Román / română"
 #. module: base
 #: view:res.log:0
 msgid "System Logs"
-msgstr "Rendszer logok"
+msgstr "Rendszer naplók"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -8874,7 +8916,7 @@ msgstr "És"
 #. module: base
 #: field:ir.model.fields,relation:0
 msgid "Object Relation"
-msgstr "Kapcsolódó objektum"
+msgstr "Objektum kapcsolat"
 
 #. module: base
 #: view:ir.rule:0
@@ -8896,12 +8938,12 @@ msgstr "ir.actions.act_window"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply For Create"
-msgstr "Alkalmazás létrehozáshoz"
+msgstr "Alkalmaz létrehozáshoz"
 
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
-msgstr "Virgin Islands (USA)"
+msgstr "Virgin-szigetek (USA)"
 
 #. module: base
 #: model:res.country,name:base.tw
@@ -8911,7 +8953,7 @@ msgstr "Tajvan"
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
 msgid "Currency Rate"
-msgstr "Árfolyam"
+msgstr "Valuta árfolyam"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.grant_menu_access
@@ -8922,16 +8964,16 @@ msgid ""
 "be assigned to specific groups in order to make them accessible to some "
 "users within the system."
 msgstr ""
-"Manage and customize the items available and displayed in your OpenERP "
-"system menu. You can delete an item by clicking on the box at the beginning "
-"of each line and then delete it through the button that appeared. Items can "
-"be assigned to specific groups in order to make them accessible to some "
-"users within the system."
+"Állítsa be és szabja személyre a rendelkezésre álló elemeket és mutassa be "
+"őket az OpenERP rendszermenün belül. Ön törölhet egy elemet azáltal, hogy az "
+"egyes sorok elején elhelyezkedő mezőkre kattint és a megjelenő gombra "
+"kattintva törli őket. Az elemeket hozzárendelhetőek bizonyos csoportokhoz, "
+"hogy hozzáférhetőekké váljanak bizonyos felhasználók számára a rendszerben."
 
 #. module: base
 #: field:ir.ui.view,field_parent:0
 msgid "Child Field"
-msgstr "Child Field"
+msgstr "Gyermek elem mező"
 
 #. module: base
 #: field:ir.actions.act_window,usage:0
@@ -8956,18 +8998,18 @@ msgstr "Nem telepíthető"
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "View :"
-msgstr "Nézet:"
+msgstr "Nézet :"
 
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr "View Auto-Load"
+msgstr "Automatikus betöltés bézet"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:232
 #, python-format
 msgid "You cannot remove the field '%s' !"
-msgstr "You cannot remove the field '%s' !"
+msgstr "Ön nem távolíthatja el a '%s' mezőt!"
 
 #. module: base
 #: field:ir.exports,resource:0
@@ -8979,12 +9021,12 @@ msgstr "Erőforrás"
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr "Web ikon file"
+msgstr "Web ikon fájl"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Persian / فارس"
-msgstr "Persian / فارس"
+msgstr "Perzsa / فارس"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -9003,8 +9045,8 @@ msgid ""
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
 msgstr ""
-"Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
-"Portable Objects)"
+"Támogatott fájl formátumok: *.csv (Vesszővel-elválasztott értékek) or *.po "
+"(GetText Hordozható Objektumok)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:487
@@ -9013,8 +9055,8 @@ msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
 msgstr ""
-"You can not delete this document (%s) ! Be sure your user belongs to one of "
-"these groups: %s."
+"Ön nem törölheti ezt a dokumentumot (%s) ! Bizonyosodjon meg arról, hogy az "
+"Ön felhasználója ezen csoportok egyikéhez tartozik: %s."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -9025,7 +9067,7 @@ msgstr "base.module.configuration"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "Filename"
-msgstr "File neve"
+msgstr "Fájlnév"
 
 #. module: base
 #: field:ir.model,access_ids:0
@@ -9041,7 +9083,7 @@ msgstr "Szlovák Köztársaság"
 #. module: base
 #: model:ir.ui.menu,name:base.publisher_warranty
 msgid "Publisher Warranty"
-msgstr "Publisher Warranty"
+msgstr "Kiadói garancia"
 
 #. module: base
 #: model:res.country,name:base.aw
@@ -9056,7 +9098,7 @@ msgstr "Argentína"
 #. module: base
 #: field:res.groups,name:0
 msgid "Group Name"
-msgstr "Csoport"
+msgstr "Csoportnév"
 
 #. module: base
 #: model:res.country,name:base.bh
@@ -9093,7 +9135,7 @@ msgstr "Email és aláírás"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contract"
-msgstr "Publisher Warranty Contract"
+msgstr "Kiadói garancia szerződés"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9108,7 +9150,7 @@ msgstr "Értékesítés utáni szolgáltatások"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch"
-msgstr "Launch"
+msgstr "Indítás"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
@@ -9118,12 +9160,12 @@ msgstr "Limit"
 #. module: base
 #: help:ir.actions.server,wkf_model_id:0
 msgid "Workflow to be executed on this model."
-msgstr "A modellen futtatandó munkafolyamat"
+msgstr "A modellen végrehajtandó munkafolyamat."
 
 #. module: base
 #: model:res.country,name:base.jm
 msgid "Jamaica"
-msgstr "Jamaica"
+msgstr "Jamaika"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
@@ -9133,10 +9175,11 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
-"Manage the partner categories in order to better classify them for tracking "
-"and analysis purposes. A partner may belong to several categories and "
-"categories have a hierarchy structure: a partner belonging to a category "
-"also belong to his parent category."
+"Rendszerezze a partner kategóriákat annak érdekében, hogy hatékonyabban "
+"tudja osztályozni őket a nyomonkövetési és analitikai célokra. Egy partner "
+"több kategóriához is tartozhat és a kategóriák hierarchikus szerkezettel is "
+"rendelkezhetnek: egy partner, aki egy adott kategóriához tartozik szintén "
+"tartozhat a szülőkategóriához is."
 
 #. module: base
 #: model:res.country,name:base.az
@@ -9157,7 +9200,7 @@ msgstr "Arab / الْعَرَبيّة"
 #. module: base
 #: model:res.country,name:base.vg
 msgid "Virgin Islands (British)"
-msgstr "Virgin Islands (British)"
+msgstr "Virgin-szigetek (British)"
 
 #. module: base
 #: view:ir.property:0
@@ -9173,7 +9216,7 @@ msgstr "Cseh / Čeština"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Trigger Configuration"
-msgstr "Trigger Configuration"
+msgstr "Indítás konfiguráció"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_supplier_form
@@ -9183,10 +9226,10 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
-"You can access all information regarding your suppliers from the supplier "
-"form: accounting data, history of emails, meetings, purchases, etc. You can "
-"uncheck the 'Suppliers' filter button in order to search in all your "
-"partners, including customers and prospects."
+"Ön elérheti az összes szállítóra vonatkozó adatot a szállítási űrlapon "
+"keresztül: könyvelési adatokat, az emailekre vonatkozó előzményeket, "
+"találkozók, stb. Kijelölheti a 'Szállítók' szűrő gombot, hogy felkeresse az "
+"összes partnerét beleértve az ügyfeleket és kilátásban levő ügyfeleket."
 
 #. module: base
 #: model:res.country,name:base.rw
@@ -9196,7 +9239,7 @@ msgstr "Ruanda"
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the week (0:Monday): %(weekday)s"
-msgstr "Nap száma héten belül (0: Hétfő): %(weekday)s"
+msgstr "A hét napja (0: Hétfő): %(weekday)s"
 
 #. module: base
 #: model:res.country,name:base.ck
@@ -9206,7 +9249,7 @@ msgstr "Cook-szigetek"
 #. module: base
 #: field:ir.model.data,noupdate:0
 msgid "Non Updatable"
-msgstr "Nem frissíthető"
+msgstr "Nem Frissíthető"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9235,9 +9278,10 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
-"If you use OpenERP for the first time we strongly advise you to select the "
-"simplified interface, which has less features but is easier. You can always "
-"switch later from the user preferences."
+"Ha Ön első alkalommal használja az OpenERP-t, mindenképp ajánljuk Önnek, "
+"hogy egyszerűsített kezelőfelületet válasszon ki, amely kevesebb tartozékkal "
+"rendelkezik, de könnyebb. Később mindig át tud váltani a felhasználói "
+"beállításokon keresztül."
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -9274,7 +9318,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.category,name:0
 msgid "Category Name"
-msgstr "Kategória neve"
+msgstr "Kategórianév"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
@@ -9284,12 +9328,12 @@ msgstr "IT szektor"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
-msgstr "Select Groups"
+msgstr "Csoportok Kiválasztása"
 
 #. module: base
 #: view:res.lang:0
 msgid "%X - Appropriate time representation."
-msgstr "%X - Pontos idő"
+msgstr "%X - Pontos idő meghatározás"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -9304,10 +9348,11 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
-"The Separator Format should be like [,n] where 0 < n :starting from Unit "
-"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
-"1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
-"106,500. Provided ',' as the thousand separator in each case."
+"Az Elválasztó formátumnak olyannak kell lennie [,n] ahol 0 < n :egység "
+"számjegytől indul. A -1 fogja jelezni az elválasztás végét. Pl. a [3,2,-1] "
+"fogja jelölni a 106500-nál, hogy 1,06,500 lehessen; az [1,2,-1] fogja "
+"lehetővé tenni, hogy a szám 106,50,0 legyen. Ebben az esetben mindig a ',' "
+"az ezres elválasztó."
 
 #. module: base
 #: view:res.company:0
@@ -9318,17 +9363,17 @@ msgstr "Álló"
 #: code:addons/base/ir/ir_model.py:317
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr "Egyszerre egy oszlopot lehet átnevezni!"
+msgstr "Egyszerre csak egy oszlopot lehet átnevezni!"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Button"
-msgstr "Varázsló billentyű"
+msgstr "Varázsló gomb"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Report/Template"
-msgstr "Jelentés/sablon"
+msgstr "Jelentés/Sablon"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -9350,29 +9395,29 @@ msgstr "ir.actions.server"
 #: field:res.config.users,progress:0
 #: field:res.config.view,progress:0
 msgid "Configuration Progress"
-msgstr "Konfiguráció előrehaladása"
+msgstr "Beállítás állása"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.next_id_11
 msgid "Configuration Wizards"
-msgstr "Konfigurációs varázslók"
+msgstr "Beállítás varázslók"
 
 #. module: base
 #: field:res.lang,code:0
 msgid "Locale Code"
-msgstr "Lokalizáció kód"
+msgstr "Lokális Kód"
 
 #. module: base
 #: field:workflow.activity,split_mode:0
 msgid "Split Mode"
-msgstr "Split Mode"
+msgstr "Osztott üzemmód"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Note that this operation might take a few minutes."
-msgstr "Ez a művelet néhány percig is eltarthat."
+msgstr "Ez a művelet eltarthat néhány percig."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
@@ -9387,7 +9432,7 @@ msgstr "Indítandó művelet"
 #. module: base
 #: view:ir.cron:0
 msgid "Execution"
-msgstr "Futás"
+msgstr "Végrehajtás"
 
 #. module: base
 #: field:ir.actions.server,condition:0
@@ -9398,7 +9443,8 @@ msgstr "Feltétel"
 #. module: base
 #: help:ir.values,model_id:0
 msgid "This field is not used, it only helps you to select a good model."
-msgstr "This field is not used, it only helps you to select a good model."
+msgstr ""
+"Ez a mező nem használatos, csupán segít Önnek kiválasztani egy jó modelt."
 
 #. module: base
 #: field:ir.ui.view,name:0
@@ -9413,7 +9459,7 @@ msgstr "Olasz / Italiano"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save As Attachment Prefix"
-msgstr "Save As Attachment Prefix"
+msgstr "Mentés függelék előtagként"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -9421,8 +9467,8 @@ msgid ""
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
-"Only one client action will be executed, last client action will be "
-"considered in case of multiple client actions."
+"Csak egy kliens művelet lesz végrehajtva, az utolsó kliens művelet lesz "
+"figyelembe véve több kliens művelet esetén."
 
 #. module: base
 #: view:res.lang:0
@@ -9456,7 +9502,7 @@ msgstr "Varázsló mező"
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr "Prefix value of the record for the sequence"
+msgstr "Előtag érték a sorszám rekordjánál"
 
 #. module: base
 #: model:res.country,name:base.sc
@@ -9494,12 +9540,12 @@ msgstr "Számlatulajdonos"
 #: code:addons/base/res/res_user.py:256
 #, python-format
 msgid "Company Switch Warning"
-msgstr "Company Switch Warning"
+msgstr "Cégváltási figyelmeztetés"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_widget_wizard
 msgid "Homepage Widgets Management"
-msgstr "Homepage Widgets Management"
+msgstr "Honlap grafikus elemeinek kezelése"
 
 #. module: base
 #: field:workflow,osv:0
@@ -9510,7 +9556,7 @@ msgstr "Erőforrás objektum"
 #. module: base
 #: help:ir.sequence,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr "A számsor tagjai közötti különbség"
+msgstr "A következő számot a sorban ezzel a számmal fogjuk növelni"
 
 #. module: base
 #: field:ir.cron,function:0
@@ -9522,7 +9568,7 @@ msgstr "Függvény"
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr "Search Widget"
+msgstr "Widget keresése"
 
 #. module: base
 #: selection:ir.actions.todo,restart:0
@@ -9532,7 +9578,7 @@ msgstr "Soha"
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Delivery"
-msgstr "Szállítási"
+msgstr "Szállítás"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
@@ -9543,7 +9589,7 @@ msgstr "NyRt."
 #. module: base
 #: model:res.country,name:base.gw
 msgid "Guinea Bissau"
-msgstr "Guinea Bissau"
+msgstr "Bissau-Guinea"
 
 #. module: base
 #: view:workflow.instance:0
@@ -9564,13 +9610,13 @@ msgstr "Észak-Korea"
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Create Object"
-msgstr "Create Object"
+msgstr "Objektum létrehozása"
 
 #. module: base
 #: view:ir.filters:0
 #: field:res.log,context:0
 msgid "Context"
-msgstr "Context"
+msgstr "Kontextus"
 
 #. module: base
 #: field:res.bank,bic:0
@@ -9590,7 +9636,7 @@ msgstr "Lengyel / Język polski"
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr "Export Name"
+msgstr "Név exportálása"
 
 #. module: base
 #: help:res.partner.address,type:0
@@ -9612,4 +9658,4 @@ msgid "Russian / русский язык"
 msgstr "Orosz / русский язык"
 
 #~ msgid "Number padding"
-#~ msgstr "Number padding"
+#~ msgstr "Szám helykitöltés"
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index b1648522c5c..4ad6f84f91d 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:48+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:54+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index eed1619ac28..b5f54f341cb 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:56+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 8da4874e147..2c8e4ceadff 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:56+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 9705d816e50..f7194b9c5c9 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:57+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 6c523a91aa4..c1d32612048 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:57+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 5ff1be47edf..f8602e899db 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:57+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 0c9f06f7616..df15093922f 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:50+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:57+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index c7e18317fba..8c484629015 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:57+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 0da2007afb9..421bc7df7d7 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:57+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 3de84393b91..d997f1dc6ce 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:57+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 881a0a9fcbf..ca735ca2a54 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:57+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 70e78b8367e..94f2ded9bce 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:58+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 9f4ac74025c..61e493d8948 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:49+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:55+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 472cfd510f8..c018a178d08 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:00+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index d959968d143..c20d4469e61 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:51+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:58+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 17589906ba9..437a3b69e80 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:58+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -701,7 +701,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (UY) / Español (UY)"
-msgstr ""
+msgstr "Espanhol (UY) / Español (UY)"
 
 #. module: base
 #: field:res.partner,mobile:0
@@ -821,7 +821,7 @@ msgstr "Tipo"
 msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
-msgstr ""
+msgstr "O idioma com o código \"%s\" não está definido no sistema!"
 
 #. module: base
 #: model:res.country,name:base.gu
@@ -933,7 +933,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (GT) / Español (GT)"
-msgstr ""
+msgstr "Espanhol (GT) / Español (GT)"
 
 #. module: base
 #: view:res.lang:0
@@ -1086,7 +1086,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%Y - Year with century."
-msgstr ""
+msgstr "%Y - Ano completo."
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -1461,7 +1461,7 @@ msgstr "Criar / Escrever / Copiar"
 #. module: base
 #: view:base.language.export:0
 msgid "https://help.launchpad.net/Translations"
-msgstr ""
+msgstr "https://help.launchpad.net/Translations"
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -1496,7 +1496,7 @@ msgstr "Spanhol / Español"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Korean (KP) / 한국어 (KP)"
-msgstr ""
+msgstr "Coreano (KP) / 한국어 (KP)"
 
 #. module: base
 #: view:base.module.update:0
@@ -1609,7 +1609,7 @@ msgstr "Grupos"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (CL) / Español (CL)"
-msgstr ""
+msgstr "Espanhol (CL) / Español (CL)"
 
 #. module: base
 #: view:res.config.users:0
@@ -1714,7 +1714,7 @@ msgstr "Factura"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese (BR) / Português (BR)"
-msgstr ""
+msgstr "Português (BR) / Português (BR)"
 
 #. module: base
 #: model:res.country,name:base.bb
@@ -1895,7 +1895,7 @@ msgstr "O método \"perm_read\" não está implementado neste objeto !"
 #. module: base
 #: view:res.lang:0
 msgid "%y - Year without century [00,99]."
-msgstr ""
+msgstr "%y - Ano abreviado [00,99]."
 
 #. module: base
 #: model:res.country,name:base.si
@@ -1962,6 +1962,8 @@ msgid ""
 "One of the records you are trying to modify has already been deleted "
 "(Document type: %s)."
 msgstr ""
+"Um dos registos que está a tentar modificar já foi apagado (Tipo de registo: "
+"%s)."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country
@@ -2297,7 +2299,7 @@ msgstr "Mapeamento de campos"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portugese / Português"
-msgstr ""
+msgstr "Português / Português"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_sir
@@ -2938,7 +2940,7 @@ msgstr "Conta bancaria"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (HN) / Español (HN)"
-msgstr ""
+msgstr "Espanhol (HN) / Español (HN)"
 
 #. module: base
 #: view:ir.sequence.type:0
@@ -2988,7 +2990,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:ir.config_parameter:0
 msgid "Key must be unique."
-msgstr ""
+msgstr "Chave tem de ser única."
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -3037,6 +3039,9 @@ msgid ""
 "\n"
 "Click 'Continue' and enjoy your OpenERP experience..."
 msgstr ""
+"A sua base de dados está configurada.\n"
+"\n"
+"Carrege em 'Continuar' para experimentar o OpenERP..."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -3089,7 +3094,7 @@ msgstr "Os módulos selecionados foram actualizados / instalados!"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PR) / Español (PR)"
-msgstr ""
+msgstr "Espanhol (PR) / Español (PR)"
 
 #. module: base
 #: model:res.country,name:base.gt
@@ -3331,7 +3336,7 @@ msgstr ""
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Affero GPL-3"
-msgstr ""
+msgstr "Affero GPL-3"
 
 #. module: base
 #: field:ir.sequence,number_next:0
@@ -3346,7 +3351,7 @@ msgstr "Expressão a ser satisfeita, se quisermos a transição concluída."
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PA) / Español (PA)"
-msgstr ""
+msgstr "Espanhol (PA) / Español (PA)"
 
 #. module: base
 #: view:res.currency:0
@@ -3966,7 +3971,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "%S - Seconds [00,61]."
-msgstr ""
+msgstr "%S - Segundos [00,61]."
 
 #. module: base
 #: model:res.country,name:base.cv
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index bdef1ea69f9..22cf0f02a46 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:00+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -2296,6 +2296,8 @@ msgid ""
 "Reference of the target resource, whose model/table depends on the 'Resource "
 "Name' field."
 msgstr ""
+"Referencia do recurso destino, cujo modelo/tabela depende do atributo 'Nome "
+"do Recurso' ."
 
 #. module: base
 #: field:ir.model.fields,select_level:0
@@ -6266,7 +6268,7 @@ msgstr "res.log"
 #: help:ir.translation,module:0
 #: help:ir.translation,xml_id:0
 msgid "Maps to the ir_model_data for which this translation is provided."
-msgstr ""
+msgstr "Mapeia para o ir_model_data para o qual esta tradução é provida."
 
 #. module: base
 #: view:workflow.activity:0
@@ -7156,6 +7158,7 @@ msgstr "Carregar"
 #: help:res.users,name:0
 msgid "The new user's real name, used for searching and most listings"
 msgstr ""
+"O nome real do novo usuário, usado para pesquisa e maioria das listagens"
 
 #. module: base
 #: code:addons/osv.py:154
@@ -7342,7 +7345,7 @@ msgstr "Opções de Seleção"
 #. module: base
 #: field:res.partner.category,parent_right:0
 msgid "Right parent"
-msgstr ""
+msgstr "Superior direito"
 
 #. module: base
 #: view:res.lang:0
@@ -8203,6 +8206,8 @@ msgid ""
 "Expression, must be True to match\n"
 "use context.get or user (browse)"
 msgstr ""
+"Expressão, deve ser Verdadeira para corresponder.\n"
+"use context.get ou user (browse)"
 
 #. module: base
 #: model:res.country,name:base.bg
@@ -8632,7 +8637,7 @@ msgstr "Info. Extra"
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 msgid "Client Events"
-msgstr ""
+msgstr "Eventos de Cliente"
 
 #. module: base
 #: view:ir.module.module:0
@@ -8653,7 +8658,7 @@ msgstr "Você não pode ter dois usuários com o mesmo login !"
 #. module: base
 #: model:ir.model,name:base.model_multi_company_default
 msgid "Default multi company"
-msgstr ""
+msgstr "Multi-empresa por padrão"
 
 #. module: base
 #: view:res.request:0
@@ -8793,7 +8798,7 @@ msgstr "Path do XML"
 #. module: base
 #: selection:ir.actions.todo,restart:0
 msgid "On Skip"
-msgstr ""
+msgstr "Sendo Ignorado"
 
 #. module: base
 #: model:res.country,name:base.gn
@@ -8879,7 +8884,7 @@ msgstr "Tailândia"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr ""
+msgstr "Indicações & Oportunidades"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index e0253177327..865cc814ae1 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:58+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 03edac202ac..f8b8836deb6 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:58+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 2237abc8605..33847311813 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 3813ffeaca9..d49028dafd1 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 10aa34412e9..45da4a6574e 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:47+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:54+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 7619b9fb9b2..5aea6587a36 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:52+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:58+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 35be96e6456..7302e8294d8 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:55+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: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 9aaa0035343..52eed71fba0 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 2b2e3032bdd..81f08a3ff84 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index c584aec9b4c..07ecd0dfff4 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index a2f3b053ca8..a067a6eae81 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 7c6b7ca795c..8b8ac828aee 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index d9abe62160d..dba37bb8835 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:53+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 04:59+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 55dec7b471f..9bded5f1b9d 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-06 05:23+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:00+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index dd7a2e5030b..3e39050d5bd 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:54+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: base
 #: view:ir.filters:0
@@ -3225,7 +3225,7 @@ msgstr "Ukrainian / українська"
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translation Terms"
-msgstr "翻译术语列表"
+msgstr "翻译术语条目"
 
 #. module: base
 #: model:res.country,name:base.sn
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 25a6ecd250b..12c71f2334d 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 04:54+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:00+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index ccf6bae2c36..3fb68341edd 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ 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-02 04:44+0000\n"
-"X-Generator: Launchpad (build 14414)\n"
+"X-Launchpad-Export-Date: 2011-12-13 05:00+0000\n"
+"X-Generator: Launchpad (build 14458)\n"
 
 #. module: base
 #: view:ir.filters:0

From 2c6a90384bb93553e4c101b38939f13190d017f8 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 13 Dec 2011 10:50:12 +0530
Subject: [PATCH 082/119] [IMP] added task_process.yml for task sheduling in
 project_long_term module

bzr revid: tpa@tinyerp.com-20111213052012-6eo11iszu07yo0mt
---
 addons/project_long_term/__openerp__.py       |  1 +
 .../project_long_term/test/task_process.yml   | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 addons/project_long_term/test/task_process.yml

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index c884718db85..e53fed203d2 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/test/task_process.yml b/addons/project_long_term/test/task_process.yml
new file mode 100644
index 00000000000..f31d9689567
--- /dev/null
+++ b/addons/project_long_term/test/task_process.yml
@@ -0,0 +1,20 @@
+-
+  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
+        if (not task.user_id) or (not task.date_start) or (not task.date_end):
+            raise AssertionError("Project tasks not scheduled!")
\ No newline at end of file

From 5f583e89c05851337b3827abbb8cc5c3ecb98440 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 13 Dec 2011 11:34:33 +0530
Subject: [PATCH 083/119] [IMP] remove conflict

bzr revid: tpa@tinyerp.com-20111213060433-s92xmflr48p9wny1
---
 addons/project_long_term/__openerp__.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index abd8ca38bbe..e53fed203d2 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -44,10 +44,7 @@ Features
     "demo_xml": ["project_long_term_demo.xml"],
     "test": [
           'test/phase_process.yml',
-<<<<<<< TREE
           'test/task_process.yml',
-=======
->>>>>>> MERGE-SOURCE
     ],
     "update_xml": [
         "security/ir.model.access.csv",

From 7f234ca7e9f0cba9d749f1fd8a435f333e0c3882 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 08:43:12 +0100
Subject: [PATCH 084/119] [FIX] incorrect positioning of date/time picker
 trigger in searchview

lp bug: https://launchpad.net/bugs/903542 fixed

bzr revid: xmo@openerp.com-20111213074312-0ayiebsgdhdl0yd0
---
 addons/web/static/src/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e9737dfd0af..4335ff3d1cd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -570,7 +570,7 @@ label.error {
 }
 
 /* SearchView */
-.openerp .oe_searchview_field {
+.openerp .oe_searchview_field > div {
     position: relative;
     white-space: nowrap;
 }

From fb4db0666f71d9e996e97bc504d38012f179fca2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 09:10:38 +0100
Subject: [PATCH 085/119] [FIX] missing confirmation message handling on
 listview buttons

lp bug: https://launchpad.net/bugs/903209 fixed

bzr revid: xmo@openerp.com-20111213081038-sq5p1a2lsodieito
---
 addons/web/static/src/js/view_list.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 5473e2ababe..f7a7abe25ce 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -528,6 +528,9 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             return field.name === name;
         });
         if (!action) { return; }
+        if ('confirm' in action && !window.confirm(action.confirm)) {
+            return;
+        }
 
         var c = new openerp.web.CompoundContext();
         c.set_eval_context(_.extend({

From c14ec82eb0a5ee36edc3d52b51c43cbfabe96e5e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 Dec 2011 10:35:57 +0100
Subject: [PATCH 086/119] [FIX] remove unused functions

bzr revid: chs@openerp.com-20111213093557-3hab6yamep1pv9x2
---
 addons/web/static/src/js/chrome.js | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0e332252341..62c9d31de96 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1093,30 +1093,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         $.bbq.pushState(url);
     },
 
-    default_home: function () {
-    },
-    /**
-     * Bundles the execution of the home action
-     *
-     * @param {Number} action action id
-     * @param {openerp.web.DataSet} dataset action executor
-     */
-    execute_home_action: function (action, dataset) {
-        var self = this;
-        this.rpc('/web/action/load', {
-            action_id: action,
-            context: dataset.get_context()
-        }, function (meh) {
-            var action = meh.result;
-            action.context = _.extend(action.context || {}, {
-                active_id: false,
-                active_ids: [false],
-                active_model: dataset.model
-            });
-            self.action_manager.do_action(action);
-        });
-    },
-
     on_menu_action: function(action) {
         this.action_manager.do_action(action);
     },

From 97429443b3915febe98a88b733ecc0cb483265cd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 10:49:14 +0100
Subject: [PATCH 087/119] [FIX] vertical positioning of icon in searchview
 date/time fields

bzr revid: xmo@openerp.com-20111213094914-61q63ivl6wutzvcu
---
 addons/web/static/src/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 4335ff3d1cd..ba6cb2b8c3e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -576,7 +576,7 @@ label.error {
 }
 .openerp .oe_searchview_field .oe_input_icon {
     top: auto;
-    bottom: 5px;
+    bottom: 3px;
 }
 
 .openerp .filter_label, .openerp .filter_icon {

From 719819d2f0cff7619db5a4161baf455c448c4543 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Dec 2011 11:04:49 +0100
Subject: [PATCH 088/119] [FIX] Fix date widgets styling

bzr revid: fme@openerp.com-20111213100449-1nnbtv3esih04jg2
---
 addons/web/static/src/css/base.css | 10 +++-------
 addons/web/static/src/xml/base.xml | 11 ++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ba6cb2b8c3e..aa2300b9298 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1020,6 +1020,7 @@ label.error {
 .openerp td.oe_form_frame_cell {
     padding: 2px;
     position: relative;
+    white-space: nowrap;
 }
 .openerp td.oe_form_field_boolean {
     padding-top: 4px;
@@ -1174,16 +1175,11 @@ label.error {
     vertical-align: top;
 }
 .openerp .oe_input_icon {
-    position: absolute;
     cursor: pointer;
-    right: 4px;
-    top: 5px;
-    z-index: 1;
+    margin: 3px 0 0 -21px;
+    vertical-align: top;
 }
 .openerp .oe_datepicker_container {
-    position: absolute;
-    top: 0;
-    right: 0;
     display: none;
 }
 .openerp .oe_datepicker_root {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8333b6c94a0..bab92f9711b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -863,8 +863,7 @@
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
         style="width: 100%"
-    />
-    <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
+    /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldChar.readonly">
     <div
@@ -909,18 +908,16 @@
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"
         style="width: 100%"
-    ></textarea>
-    <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
+    ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="web.datetimepicker">
     <div class="oe_datepicker_root">
+        <input type="text" size="1" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text" size="1" style="width: 100%"
             t-att-name="widget.name"
             t-attf-class="oe_datepicker_master field_#{widget.type_of_date}"
-        />
-        <img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png"
+        /><img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png"
              title="Select date" width="16" height="16" border="0"/>
-        <input type="text" size="1" class="oe_datepicker_container" disabled="disabled"/>
     </div>
 </t>
 <t t-name="FieldSelection">

From 1976fdb93d7f8e331b0dbfaae10b10a7731210a0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Dec 2011 11:25:54 +0100
Subject: [PATCH 089/119] [FIX] Fixed sidebar padding problem

bzr revid: fme@openerp.com-20111213102554-zlr1g11009l2wuhh
---
 addons/web/static/src/css/base.css | 4 ++++
 addons/web/static/src/xml/base.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index aa2300b9298..3aad5b8d83d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1456,6 +1456,9 @@ label.error {
     border-right-width: 0;
     border-left-width: 0;
 }
+.openerp .view-manager-main-sidebar h2 {
+    border-top-width: 0;
+}
 
 .openerp .view-manager-main-sidebar ul {
     list-style-type: none;
@@ -1472,6 +1475,7 @@ label.error {
 .openerp .toggle-sidebar {
     cursor: pointer;
     border: 1px solid #D2CFCF;
+    border-top-width: 0;
     display: block;
     background: url(/web/static/src/img/toggle-a-bg.png);
     width: 21px;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index bab92f9711b..884acb92507 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -413,7 +413,7 @@
     </div>
 </t>
 <t t-name="ViewManager">
-    <table class="view-manager-main-table">
+    <table class="view-manager-main-table" cellpadding="0" cellspacing="0">
     <tbody>
     <tr>
         <td class="view-manager-main-content">

From e28eaa509b928ca836322db3a3957edaf81345a6 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 Dec 2011 11:32:32 +0100
Subject: [PATCH 090/119] [FIX] do not call hashchange event when pushing state

bzr revid: chs@openerp.com-20111213103232-bhjrog6eaiaqrilu
---
 addons/web/static/src/js/chrome.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 62c9d31de96..af2fc110691 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1016,9 +1016,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.menu = new openerp.web.Menu(this, "oe_menu", "oe_secondary_menu");
         this.menu.on_action.add(this.on_menu_action);
 
-        this.url_internal_hashchange = false;
-        this.url_external_hashchange = false;
-        jQuery(window).bind('hashchange', this.on_url_hashchange);
+        this._current_state = null;
 
     },
     start: function() {
@@ -1081,7 +1079,10 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
 
     on_hashchange: function(event) {
         var state = event.getState(true);
-        this.action_manager.do_load_state(state);
+        if (!_.isEqual(this._current_state, state)) {
+            this.action_manager.do_load_state(state);
+        }
+        this._current_state = state;
     },
 
     do_push_state: function(state, overwrite) {
@@ -1090,6 +1091,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             state = _.extend({}, hash, state);
         }
         var url = '#' + $.param(state);
+        this._current_state = _.clone(state);
         $.bbq.pushState(url);
     },
 

From 3c9a0d91f0eb922611fcce74b41db27e82d79b5a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 Dec 2011 11:41:00 +0100
Subject: [PATCH 091/119] [FIX] cleanup do_load_state methods

bzr revid: chs@openerp.com-20111213104100-qxvyqnr84bm1x6x5
---
 addons/web/static/src/js/views.js | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 0c0fc74514e..985a75a8030 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -54,18 +54,17 @@ session.web.ActionManager = session.web.Widget.extend({
 
     do_load_state: function(state) {
         if (state.action_id) {
-            var run_action = (!this.inner_viewmanager) || this.inner_viewmanager.action.id !== state.action_id;
-            if (run_action) {
-                this.null_action();
-                this.do_action(state.action_id);
-            }
+            this.null_action();
+            this.do_action(state.action_id);
+        }
+        else if (state.model && state.id) {
+            // TODO implement it
+            //this.null_action();
+            // action = {}
         }
         else if (state.client_action) {
-            var run_client = (!this.client_widget) || this.client_widget_name !== state.client_action.tag;
-            if (run_client) {
-                this.null_action();
-                this.ir_actions_client(state.client_action);
-            }
+            this.null_action();
+            this.ir_actions_client(state.client_action);
         }
 
         if (this.inner_viewmanager) {
@@ -548,13 +547,8 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
     },
 
     do_load_state: function(state) {
-        var self = this,
-            defs = [];
-        if (state.view_type && state.view_type !== this.active_view) {
-            defs.push(this.on_mode_switch(state.view_type, true));
-        } 
-
-        $.when(defs).then(function() {
+        var self = this;
+        $.when(this.on_mode_switch(state.view_type, true)).done(function() {
             self.views[self.active_view].controller.do_load_state(state);
         });
     },

From 68914b311ba4a4e748c8c33342c3efed19a7efab Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 Dec 2011 11:50:09 +0100
Subject: [PATCH 092/119] [FIX] remove unused variable

bzr revid: chs@openerp.com-20111213105009-otpfr3db20wakdtb
---
 addons/web/static/src/js/views.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 985a75a8030..9cf6d23e48e 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -24,7 +24,6 @@ session.web.ActionManager = session.web.Widget.extend({
         this.dialog = null;
         this.dialog_viewmanager = null;
         this.client_widget = null;
-        this.client_widget_name = null;
     },
     render: function() {
         return "<div id='"+this.element_id+"'></div>";
@@ -45,7 +44,6 @@ session.web.ActionManager = session.web.Widget.extend({
         if (this.client_widget) {
             this.client_widget.stop();
             this.client_widget = null;
-            this.client_widget_name = null;
         }
     },
 
@@ -152,7 +150,6 @@ session.web.ActionManager = session.web.Widget.extend({
     },
     ir_actions_client: function (action) {
         this.content_stop();
-        this.client_widget_name = action.tag;
         var ClientWidget = session.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this);
 

From e7f3e590b7eea2f041591b69be9ca877ff0428e1 Mon Sep 17 00:00:00 2001
From: "Naresh (OpenERP)" <nch@tinyerp.com>
Date: Tue, 13 Dec 2011 16:21:46 +0530
Subject: [PATCH 093/119] [REF]:

bzr revid: nch@tinyerp.com-20111213105146-fz6fejswta7mzfcp
---
 openerp/tools/convert.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index cad34d0e1f9..58d869bb8bd 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -638,9 +638,7 @@ form: module.record_id""" % (xml_id,)
                     action_mode, = cr.fetchone()
                 if action_type=='tree':
                     values['icon'] = 'STOCK_INDENT'
-                elif action_mode and ( action_mode.startswith('tree') 
-                                       or  action_mode.startswith('kanban') 
-                                       or  action_mode.startswith('gantt')):
+                elif action_mode and ( action_mode.startswith(('tree','kanban','gantt'))): 
                     values['icon'] = 'STOCK_JUSTIFY_FILL'
                 elif action_mode and action_mode.startswith('graph'):
                     values['icon'] = 'terp-graph'

From 7f63eb11cb798d08c8a329e9f867074c0b308332 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 12:19:53 +0100
Subject: [PATCH 094/119] [FIX] restrict todos displayed in configuration
 widget to those matching the user's groups

bzr revid: xmo@openerp.com-20111213111953-diremmatzwwy5l6g
---
 .../web_dashboard/static/src/js/dashboard.js  | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index aedbe0f26b3..fc2bb31ddb8 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -279,20 +279,29 @@ openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
     template: 'ConfigOverview',
     init: function (parent) {
         this._super(parent);
-        this.dataset = new openerp.web.DataSetSearch(
-                this, 'ir.actions.todo');
-        this.dataset.domain = [['type', '!=', 'automatic']];
+        this.user = _.extend(new openerp.web.DataSet(this, 'res.users'), {
+            index: 0,
+            ids: [this.session.uid]
+        });
+        this.dataset = new openerp.web.DataSetSearch(this, 'ir.actions.todo');
     },
     start: function () {
         this._super();
-        $.when(this.dataset.read_slice(['state', 'action_id', 'category_id']),
-               this.dataset.call('progress'))
-            .then(this.on_records_loaded);
-    },
-    on_records_loaded: function (read_response, progress_response) {
-        var records = read_response,
-           progress = progress_response[0];
+        var self = this;
+        return this.user.read_index(['groups_id']).pipe(function (record) {
+            var todos_filter = [
+                ['type', '!=', 'automatic'],
+                '|', ['groups_id', '=', false],
+                     ['groups_id', 'in', record['groups_id']]];
+            return $.when(
+                self.dataset.read_slice(['state', 'action_id', 'category_id'],{
+                        domain: todos_filter }),
+                self.dataset.call('progress').pipe(
+                        function (arg) { return arg; }, null))
+        }, null).then(this.on_records_loaded);
 
+    },
+    on_records_loaded: function (records, progress) {
         var grouped_todos = _(records).chain()
             .map(function (record) {
                 return {

From f0fec3f81a1183ae5a1d4b7ae79c5ad54d7b4082 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 13 Dec 2011 16:58:43 +0530
Subject: [PATCH 095/119] [IMP]hr_expense: add demo expense bill of current
 user and add test case to make duplicate expense bill.

bzr revid: hmo@tinyerp.com-20111213112843-c6k4oaw4ezw4vr73
---
 addons/hr_expense/hr_expense_demo.xml      | 15 ++++++++++++++-
 addons/hr_expense/test/expense_demo.yml    |  8 ++++----
 addons/hr_expense/test/expense_process.yml | 18 +++++++++---------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 6e575aec782..8912dfb09de 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="hr.employee4" model="hr.employee">
             <field name="address_home_id" ref="base.res_partner_address_1"/>
@@ -32,6 +32,19 @@
             <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
         </record>
+        <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="sep_expenses" model="hr.expense.expense">
             <field name="employee_id" ref="hr.employee4"/>
diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
index 59a7c729bd8..8e9aeaf2709 100644
--- a/addons/hr_expense/test/expense_demo.yml
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -1,11 +1,11 @@
 -
-  !record {model: hr.expense.expense, id: sep_expenses, view: False}:
+  !record {model: hr.expense.expense, id: sep_expenses}:
     employee_id: 'hr.employee4'
     name : 'John Smith'
 -
-  !record {model: product.product, id: car_travel, view: False}:
+  !record {model: product.product, id: car_travel}:
     hr_expense_ok: 'True'
 -
-  !record {model: hr.expense.line, id: expense_line, view: False}:
+  !record {model: hr.expense.line, id: expense_line}:
     product_id: 'car_travel'
-    name: 'Car Travel Expenses'
\ No newline at end of file
+    name: 'Car Travel Expenses'
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index 1c02e4b6f5c..5c8a9d53f7c 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -1,12 +1,5 @@
 -
-  I test the process of "Employee Expenses" by processing the expenses of an employee for September month
--
-  I check that state is 'Draft'.
--
-  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Draft state}:
-    - state == 'draft'
--
-  I change the state. 
+  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}
 -
@@ -40,6 +33,7 @@
     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.
 -
@@ -50,6 +44,12 @@
 -
   !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.
 - 
@@ -57,4 +57,4 @@
     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)
\ No newline at end of file
+        file(os.path.join(tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)

From 4c7068b5fca663893c43974173d051c3e6a89d48 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Dec 2011 12:35:21 +0100
Subject: [PATCH 096/119] [IMP] Improved view debugging

bzr revid: fme@openerp.com-20111213113521-vd7lylwaxu0ob3r2
---
 addons/web/static/src/js/views.js  | 79 ++++++++++++++++++------------
 addons/web/static/src/xml/base.xml | 11 +++--
 2 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index d9b72041e13..4885037957d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -3,8 +3,8 @@
  *---------------------------------------------------------*/
 
 openerp.web.views = function(session) {
-
-var _t = session.web._t;
+var QWeb = session.web.qweb,
+    _t = session.web._t;
 
 /**
  * Registry for all the client actions key: tag value: widget
@@ -472,13 +472,8 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
 
         var manager_ready = $.when(searchview_loaded, main_view_loaded);
 
-        this.$element.find('.oe_get_xml_view').click(function () {
-            var view = self.views[self.active_view].controller,
-                view_id = view.fields_view.view_id;
-            if (view_id) {
-                view.on_sidebar_edit_resource('ir.ui.view', view_id);
-            }
-        });
+        this.$element.find('.oe_debug_view').change(this.on_debug_changed);
+
         if (this.action.help && !this.flags.low_profile) {
             var Users = new session.web.DataSet(self, 'res.users'),
                 $tips = this.$element.find('.oe_view_manager_menu_tips');
@@ -516,6 +511,47 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
 
         return manager_ready;
     },
+    on_debug_changed: function (evt) {
+        var $sel = $(evt.currentTarget),
+            $option = $sel.find('option:selected'),
+            val = $sel.val();
+        switch (val) {
+            case 'fvg':
+                $('<pre>').text(session.web.json_node_to_xml(
+                    this.views[this.active_view].controller.fields_view.arch, true)
+                ).dialog({ width: '95%'});
+                break;
+            case 'edit':
+                var model = $option.data('model'),
+                    id = $option.data('id'),
+                    domain = $option.data('domain'),
+                    action = {
+                        res_model : model,
+                        type : 'ir.actions.act_window',
+                        view_type : 'form',
+                        view_mode : 'form',
+                        target : 'new',
+                        flags : {
+                            action_buttons : true
+                        }
+                    };
+                if (id) {
+                    action.res_id = id,
+                    action.views = [[false, 'form']];
+                } else if (domain) {
+                    action.views = [[false, 'list'], [false, 'form']];
+                    action.domain = domain;
+                    action.flags.views_switcher = true;
+                }
+                this.do_action(action);
+                break;
+            default:
+                if (val) {
+                    console.log("No debug handler for ", val);
+                }
+        }
+        evt.currentTarget.selectedIndex = 0;
+    },
     on_mode_switch: function (view_type, no_store) {
         var self = this;
 
@@ -529,7 +565,10 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
             var controller = self.views[self.active_view].controller,
                 fvg = controller.fields_view,
                 view_id = (fvg && fvg.view_id) || '--';
-            self.$element.find('.oe_get_xml_view span').text(view_id);
+            self.$element.find('.oe_debug_view').html(QWeb.render('ViewManagerDebug', {
+                view: controller,
+                view_manager: self
+            }));
             if (!self.action.name && fvg) {
                 self.$element.find('.oe_view_title_text').text(fvg.arch.attrs.string || fvg.name);
             }
@@ -691,26 +730,6 @@ session.web.Sidebar = session.web.Widget.extend({
                 classname: 'oe_hide oe_sidebar_view_log'
             }
         ]);
-
-        if (session.connection.debug) {
-            this.add_section("Debug", 'debug');
-            if (action && action.id) {
-                this.add_items('debug', [{
-                    label: "Edit Action",
-                    callback: function() {
-                        view.on_sidebar_edit_resource(action.type, action.id);
-                    }
-                }]);
-            }
-            if (view_manager.searchview && view_manager.searchview.view_id) {
-                this.add_items('debug', [{
-                    label: "Edit SearchView",
-                    callback: function() {
-                        view.on_sidebar_edit_resource('ir.ui.view', view_manager.searchview.view_id);
-                    }
-                }]);
-            }
-        }
     },
 
     add_toolbar: function(toolbar) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 884acb92507..8c17b5b897f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -464,9 +464,7 @@
             href="javascript: void(0)"> </a>
     </t>
     <t t-jquery="h2.oe_view_title" t-operation="after">
-        <button t-if="self.session.debug" class="oe_get_xml_view">
-            View#<span></span>
-        </button>
+        <select t-if="self.session.debug" class="oe_debug_view"/>
     </t>
     <t t-jquery=".oe-view-manager-header" t-operation="after">
         <div class="oe-view-manager-logs oe-folded">
@@ -476,6 +474,13 @@
         </div>
     </t>
 </t>
+<t t-name="ViewManagerDebug">
+    <option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option>
+    <option value="fvg"> - Fields View Get</option>
+    <option value="edit" data-model="ir.ui.view" t-att-data-id="view.fields_view.view_id"> - Edit <t t-esc="_.str.capitalize(view.fields_view.type)"/>View</option>
+    <option t-if="view_manager.searchview" value="edit" data-model="ir.ui.view" t-att-data-id="view_manager.searchview.view_id"> - Edit SearchView</option>
+    <option t-if="view_manager.action" value="edit" t-att-data-model="view_manager.action.type" t-att-data-id="view_manager.action.id"> - Edit Action</option>
+</t>
 
 <t t-name="Sidebar">
     <a class="toggle-sidebar"></a>

From 9d44cb7fcdbc7a60979ba4f0726641edb5db4957 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 Dec 2011 12:44:42 +0100
Subject: [PATCH 097/119] [FIX] display config after immediate install (if any)

bzr revid: chs@openerp.com-20111213114442-tcyuyazfvfo868ul
---
 openerp/addons/base/module/module.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 05ad5fccca4..9f70f3e72d8 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -330,6 +330,11 @@ class module(osv.osv):
         self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+
+        config = pool.get('res.config').next(cr, uid, [], context=context)
+        if config:
+            return config
+
         menu_ids = self.root_menus(cr,uid,ids,context)
         if menu_ids:
             action = {

From 65f92d7208c9c5484602851d1385c9b113d480dd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 12:50:01 +0100
Subject: [PATCH 098/119] [FIX] columns filtering in group headers

bzr revid: xmo@openerp.com-20111213115001-r0lhumhiqtdxcdrv
---
 addons/web/static/src/js/view_list.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index f7a7abe25ce..4c7da6c7e0e 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -334,6 +334,8 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                 };
                 if (modifiers['tree_invisible']) {
                     column.invisible = '1';
+                } else {
+                    delete column.invisible;
                 }
             } else {
                 column.modifiers_for = noop;

From 687f5f3fc93108851b4dfa6513eb70642944855b Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 13 Dec 2011 17:22:40 +0530
Subject: [PATCH 099/119] [FIX] hr_expense: small Fix in demo.yml

bzr revid: hmo@tinyerp.com-20111213115240-9yi77jdeeln986ic
---
 addons/hr_expense/test/expense_demo.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/test/expense_demo.yml b/addons/hr_expense/test/expense_demo.yml
index 8e9aeaf2709..5b3cb0893d0 100644
--- a/addons/hr_expense/test/expense_demo.yml
+++ b/addons/hr_expense/test/expense_demo.yml
@@ -1,11 +1,11 @@
 -
   !record {model: hr.expense.expense, id: sep_expenses}:
-    employee_id: 'hr.employee4'
+    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'
+    product_id: car_travel
     name: 'Car Travel Expenses'

From 8cd2acd27f4482382c8aeaeb81f591a79f212a12 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 12:54:52 +0100
Subject: [PATCH 100/119] [FIX] progress values in group headers

bzr revid: xmo@openerp.com-20111213115452-hnxjfgehq49cv6ye
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 4c7da6c7e0e..16448b9f4bb 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1192,7 +1192,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                     } else if (column.id in group.aggregates) {
                         var value = group.aggregates[column.id];
                         $('<td class="oe-number">')
-                            .text(openerp.web.format_value(value, column))
+                            .html(openerp.web.format_value(value, column))
                             .appendTo($row);
                     } else {
                         $row.append('<td>');

From 075a5917e71cd7ac2e433960dfc68c1946960bf6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 13 Dec 2011 13:34:12 +0100
Subject: [PATCH 101/119] [FIX] ir.module search view: filters/fields need
 unique names

bzr revid: odo@openerp.com-20111213123412-bebrvt1ry7ld8qet
---
 openerp/addons/base/module/module_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index f90a45c58a4..50d5fc7b30c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -49,9 +49,7 @@
                         <field name="name"
                             filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]"
                             string="Name"/>
-                        <field name="name"
-                            filter_domain="[('description','ilike',self)]"
-                            string="Keywords"/>
+                        <field name="description" string="Keywords"/>
                     </group>
                </search>
             </field>

From faa0ebe5cdbf6af067795f7b6e8fe659ef9ed96f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 13 Dec 2011 14:16:15 +0100
Subject: [PATCH 102/119] [REV] partial revert of commit 5944 that was hidding
 all the l10n_xx modules in the wizard to install new charts of accounts
 (looking for all modules in that category)

bzr revid: qdp-launchpad@openerp.com-20111213131615-rtky2mnucsvolhjg
---
 addons/l10n_at/__openerp__.py        | 2 +-
 addons/l10n_be/__openerp__.py        | 2 +-
 addons/l10n_br/__openerp__.py        | 2 +-
 addons/l10n_ca/__openerp__.py        | 2 +-
 addons/l10n_ch/__openerp__.py        | 2 +-
 addons/l10n_cn/__openerp__.py        | 2 +-
 addons/l10n_cr/__openerp__.py        | 2 +-
 addons/l10n_de/__openerp__.py        | 2 +-
 addons/l10n_ec/__openerp__.py        | 2 +-
 addons/l10n_es/__openerp__.py        | 2 +-
 addons/l10n_fr/__openerp__.py        | 2 +-
 addons/l10n_gr/__openerp__.py        | 2 +-
 addons/l10n_gt/__openerp__.py        | 2 +-
 addons/l10n_hn/__openerp__.py        | 2 +-
 addons/l10n_in/__openerp__.py        | 2 +-
 addons/l10n_it/__openerp__.py        | 2 +-
 addons/l10n_lu/__openerp__.py        | 2 +-
 addons/l10n_ma/__openerp__.py        | 2 +-
 addons/l10n_mx/__openerp__.py        | 2 +-
 addons/l10n_nl/__openerp__.py        | 2 +-
 addons/l10n_pl/__openerp__.py        | 2 +-
 addons/l10n_ro/__openerp__.py        | 2 +-
 addons/l10n_syscohada/__openerp__.py | 2 +-
 addons/l10n_th/__openerp__.py        | 2 +-
 addons/l10n_uk/__openerp__.py        | 2 +-
 addons/l10n_ve/__openerp__.py        | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

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.

From 4ed7824b8592247867bc2deb1517e19ec1329165 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 13 Dec 2011 14:16:39 +0100
Subject: [PATCH 103/119] [FIX] account: install the generic chart of account
 fixed

bzr revid: qdp-launchpad@openerp.com-20111213131639-so2mo0b9ua0d236s
---
 addons/account/account_installer.xml | 2 +-
 addons/account/installer.py          | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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/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:

From 5487329348103f60b6ea071141ffd017984b843d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 13 Dec 2011 14:42:36 +0100
Subject: [PATCH 104/119] [FIX] account: new company financial setting wizard
 fixed

bzr revid: qdp-launchpad@openerp.com-20111213134236-334j360qevt5c84p
---
 addons/account/account_view.xml | 3 +++
 1 file changed, 3 insertions(+)

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)

From 517df84074d4f456e0a4f79a1ed91d3a4956191d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 13 Dec 2011 14:55:14 +0100
Subject: [PATCH 105/119] [FIX] logout, reload

bzr revid: al@openerp.com-20111213135514-uenb6btw1lz84b80
---
 addons/web/static/src/js/chrome.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2dbd0867a81..b3278a14983 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -849,7 +849,7 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         this.$secondary_menu.addClass(this.folded ? 'oe_folded' : 'oe_unfolded');
     },
     do_reload: function() {
-        this.rpc("/web/menu/load", {}, this.on_loaded);
+        return this.rpc("/web/menu/load", {}, this.on_loaded);
     },
     on_loaded: function(data) {
         this.data = data;
@@ -1029,8 +1029,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.menu.start();
     },
     do_reload: function() {
-        this.session.session_restore();
-        this.menu.do_reload();
+        return $.when(this.session.session_restore(),this.menu.do_reload());
     },
     do_notify: function() {
         var n = this.notification;
@@ -1072,6 +1071,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
 
     on_logged_out: function() {
         $(window).unbind('hashchange', this.on_hashchange);
+        this.do_push_state({},true);
         if(this.action_manager)
             this.action_manager.stop();
         this.action_manager = null;
@@ -1100,13 +1100,14 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
     },
     do_action: function(action) {
         if(action.type === "ir.ui.menu") {
-            this.do_reload();
-            this.rpc('/web/menu/action', {'menu_id': action.menu_id}, this.menu.on_menu_action_loaded);
+            console.log(action);
+            this.do_reload().then(function () {
+                this.rpc('/web/menu/action', {'menu_id': action.menu_id}, this.menu.on_menu_action_loaded);
+            });
         }
     },
     do_about: function() {
     }
-
 });
 
 };

From 99808af722c1281bf7c2712932d222f8376787cc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 13 Dec 2011 15:26:08 +0100
Subject: [PATCH 106/119] [FIX] url handling

bzr revid: al@openerp.com-20111213142608-bgbo5wkuf5xqbrvq
---
 addons/web/static/src/js/views.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 4885037957d..0ad49f69f7b 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -102,6 +102,7 @@ session.web.ActionManager = session.web.Widget.extend({
         this.content_stop();
     },
     ir_actions_act_window: function (action, on_close) {
+        var self = this;
         if (_(['base.module.upgrade', 'base.setup.installer'])
                 .contains(action.res_model)) {
             var old_close = on_close;
@@ -125,12 +126,13 @@ session.web.ActionManager = session.web.Widget.extend({
         } else  {
             this.dialog_stop();
             this.content_stop();
+            this.inner_action = action;
             this.inner_viewmanager = new session.web.ViewManagerAction(this, action);
-            this.inner_viewmanager.do_push_state.add(this.do_push_state);
+            this.inner_viewmanager.do_push_state.add(function(state,overwrite) {
+                state['action_id'] = action.id;
+                self.do_push_state(state,true);
+            });
             this.inner_viewmanager.appendTo(this.$element);
-            if (action.id) {
-                this.do_push_state({action_id: action.id}, true);
-            }
         }
     },
     ir_actions_act_window_close: function (action, on_closed) {

From dbe5e012e43c2f77683eed63b5fc626a0d60bd1d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Dec 2011 15:44:02 +0100
Subject: [PATCH 107/119] [FIX] Widget Paragraph not wrapping

bzr revid: fme@openerp.com-20111213144402-go4zq0bgnb01s6cg
---
 addons/web/static/src/css/base.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3aad5b8d83d..e2e3e1f57f9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1105,6 +1105,7 @@ label.error {
 }
 .openerp .oe_forms .oe_form_paragraph {
     margin: 3px 0 0 0;
+    white-space: normal;
 }
 
 /* Uneditable Form View */

From 987a9cc07b8c6aead6a02f49b166e6f5b6d7e070 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 15:49:55 +0100
Subject: [PATCH 108/119] [IMP] merge title of o2m list view into list header

bzr revid: xmo@openerp.com-20111213144955-o4menzpyak0c1ugx
---
 addons/web/static/src/css/base.css    |  5 +++++
 addons/web/static/src/js/view_form.js |  2 ++
 addons/web/static/src/js/view_list.js |  3 ++-
 addons/web/static/src/xml/base.xml    | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e2e3e1f57f9..00e8e1f5e55 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1108,6 +1108,11 @@ label.error {
     white-space: normal;
 }
 
+.openerp .oe_form_field_one2many .oe-actions h3.oe_view_title {
+    display: inline;
+    margin: 0 0.5em 0 0;
+}
+
 /* Uneditable Form View */
 .openerp .oe_form_readonly {
 
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 15a402efb47..3963ebc0708 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2064,6 +2064,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
         this.views = views;
 
         this.viewmanager = new openerp.web.ViewManager(this, this.dataset, views);
+        this.viewmanager.template = 'One2Many.viewmanager';
         this.viewmanager.registry = openerp.web.views.clone({
             list: 'openerp.web.form.One2ManyListView',
             form: 'openerp.web.FormView',
@@ -2280,6 +2281,7 @@ openerp.web.form.One2ManyDataSet = openerp.web.BufferedDataSet.extend({
 });
 
 openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
+    _template: 'One2Many.listview',
     do_add_record: function () {
         if (this.options.editable) {
             this._super.apply(this, arguments);
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 16448b9f4bb..2ced94c109f 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -3,6 +3,7 @@ var _t = openerp.web._t;
 var QWeb = openerp.web.qweb;
 openerp.web.views.add('list', 'openerp.web.ListView');
 openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# */ {
+    _template: 'ListView',
     defaults: {
         // records can be selected one by one
         'selectable': true,
@@ -200,7 +201,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
 
         this.setup_columns(this.fields_view.fields, grouped);
 
-        this.$element.html(QWeb.render("ListView", this));
+        this.$element.html(QWeb.render(this._template, this));
         // Head hook
         this.$element.find('.all-record-selector').click(function(){
             self.$element.find('.oe-record-selector input').prop('checked',
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8c17b5b897f..f1f8990bfc5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -481,6 +481,9 @@
     <option t-if="view_manager.searchview" value="edit" data-model="ir.ui.view" t-att-data-id="view_manager.searchview.view_id"> - Edit SearchView</option>
     <option t-if="view_manager.action" value="edit" t-att-data-model="view_manager.action.type" t-att-data-id="view_manager.action.id"> - Edit Action</option>
 </t>
+<t t-extend="ViewManager" t-name="One2Many.viewmanager">
+    <t t-jquery="span.oe_view_title_text" t-operation="replace"/>
+</t>
 
 <t t-name="Sidebar">
     <a class="toggle-sidebar"></a>
@@ -612,6 +615,18 @@
         </tr>
     </tfoot>
 </table>
+<t t-extend="ListView" t-name="One2Many.listview">
+    <t t-jquery="thead.ui-widget-header > tr:first">
+        this.removeAttr('t-if');
+    </t>
+    <t t-jquery="td.oe-actions">
+        this.removeAttr('t-if');
+        var $title = $(document.createElement('h3')).addClass('oe_view_title');
+        $title.append($(document.createElement('t')).attr(
+            't-esc', 'fields_view.arch.attrs.string'));
+        this.prepend($title);
+    </t>
+</t>
 <th t-name="Listview.navigation.button" t-if="options.pager !== false"
         class="oe-list-pager" t-att-colspan="columns_count">
     <button type="button" disabled="disabled"

From 41a105f744437c7e229810343d1689ecf7a15243 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 Dec 2011 16:12:07 +0100
Subject: [PATCH 109/119] [FIX] menu loading after immediate install of modules

bzr revid: chs@openerp.com-20111213151207-hj7xnc5980ahvv2i
---
 openerp/addons/base/module/module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index fc728805b4a..54685c105a0 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -331,8 +331,8 @@ class module(osv.osv):
         cr.commit()
         db, pool = pooler.restart_pool(cr.dbname, update_module=True)
 
-        config = pool.get('res.config').next(cr, uid, [], context=context)
-        if config:
+        config = pool.get('res.config').next(cr, uid, [], context=context) or {}
+        if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'):
             return config
 
         menu_ids = self.root_menus(cr,uid,ids,context)

From 94ed0a39520fe2abfa52c8ba952cfb4c4d496175 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 13 Dec 2011 16:13:49 +0100
Subject: [PATCH 110/119] [FIX] menu loading after immediate install of modules

bzr revid: chs@openerp.com-20111213151349-caesb8e51ngm2kko
---
 addons/web/static/src/js/chrome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b3278a14983..a70aa50c6e2 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1099,10 +1099,10 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.action_manager.do_action(action);
     },
     do_action: function(action) {
+        var self = this;
         if(action.type === "ir.ui.menu") {
-            console.log(action);
             this.do_reload().then(function () {
-                this.rpc('/web/menu/action', {'menu_id': action.menu_id}, this.menu.on_menu_action_loaded);
+                self.menu.on_menu_click(null, action.menu_id);
             });
         }
     },

From 5e451bd3a34f004035d37192bd6bca6116889735 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 16:33:43 +0100
Subject: [PATCH 111/119] [IMP] remove deferred stack

bzr revid: xmo@openerp.com-20111213153343-oj2ph04h3ac32pm6
---
 addons/web/static/src/js/view_form.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3963ebc0708..fef32df4a90 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -138,8 +138,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         }
     },
     on_record_loaded: function(record) {
-        var self = this,
-            deferred_stack = $.Deferred.queue();
+        var self = this, set_values = [];
         if (!record) {
             throw("Form: No record received");
         }
@@ -148,15 +147,12 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         _(this.fields).each(function (field, f) {
             field.reset();
             var result = field.set_value(self.datarecord[f] || false);
-            if (result && _.isFunction(result.promise)) {
-                deferred_stack.push(result);
-            }
+            set_values.push(result);
             $.when(result).then(function() {
                 field.validate();
             });
         });
-        deferred_stack.push('force resolution if no fields');
-        return deferred_stack.then(function() {
+        return $.when.apply(null, set_values).then(function() {
             if (!record.id) {
                 self.show_invalid = false;
                 // New record: Second pass in order to trigger the onchanges

From b6a0a7b886ee6c35de581432af4802eed66d310e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 16:39:31 +0100
Subject: [PATCH 112/119] [FIX] indentation of terminal groups in
 group_by_no_leaf

bzr revid: xmo@openerp.com-20111213153931-vdm0lo1murvz3hjr
---
 addons/web/static/src/js/view_list.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 2ced94c109f..ad40aa37c30 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1166,16 +1166,14 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                 } catch (e) {
                     $group_column.html(row_data[group_column.id].value);
                 }
-                if (!group.length) {
+                if (group.length && group.openable) {
+                    // Make openable if not terminal group & group_by_no_leaf
+                    $group_column.prepend('<span class="ui-icon ui-icon-triangle-1-e" style="float: left;">');
+                } else {
                     // Kinda-ugly hack: jquery-ui has no "empty" icon, so set
                     // wonky background position to ensure nothing is displayed
                     // there but the rest of the behavior is ui-icon's
-                    $group_column.prepend(
-                        '<span class="ui-icon" style="float: left; background-position: 150px 150px">');
-                } else if (group.openable) {
-                    // Make openable if not terminal group & group_by_no_leaf
-                    $group_column
-                        .prepend('<span class="ui-icon ui-icon-triangle-1-e" style="float: left;">');
+                    $group_column.prepend('<span class="ui-icon" style="float: left; background-position: 150px 150px">');
                 }
             }
             self.indent($group_column, group.level);

From 51ffcdd7e8942d36988f3fae1badfd32a4deb5a3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 16:47:22 +0100
Subject: [PATCH 113/119] [FIX] Ignore @invisible field spec on group titles,
 it's bothersome to have group titles don't display

bzr revid: xmo@openerp.com-20111213154722-vrpbl41hjgu66v1u
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index ad40aa37c30..059bc020682 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1162,7 +1162,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                     return column.id === group.grouped_on; });
                 try {
                     $group_column.html(openerp.web.format_cell(
-                        row_data, group_column, _t("Undefined")));
+                        row_data, group_column, _t("Undefined"), false));
                 } catch (e) {
                     $group_column.html(row_data[group_column.id].value);
                 }

From 020c0927e43b55f897fb4a990db4db051c8a55d3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 13 Dec 2011 16:35:50 +0100
Subject: [PATCH 114/119] [IMP] chrome small cleanups

bzr revid: al@openerp.com-20111213153550-x1dd1nrzmaoen61n
---
 addons/web/static/src/js/chrome.js            | 22 +++++++------------
 .../web_dashboard/static/src/js/dashboard.js  |  3 ++-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index a70aa50c6e2..87b19b98950 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1057,7 +1057,13 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             })
         }
     },
-
+    on_logged_out: function() {
+        $(window).unbind('hashchange', this.on_hashchange);
+        this.do_push_state({},true);
+        if(this.action_manager)
+            this.action_manager.stop();
+        this.action_manager = null;
+    },
     bind_hashchange: function() {
         $(window).bind('hashchange', this.on_hashchange);
 
@@ -1068,15 +1074,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             this.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
         }
     },
-
-    on_logged_out: function() {
-        $(window).unbind('hashchange', this.on_hashchange);
-        this.do_push_state({},true);
-        if(this.action_manager)
-            this.action_manager.stop();
-        this.action_manager = null;
-    },
-
     on_hashchange: function(event) {
         var state = event.getState(true);
         if (!_.isEqual(this._current_state, state)) {
@@ -1084,7 +1081,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         }
         this._current_state = state;
     },
-
     do_push_state: function(state, overwrite) {
         if (!overwrite) {
             var hash = $.deparam.fragment(true);
@@ -1094,20 +1090,18 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this._current_state = _.clone(state);
         $.bbq.pushState(url);
     },
-
     on_menu_action: function(action) {
         this.action_manager.do_action(action);
     },
     do_action: function(action) {
         var self = this;
+        // TODO replace by client action menuclick 
         if(action.type === "ir.ui.menu") {
             this.do_reload().then(function () {
                 self.menu.on_menu_click(null, action.menu_id);
             });
         }
     },
-    do_about: function() {
-    }
 });
 
 };
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index fc2bb31ddb8..c7132d7a9ef 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -397,6 +397,7 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.Widget.extend({
         this._super(parent);
     },
     start: function() {
+        // TODO menu hide
         var self = this;
         var domain = [['application','=',true], ['state','=','installed'], ['name', '!=', 'base']];
         var ds = new openerp.web.DataSetSearch(this, 'ir.module.module',{},domain);
@@ -438,8 +439,8 @@ openerp.web.client_actions.add( 'board.application.installer', 'openerp.web_dash
 openerp.web_dashboard.ApplicationInstaller = openerp.web.Widget.extend({
     template: 'web_dashboard.ApplicationInstaller',
     start: function () {
+        // TODO menu hide
         var r = this._super();
-        //$('.secondary_menu', this.$element.closest('.openerp')).hide();
         this.action_manager = new openerp.web.ActionManager(this);
         this.action_manager.appendTo(this.$element.find('.oe_installer'));
         this.action_manager.do_action({

From f76eda6bbaf7a91af87760e6a5909e814e793e69 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Dec 2011 17:22:35 +0100
Subject: [PATCH 115/119] [IMP] Use current month range search for calendar
 view

bzr revid: fme@openerp.com-20111213162235-d5jywhbfii8dfpjj
---
 addons/web_calendar/static/src/js/calendar.js | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 887bdc47780..aac3dcb4f3b 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -10,6 +10,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
 // Dhtmlx scheduler ?
     init: function(parent, dataset, view_id, options) {
         this._super(parent);
+        this.ready = $.Deferred();
         this.set_default_options(options);
         this.dataset = dataset;
         this.model = dataset.model;
@@ -26,6 +27,9 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
              '#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900' ];
         this.color_map = {};
         this.last_search = [];
+        this.range_start = null;
+        this.range_stop = null;
+        this.update_range_dates(Date.today());
     },
     start: function() {
         this._super();
@@ -126,9 +130,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         scheduler.attachEvent('onClick', this.do_edit_event);
         scheduler.attachEvent('onLightbox', this.do_edit_event);
 
-        scheduler.attachEvent('onViewChange', function(mode, date) {
-            self.$element.removeClass('oe_cal_day oe_cal_week oe_cal_month').addClass('oe_cal_' + mode);
-        });
+        scheduler.attachEvent('onViewChange', this.on_view_changed);
+        this.refresh_scheduler();
 
         if (this.options.sidebar) {
             this.mini_calendar = scheduler.renderCalendar({
@@ -141,6 +144,18 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
             });
         }
     },
+    on_view_changed: function(mode, date) {
+        this.$element.removeClass('oe_cal_day oe_cal_week oe_cal_month').addClass('oe_cal_' + mode);
+        if (!date.between(this.range_start, this.range_stop)) {
+            this.update_range_dates(date);
+            this.do_ranged_search();
+        }
+        this.ready.resolve();
+    },
+    update_range_dates: function(date) {
+        this.range_start = date.clone().moveToFirstDayOfMonth();
+        this.range_stop = this.range_start.clone().addMonths(1).addSeconds(-1);
+    },
     refresh_scheduler: function() {
         scheduler.setCurrentView(scheduler._date);
     },
@@ -345,23 +360,30 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         return data;
     },
     do_search: function(domain, context, group_by) {
+        this.last_search = arguments;
+        this.do_ranged_search();
+    },
+    do_ranged_search: function() {
         var self = this
-        if (!domain) {
-            this.do_search.apply(this, this.last_search);
-        } else {
-            this.last_search = [domain, context, group_by];
-        }
         scheduler.clearAll();
-        $.when(this.has_been_loaded).then(function() {
+        $.when(this.has_been_loaded, this.ready).then(function() {
             self.dataset.read_slice(_.keys(self.fields), {
                 offset: 0,
-                limit: self.limit
+                domain: self.get_range_domain(),
+                context: self.last_search[1]
             }, function(events) {
                 self.dataset_events = events;
                 self.on_events_loaded(events);
             });
         });
     },
+    get_range_domain: function() {
+        var format = openerp.web.date_to_str,
+            domain = this.last_search[0].slice(0);
+        domain.unshift([this.date_start, '>=', format(this.range_start.clone().addDays(-6))]);
+        domain.unshift([this.date_start, '<=', format(this.range_stop.clone().addDays(6))]);
+        return domain;
+    },
     do_show: function () {
         var self = this;
         $.when(this.has_been_loaded).then(function() {

From fc1c009d158907ec82d6961dc0601370dd614850 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Dec 2011 17:51:17 +0100
Subject: [PATCH 116/119] [FIX] Fixed dashboard creatable action default_view
 flag

bzr revid: fme@openerp.com-20111213165117-1cea257xcoc3s9v6
---
 addons/web_dashboard/static/src/js/dashboard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index c7132d7a9ef..f5fa0387adb 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -154,7 +154,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
         if (action_attrs.domain) {
             action.domain = action_attrs.domain;
         }
-        var action_orig = _.extend({}, action);
+        var action_orig = _.extend({ flags : {} }, action);
 
         if (view_mode && view_mode != action.view_mode) {
             var action_view_mode = action.view_mode.split(',');
@@ -195,7 +195,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
             var action_id = parseInt(action_attrs.creatable, 10);
             $action.parent().find('button.oe_dashboard_button_create').click(function() {
                 if (isNaN(action_id)) {
-                    action.flags.default_view = 'form';
+                    action_orig.flags.default_view = 'form';
                     self.do_action(action_orig);
                 } else {
                     self.rpc('/web/action/load', {

From 00c3cb84d8191040c95db96ff5e5c4728b8960fb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 13 Dec 2011 17:57:01 +0100
Subject: [PATCH 117/119] [IMP] Dashboard: moved 'Create' button in title of
 action

bzr revid: fme@openerp.com-20111213165701-qirmbnuyztsrny8u
---
 addons/web_dashboard/static/src/css/dashboard.css     | 5 +++++
 addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/web_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css
index 7ee47f4b88c..785de7d5b6b 100644
--- a/addons/web_dashboard/static/src/css/dashboard.css
+++ b/addons/web_dashboard/static/src/css/dashboard.css
@@ -39,6 +39,11 @@
     padding-bottom: 2px;
 }
 
+.openerp .oe_dashboard_button_create {
+    margin-left: 4px;
+    padding: 0 4px 0 4px;
+}
+
 .openerp a.oe-dashboard-action-rename {
     float: left;
     padding-right: 4px;
diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml
index 5d05990c917..5f98df612d5 100644
--- a/addons/web_dashboard/static/src/xml/web_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@ -25,11 +25,11 @@
         <h2 t-attf-class="oe-dashboard-action-header #{action.attrs.string ? '' : 'oe-dashboard-action-header-empty'}">
             <t t-esc="action.attrs.string"/>
             <t t-if="!action.attrs.string">&amp;nbsp;</t>
+            <button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_dashboard_button_create">Create</button>
             <span class='ui-icon ui-icon-closethick'></span>
             <span class='ui-icon ui-icon-minusthick oe-dashboard-fold' t-if="!action.attrs.fold"></span>
             <span class='ui-icon ui-icon-plusthick oe-dashboard-fold' t-if="action.attrs.fold"></span>
         </h2>
-        <button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_dashboard_button_create">Create</button>
         <div t-attf-id="#{view.element_id}_action_#{column_index}_#{action_index}" class="oe-dashboard-action-content" t-att-style="action.attrs.fold ? 'display: none' : null"></div>
     </div>
 </t>

From 5fe485b645f89d46223b70664d31ac673c306c05 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 Dec 2011 17:11:44 +0100
Subject: [PATCH 118/119] [FIX] o2m uses weird class sets

bzr revid: xmo@openerp.com-20111213161144-6mhs22l10xmz2j4z
---
 addons/web/static/src/css/base.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 00e8e1f5e55..0fa3a44a4cd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1108,7 +1108,8 @@ label.error {
     white-space: normal;
 }
 
-.openerp .oe_form_field_one2many .oe-actions h3.oe_view_title {
+.openerp .oe_form_field_one2many .oe-actions h3.oe_view_title,
+.openerp .oe_form_field_one2many_list .oe-actions h3.oe_view_title{
     display: inline;
     margin: 0 0.5em 0 0;
 }

From 3ad3baefbadf1f31347e994fccf4470608cbf5ba Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 14 Dec 2011 04:45:21 +0000
Subject: [PATCH 119/119] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111214044521-noijt6jiqm918uoh
---
 addons/account_payment/i18n/sr@latin.po | 116 +++++++++++++-----------
 1 file changed, 63 insertions(+), 53 deletions(-)

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."