merge from trunk

bzr revid: goran.kliska@slobodni-programi.hr-20121210111404-jcwlv3nsa16bu8zq

55 files changed, 4220 insertions, 1412 deletions

diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index c2dcc3cc91b..d788342648c 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -28,20 +28,22 @@
 This module allows you to define what is the default function of a specific user on a given account.
 ====================================================================================================
 
-This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available.
+This is mostly used when a user encodes his timesheet: the values are retrieved
+and the fields are auto-filled. But the possibility to change these values is
+still available.
 
-Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.
+Obviously if no data has been recorded for the current account, the default
+value is given as usual by the employee data so that this module is perfectly
+compatible with older configurations.
 
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/analytic_user_function.jpeg'],
     'depends': ['hr_timesheet_sheet'],
-    'init_xml': [],
-    'update_xml': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
-    'demo_xml': [],
+    'data': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0082277138269',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index cfb1aba10d1..c2a7ae8f05a 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -21,39 +21,51 @@
 
 from osv import fields,osv
 from tools.translate import _
+import decimal_precision as dp
 
 class analytic_user_funct_grid(osv.osv):
-
     _name="analytic.user.funct.grid"
-    _description= "Relation table between users and products on a analytic account"
+    _description= "Price per User"
     _columns={
         'user_id': fields.many2one("res.users", "User", required=True,),
-        'product_id': fields.many2one("product.product", "Product", required=True,),
+        'product_id': fields.many2one("product.product", "Service", required=True,),
         'account_id': fields.many2one("account.analytic.account", "Analytic Account", required=True,),
-        }
-
-analytic_user_funct_grid()
+        'uom_id': fields.related("product_id", "uom_id", relation="product.uom", string="Unit of Measure", type="many2one", readonly=True),
+        'price': fields.float('Price', digits_compute=dp.get_precision('Product Price'), help="Price per hour for this user.", required=True),
+    }
+    def onchange_user_product_id(self, cr, uid, ids, user_id, product_id, context=None):
+        if not user_id:
+            return {}
+        emp_obj = self.pool.get('hr.employee')
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)
+        if not emp_id:
+            return {}
+
+        value = {}
+        emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
+        if emp.product_id and not product_id:
+            value['product_id'] = emp.product_id.id
+            prod = emp.product_id
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        if prod:
+            value['price'] = prod.list_price
+            value['uom_id'] = prod.uom_id.id
+        return {'value': value}
 
 
 class account_analytic_account(osv.osv):
-
     _inherit = "account.analytic.account"
     _columns = {
         'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.'),
     }
 
-account_analytic_account()
-
 
 class hr_analytic_timesheet(osv.osv):
-
     _inherit = "hr.analytic.timesheet"
-
-
     # Look in account, if no value for the user => look in parent until there is no more parent to look
     # Take the first found... if nothing found => return False
     def _get_related_user_account_recursiv(self, cr, uid, user_id, account_id):
-
         temp=self.pool.get('analytic.user.funct.grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
         account=self.pool.get('account.analytic.account').browse(cr, uid, account_id)
         if temp:
@@ -64,7 +76,6 @@ class hr_analytic_timesheet(osv.osv):
             else:
                 return False
 
-
     def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0):
         res = {}
         if not (account_id):
@@ -92,7 +103,7 @@ class hr_analytic_timesheet(osv.osv):
             if not a:
                 a = r.product_id.categ_id.property_account_expense_categ.id
             if not a:
-                raise osv.except_osv(_('Error !'),
+                raise osv.except_osv(_('Error!'),
                         _('There is no expense account define ' \
                                 'for this product: "%s" (id:%d)') % \
                                 (r.product_id.name, r.product_id.id,))
@@ -106,12 +117,6 @@ class hr_analytic_timesheet(osv.osv):
         return res
 
     def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0):
-        res = {}
-        if not (user_id):
-            #avoid a useless call to super
-            return res
-
-        #get the old values from super
         res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)
 
         if account_id:
@@ -127,7 +132,7 @@ class hr_analytic_timesheet(osv.osv):
                 if not a:
                     a = r.product_id.categ_id.property_account_expense_categ.id
                 if not a:
-                    raise osv.except_osv(_('Error !'),
+                    raise osv.except_osv(_('Error!'),
                             _('There is no expense account define ' \
                                     'for this product: "%s" (id:%d)') % \
                                     (r.product_id.name, r.product_id.id,))
@@ -141,7 +146,11 @@ class hr_analytic_timesheet(osv.osv):
                 res ['value']['general_account_id']= a
         return res
 
-hr_analytic_timesheet()
-
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        for grid in account.user_product_ids:
+            if grid.user_id.id==user_id:
+                return grid.price
+        return super(account_analytic_line, self)._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 763b3115814..490b3026d7f 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -6,11 +6,12 @@
         <record model="ir.ui.view" id="analytic_user_funct_grid_tree">
             <field name="name">analytic_user_funct_grid.tree</field>
             <field name="model">analytic.user.funct.grid</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="User's Product for this Analytic Account" editable="bottom">
-                    <field name="user_id" required="1"/>
-                    <field name="product_id" required="1" />
+                <tree string="Invoicing Data" editable="bottom">
+                    <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
+                    <field name="product_id" on_change="onchange_user_product_id(user_id, product_id)" domain="[('type','=','service')]"/>
+                    <field name="price"/>
+                    <field name="uom_id"/>
                 </tree>
             </field>
         </record>
@@ -18,11 +19,14 @@
         <record model="ir.ui.view" id="analytic_user_funct_grid_form">
             <field name="name">analytic_user_funct_grid.form</field>
             <field name="model">analytic.user.funct.grid</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="User's Product for this Analytic Account">
-                    <field name="user_id" required="1"/>
-                    <field name="product_id" required="1"/>
+                <form string="Invoicing Data">
+                    <group>
+                        <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
+                        <field name="product_id" domain="[('type','=','service')]" on_change="onchange_user_product_id(user_id, product_id)"/>
+                        <field name="price"/>
+                        <field name="uom_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -31,14 +35,26 @@
         <record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field eval="60" name="priority"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page" position="after">
-                    <page string="Users/Products Rel.">
-                        <field name="user_product_ids" colspan="4" nolabel="1"/>
-                    </page>
-                </xpath>
+                <separator name="description" position="before">
+                    <div name="user_function_price" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                        <separator string="Invoice Price Rate per User"/>
+                        <p class="oe_grey oe_edit_only">
+                            Define a specific service (e.g. Senior Consultant)
+                            and price for some users to use these data instead
+                            of the default values when invoicing the customer.
+                        </p>
+                        <p class="oe_grey oe_edit_only">
+                            OpenERP will recursively search on parent accounts
+                            to check if specific conditions are defined for a
+                            specific user. This allows to set invoicing
+                            conditions for a group of contracts.
+                        </p>
+                        <field name="user_product_ids"/>
+                    </div>
+                </separator>
             </field>
         </record>
 
@@ -46,11 +62,10 @@
         <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
             <field name="name">hr.timesheet.sheet.form.tree</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
+                <xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>
@@ -60,11 +75,10 @@
         <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit1">
             <field name="name">hr.timesheet.sheet.form.form</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
             <field name="priority" eval="19"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
+                <xpath expr="//field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
                     <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
                 </xpath>
             </field>
@@ -74,11 +88,10 @@
         <record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Information']/group/field[@name='account_id']" position="replace">
-                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/>
+                <xpath expr="//field[@name='account_id']" position="replace">
+                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" />
                 </xpath>
             </field>
         </record>
@@ -86,11 +99,10 @@
         <record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='user_id']" position="replace">
-                    <field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
+                <xpath expr="//field[@name='user_id']" position="replace">
+                    <field name="user_id"  required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
                 </xpath>
             </field>
         </record>
@@ -98,11 +110,10 @@
         <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="/tree/field[@name='account_id']" position="replace">
-                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/>
+                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" />
                 </xpath>
             </field>
         </record>
@@ -110,11 +121,10 @@
         <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="/tree/field[@name='user_id']" position="replace">
-                    <field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
+                    <field name="user_id"  required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index 0bb3a2947b8..b75fdf6df4f 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-03 16:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,18 +16,33 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -37,42 +52,56 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:account.analytic.account:0
+msgid "Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data instead\n"
+"                            of the default values when invoicing the customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid "OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
 msgstr ""
 
diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po
index 677df907237..8593fa06b9a 100644
--- a/addons/analytic_user_function/i18n/ar.po
+++ b/addons/analytic_user_function/i18n/ar.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "المنتج"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "جدول العلاقة بين المنتجات والمستخدمين في الحساب التحليلي"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,34 +53,43 @@ msgid "Analytic Account"
 msgstr "حساب تحليلي"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "علاقةالمنتجات/المستخدمين."
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "المستخدم"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "خطأ !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "لا يوجد حساب مصروفات محدد لهذا المنتج: \"%s\" )id:%dd("
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -73,14 +97,70 @@ msgid "Timesheet Line"
 msgstr "خط سجل الدوام"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "منتج المستخدم للحساب التحليلي هذا"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "المستخدم"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "خطأ !"
+
+#~ msgid "Product"
+#~ msgstr "المنتج"
 
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "خطأ! العملة لابد و أن تكون مثل العملة للشركة المختارة"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
+
 #~ msgid "Analytic User Function"
 #~ msgstr "وظيفة المستخدم التحليلية"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "جدول العلاقة بين المنتجات والمستخدمين في الحساب التحليلي"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "منتج المستخدم للحساب التحليلي هذا"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    تسمح لك هذه الوحدة أن تعرف ما هي الوظيفة الافتراضية من مستخدم معين على "
+#~ "حساب معين. غالبا ما يستخدم هذا عندما يقوم المستخدم بترميز زمني له: يتم "
+#~ "استرجاع القيم والحقول الننتلئة ذاتيًا... لكن إمكانية لتغيير هذه القيم لا "
+#~ "تزال متاحة.\n"
+#~ "\n"
+#~ "من الواضح إذا تم تسجيل أي بيانات عن الحساب الجاري، وتعطى القيمة الافتراضية "
+#~ "كما هو معتاد من قبل بيانات الموظفين بحيث هذه الوحدة هو متوافق تماما مع "
+#~ "الاقدم والتكوينات.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "لا يمكنك تعديل عملية مؤكدة أو تمت في الجدول الزمني !."
diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po
index aea375bbf71..9c817c45a7d 100644
--- a/addons/analytic_user_function/i18n/bg.po
+++ b/addons/analytic_user_function/i18n/bg.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2009-02-03 09:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Продукт"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Свързваща таблица между потребители и продукти по аналитична сметка"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,34 +53,43 @@ msgid "Analytic Account"
 msgstr "Аналитична сметка"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Потребители/Продукти Връзка."
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Потребител"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Няма определена разходна сметка за този продукт: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Грешка!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Грешка! Не можете да създадете рекурсивни аналитични сметки."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Няма определена разходна сметка за този продукт: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -73,9 +97,19 @@ msgid "Timesheet Line"
 msgstr "Ред в график"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Продукт на потребителя за аналитична сметка"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Потребител"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Невалиден XML за преглед на архитектурата"
@@ -86,12 +120,28 @@ msgstr "Продукт на потребителя за аналитична с�
 #~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 #~ "символи!"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Грешка!"
+
+#~ msgid "Product"
+#~ msgstr "Продукт"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr ""
 #~ "Грешка! Валутата трябва да бъде същата като валутата на избраната компания"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Свързваща таблица между потребители и продукти по аналитична сметка"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Грешка! Не можете да създадете рекурсивни аналитични сметки."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Продукт на потребителя за аналитична сметка"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Аналитична потребителска сметка"
 
diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po
index 56b60cc528f..2c4629791f3 100644
--- a/addons/analytic_user_function/i18n/bs.po
+++ b/addons/analytic_user_function/i18n/bs.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,33 +53,42 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
-#: field:account.analytic.account,user_product_ids:0
-msgid "Users/Products Rel."
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
-#, python-format
-msgid "Error !"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
@@ -73,9 +97,31 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "korisnik"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Greška !"
+
+#~ msgid "Product"
+#~ msgstr "Proizvod"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po
index 27019abb279..68fe1b3c4c0 100644
--- a/addons/analytic_user_function/i18n/ca.po
+++ b/addons/analytic_user_function/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-10-30 14:54+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,22 +14,37 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Producte"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Taula de relació entre usuaris i productes d'un compte analític"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,35 +54,44 @@ msgid "Analytic Account"
 msgstr "Compte analític"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Rel. usuaris/productes"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Usuari"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"No s'ha definit un compte de despeses per a aquest producte: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Error!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Error! No podeu crear comptes analítics recursius."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No s'ha definit un compte de despeses per a aquest producte: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -75,9 +99,19 @@ msgid "Timesheet Line"
 msgstr "Línia del full de serveis"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Producte de l'usuari per aquesta compte analític"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuari"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invàlid per a la definició de la vista!"
@@ -88,9 +122,25 @@ msgstr "Producte de l'usuari per aquesta compte analític"
 #~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
 #~ "especial!"
 
+#~ msgid "Product"
+#~ msgstr "Producte"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Taula de relació entre usuaris i productes d'un compte analític"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Producte de l'usuari per aquesta compte analític"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Error!"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Funció analítica d'usuari"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Error! No podeu crear comptes analítics recursius."
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index 8ab8a8ac7de..a0beaeb096f 100644
--- a/addons/analytic_user_function/i18n/cs.po
+++ b/addons/analytic_user_function/i18n/cs.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-10-30 10:06+0000\n"
 "Last-Translator: Konki <pavel.konkol@seznam.cz>\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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produkt"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Vztah mezi uživateli a tabulkou produktů na analytickém účtu"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,33 +53,42 @@ msgid "Analytic Account"
 msgstr "Analytický účet"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Uživatelé/Produktové vztahy"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Uživatel"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Chyba !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
@@ -73,13 +97,30 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Uživatelský produkt pro tento Analytický Účet"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Uživatel"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalidní XML pro zobrazení architektury!"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Chyba !"
+
+#~ msgid "Product"
+#~ msgstr "Produkt"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analytická uživatelská funkce"
 
@@ -87,3 +128,9 @@ msgstr "Uživatelský produkt pro tento Analytický Účet"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Uživatelský produkt pro tento Analytický Účet"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Vztah mezi uživateli a tabulkou produktů na analytickém účtu"
diff --git a/addons/analytic_user_function/i18n/da.po b/addons/analytic_user_function/i18n/da.po
index e93e5cf93b7..522bbd3803b 100644
--- a/addons/analytic_user_function/i18n/da.po
+++ b/addons/analytic_user_function/i18n/da.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2012-01-27 08:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,41 +54,60 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index 7dc87c19dfa..595cc4bca3e 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -6,31 +6,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-01-13 19:15+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-08 11:12+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Kostenstellen Buchung"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr "Abrechenbare Stundensätze der Benutzer"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produkt"
+msgid "Service"
+msgstr "Dienstleistung"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relation zwischen Benutzern und Produkten"
+msgid "Price per User"
+msgstr "Preis nach Benutzer"
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
-"Bestätigte und abgerechnete Zeitaufzeichungen können nicht geändert werden"
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr "Preis"
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
+msgstr "Preis pro Stunde für Benutzer"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -39,34 +54,47 @@ msgid "Analytic Account"
 msgstr "Analytisches Konto"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr "Fehler !"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr "Rechnungsdaten"
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Benutzer / Produkte Relation"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Benutzer"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
+"Anlegen einer spezifischen Dienstleistung (z.B. Senior Consultant)\n"
+"                               und Preis für einige Benutzer, um diese Daten "
+"anstelle der Standard Werte\n"
+"                               für die Abrechnung an Kunden zu benutzen."
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Es ist kein Aufwandskonto definiert für:\"%s\"(id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr "Mengeneinheit"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Fehler !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Es ist kein Aufwandskonto definiert für:\"%s\"(id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,9 +102,22 @@ msgid "Timesheet Line"
 msgstr "Zeiterfassung Positionen"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Produkte des Benutzers"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+"OpenERP durchsucht rekursiv die übergeordneten Kostenstellen, um spezifische "
+"Konditionen für spezifische Benutzer zu überprüfen. Dieses ermöglicht die "
+"Hinterlegung der Abrechnungskonditionen für bestimmte Vertragsgruppen."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Benutzer"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
@@ -87,6 +128,19 @@ msgstr "Produkte des Benutzers"
 #~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
 #~ "beinhalten"
 
+#~ msgid "Product"
+#~ msgstr "Produkt"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Relation zwischen Benutzern und Produkten"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Produkte des Benutzers"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fehler !"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analytische Benutzer Funktion"
 
@@ -121,7 +175,14 @@ msgstr "Produkte des Benutzers"
 #~ "\n"
 #~ "    "
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "Fehler! Die Währung muss der Währung der gewählten Firma entsprechen"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Bestätigte und abgerechnete Zeitaufzeichungen können nicht geändert werden"
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index c4167f0068c..02b9ce261fd 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -7,30 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-12-29 13:04+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Προϊόν"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
-"Πίνακας Σχέσεων μεταξύ χρηστών και προϊόντων στον αναλυτικό λογαριασμό"
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -40,35 +54,44 @@ msgid "Analytic Account"
 msgstr "Αναλυτική Λογαριασμού"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Χρήστες/σχ. Προϊόντα"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Χρήστης"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"Δεν έχει οριστεί λογαριασμός εξόδων για αυτό το προϊόν: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Σφάλμα!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
+"Δεν έχει οριστεί λογαριασμός εξόδων για αυτό το προϊόν: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -76,13 +99,33 @@ msgid "Timesheet Line"
 msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Τα Προϊόντα του Χρήστη για αυτόν τον Αναλυτικό Λογαριασμό"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Χρήστης"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr ""
+#~ "Πίνακας Σχέσεων μεταξύ χρηστών και προϊόντων στον αναλυτικό λογαριασμό"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
 
+#~ msgid "Product"
+#~ msgstr "Προϊόν"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Τα Προϊόντα του Χρήστη για αυτόν τον Αναλυτικό Λογαριασμό"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -91,3 +134,7 @@ msgstr "Τα Προϊόντα του Χρήστη για αυτόν τον Αν�
 
 #~ msgid "Analytic User Function"
 #~ msgstr "Αναλυτική Λειτουργία Χρήστη"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Σφάλμα!"
diff --git a/addons/analytic_user_function/i18n/en_GB.po b/addons/analytic_user_function/i18n/en_GB.po
index d6c757ba977..532c4f16bc6 100644
--- a/addons/analytic_user_function/i18n/en_GB.po
+++ b/addons/analytic_user_function/i18n/en_GB.po
@@ -7,30 +7,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2012-01-23 13:22+0000\n"
 "Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Product"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -39,34 +54,43 @@ msgid "Analytic Account"
 msgstr "Analytic Account"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Users/Products Rel."
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "User"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Error !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Error! You can not create recursive analytic accounts."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "There is no expense account define for this product: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,9 +98,29 @@ msgid "Timesheet Line"
 msgstr "Timesheet Line"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "User's Product for this Analytic Account"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "User"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Relation table between users and products on a analytic account"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Error !"
+
+#~ msgid "Product"
+#~ msgstr "Product"
 
 #~ msgid ""
 #~ "\n"
@@ -111,6 +155,12 @@ msgstr "User's Product for this Analytic Account"
 #~ msgstr ""
 #~ "Error! The currency has to be the same as that of the selected company"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Error! You can not create recursive analytic accounts."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "User's Product for this Analytic Account"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analytic User Function"
 
@@ -121,3 +171,6 @@ msgstr "User's Product for this Analytic Account"
 #~ "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 characters!"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "You cannot modify an entry in a Confirmed/Done timesheet !."
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 5ff1699f2f1..08df5642b54 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-01-16 18:03+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,22 +14,37 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Producto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,35 +54,44 @@ msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Rel. usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -75,9 +99,19 @@ msgid "Timesheet Line"
 msgstr "Línea de la hoja de servicios"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Producto del usuario para esta cuenta analítica"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuario"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
@@ -88,9 +122,25 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 #~ "especial!"
 
+#~ msgid "Product"
+#~ msgstr "Producto"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Producto del usuario para esta cuenta analítica"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Función analítica de usuario"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -126,3 +176,7 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgstr ""
 #~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
 #~ "seleccionada"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "¡No puede modificar el registro de un parte de horas confirmado o realizado!"
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index 6eef431b507..7364cc28186 100644
--- a/addons/analytic_user_function/i18n/es_AR.po
+++ b/addons/analytic_user_function/i18n/es_AR.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2009-09-16 17:44+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Producto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos en una cuenta analítica"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,33 +53,42 @@ msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Relación usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
@@ -73,18 +97,41 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Producto del usuario para esta cuenta analítica"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Producto del usuario para esta cuenta analítica"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabla de relación entre usuarios y productos en una cuenta analítica"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para la definición de la vista!"
 
+#~ msgid "Product"
+#~ msgstr "Producto"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
 #~ "especial!"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Función de usuario analítico"
diff --git a/addons/analytic_user_function/i18n/es_CR.po b/addons/analytic_user_function/i18n/es_CR.po
index 5fa5633e21a..44bb3ff4a1a 100644
--- a/addons/analytic_user_function/i18n/es_CR.po
+++ b/addons/analytic_user_function/i18n/es_CR.po
@@ -6,33 +6,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2012-02-15 15:53+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@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: 2012-02-16 05:06+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 "Language: \n"
 
 #. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Producto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
-"No se puede modificar una entrada en un parte de horas Confirmado / ¡Ya "
-"está!."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -41,35 +54,44 @@ msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Rel. usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -77,9 +99,35 @@ msgid "Timesheet Line"
 msgstr "Línea de la hoja de servicios"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Producto del usuario para esta cuenta analítica"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#~ msgid "Product"
+#~ msgstr "Producto"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Producto del usuario para esta cuenta analítica"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
@@ -128,3 +176,8 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgstr ""
 #~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
 #~ "seleccionada"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "No se puede modificar una entrada en un parte de horas Confirmado / ¡Ya "
+#~ "está!."
diff --git a/addons/analytic_user_function/i18n/es_EC.po b/addons/analytic_user_function/i18n/es_EC.po
index 59ab0310382..25e4108293e 100644
--- a/addons/analytic_user_function/i18n/es_EC.po
+++ b/addons/analytic_user_function/i18n/es_EC.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-01-13 03:54+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Producto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,35 +53,44 @@ msgid "Analytic Account"
 msgstr "Cuenta analítica"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Rel. usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Error !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,9 +98,19 @@ msgid "Timesheet Line"
 msgstr "Línea hoja de servicios"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Producto del usuario para esta cuenta analítica"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuario"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML inválido para la definición de la vista!"
@@ -90,6 +124,16 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgid "Analytic User Function"
 #~ msgstr "Función analítica de usuario"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Error !"
+
+#~ msgid "Product"
+#~ msgstr "Producto"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -125,3 +169,9 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgstr ""
 #~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
 #~ "seleccionada"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Producto del usuario para esta cuenta analítica"
diff --git a/addons/analytic_user_function/i18n/es_PY.po b/addons/analytic_user_function/i18n/es_PY.po
index bfb8eb78ccb..58a7a2c8d86 100644
--- a/addons/analytic_user_function/i18n/es_PY.po
+++ b/addons/analytic_user_function/i18n/es_PY.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-03-07 23:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Producto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,35 +54,44 @@ msgid "Analytic Account"
 msgstr "Cuenta Analítica"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Rel. usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -75,9 +99,22 @@ msgid "Timesheet Line"
 msgstr "Línea hoja de servicios"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Producto del usuario para esta cuenta analítica"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#~ msgid "Product"
+#~ msgstr "Producto"
 
 #~ msgid ""
 #~ "\n"
@@ -108,11 +145,24 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ "\n"
 #~ "    "
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr ""
 #~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Producto del usuario para esta cuenta analítica"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Función analítica de usuario"
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index d13d23464c4..14aa1bb84b0 100644
--- a/addons/analytic_user_function/i18n/et.po
+++ b/addons/analytic_user_function/i18n/et.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-10-30 15:57+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Toode"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Seose tabel kasutajate ja toodete vahel analüütilisel kontol"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,33 +53,42 @@ msgid "Analytic Account"
 msgstr "Analüütiline konto"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Kasutajate/Toodete seosed"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Kasutaja"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Viga !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
@@ -73,9 +97,19 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Kasutaja tooted sellel analüütilisel kontol"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Kasutaja"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Vigane XML vaate arhitektuurile!"
@@ -85,5 +119,18 @@ msgstr "Kasutaja tooted sellel analüütilisel kontol"
 #~ msgstr ""
 #~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
+#~ msgid "Product"
+#~ msgstr "Toode"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Seose tabel kasutajate ja toodete vahel analüütilisel kontol"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Kasutaja tooted sellel analüütilisel kontol"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Viga !"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analüüsi kasutaj funktsioone"
diff --git a/addons/analytic_user_function/i18n/fa.po b/addons/analytic_user_function/i18n/fa.po
index 1d72ced83dd..0b74d6b207f 100644
--- a/addons/analytic_user_function/i18n/fa.po
+++ b/addons/analytic_user_function/i18n/fa.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-12-18 17:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,41 +54,60 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po
index 428e8f9d152..041bc179468 100644
--- a/addons/analytic_user_function/i18n/fi.po
+++ b/addons/analytic_user_function/i18n/fi.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-06-29 05:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Tuote"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Viitetaulu käyttäjien ja tuotteiden välillä analyyttisellä tilillä"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,34 +54,43 @@ msgid "Analytic Account"
 msgstr "Analyyttinen tili"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Käyttäjän/Tuotteen suhde"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Käyttäjä"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Tuotteelle ei ole määritelty kulutiliä: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Virhe !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Tuotteelle ei ole määritelty kulutiliä: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,14 +98,40 @@ msgid "Timesheet Line"
 msgstr "Tuntilistan rivi"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Käyttäjän tuote tälle analyyttiselle tilille"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Käyttäjä"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Viitetaulu käyttäjien ja tuotteiden välillä analyyttisellä tilillä"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Virhe !"
+
+#~ msgid "Product"
+#~ msgstr "Tuote"
 
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Käyttäjän tuote tälle analyyttiselle tilille"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analyyttinen käyttäjätoiminto"
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index 1a6f5864592..224cb2b632e 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -6,31 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-18 16:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-11-29 15:23+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produit"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
-"Tableau de relation entre les utilisateurs et les produits sur un compte "
-"analytique"
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -40,35 +53,44 @@ msgid "Analytic Account"
 msgstr "Compte analytique"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr "Relation Utilisateurs/Produits"
+msgstr "Relations utilisateurs/articles"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Utilisateur"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"Il n'y a pas de compte de frais défini pour ce produit : \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Erreur !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"Il n'y a pas de compte de frais défini pour cet article : \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -76,13 +98,41 @@ msgid "Timesheet Line"
 msgstr "Ligne de prestation"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Produit de l'Utilisateur pour ce Compte Analytique"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Utilisateur"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
 
+#~ msgid "Product"
+#~ msgstr "Produit"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr ""
+#~ "Tableau de relation entre les utilisateurs et les produits sur un compte "
+#~ "analytique"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Produit de l'Utilisateur pour ce Compte Analytique"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erreur !"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Fonction utilisateur analytique"
 
@@ -121,3 +171,8 @@ msgstr "Produit de l'Utilisateur pour ce Compte Analytique"
 #~ "anciennes configurations.\n"
 #~ "\n"
 #~ "    "
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Les relevés confirmés/terminés d'une feuille de temps ne peuvent plus être "
+#~ "modifiés !"
diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po
index f5d9f76eb09..a271d119b57 100644
--- a/addons/analytic_user_function/i18n/gl.po
+++ b/addons/analytic_user_function/i18n/gl.po
@@ -8,29 +8,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: analytic-user-function-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-02-11 13:07+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Producto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Táboa de relación entre usuarios e produtos nunha conta analítica"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -40,34 +55,43 @@ msgid "Analytic Account"
 msgstr "Conta analítica"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Rel. Usuarios/Produtos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Non hai conta de gastos definida pra este produto: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "¡Erro!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Erro! Non pode crear contas analíticas recorrentes."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Non hai conta de gastos definida pra este produto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -75,9 +99,19 @@ msgid "Timesheet Line"
 msgstr "Liña de parte de horas"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Produto do usuario para esta Conta Analítica"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuario"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "¡XML non válido para a definición da vista!"
@@ -88,6 +122,9 @@ msgstr "Produto do usuario para esta Conta Analítica"
 #~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
 #~ "especial!"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Táboa de relación entre usuarios e produtos nunha conta analítica"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -116,6 +153,16 @@ msgstr "Produto do usuario para esta Conta Analítica"
 #~ "\n"
 #~ "    "
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Erro!"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Produto do usuario para esta Conta Analítica"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "¡Erro! Non pode crear contas analíticas recorrentes."
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Función Analítica de Usuario"
 
@@ -123,3 +170,6 @@ msgstr "Produto do usuario para esta Conta Analítica"
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "¡Erro! A divisa ten que sela mesma ca da compañía seleccionada"
+
+#~ msgid "Product"
+#~ msgstr "Producto"
diff --git a/addons/analytic_user_function/i18n/gu.po b/addons/analytic_user_function/i18n/gu.po
new file mode 100644
index 00000000000..4babcc1290b
--- /dev/null
+++ b/addons/analytic_user_function/i18n/gu.po
@@ -0,0 +1,126 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-04-18 12:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@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: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Service"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "ભૂલ!"
+
+#~ msgid "Product"
+#~ msgstr "વસ્તુ"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "ત્રુટિ! તમે અંદરોઅંદર વિશ્લેષણાત્મક ખાતાઓ ન બનાવી શકો."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "આ વિશ્લેષક ખાતા માટે વપરાશકર્તા ઉત્પાદન"
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index 2a6adb56809..7bb66e39b81 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -6,30 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-12-08 15:51+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 "Language: hr\n"
 
 #. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Proizvod"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Veza između korisnika i proizvoda na  analitičkom kontu."
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,34 +54,43 @@ msgid "Analytic Account"
 msgstr "Analitički Konto"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "veza Korisnici/Proizvodi"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Korisnik"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "nije definiran konto troška za ovaj proizvod: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Greška !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "nije definiran konto troška za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,9 +98,22 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Proizvod  rada"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#~ msgid "Product"
+#~ msgstr "Proizvod"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nepravilan XML format za View Architecture!"
@@ -89,6 +126,19 @@ msgstr "Proizvod  rada"
 #~ msgid "Analytic User Function"
 #~ msgstr "Funkcija Analitičkog Korisnika"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Veza između korisnika i proizvoda na  analitičkom kontu."
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Greška !"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Proizvod  rada"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po
index 0b1079ce89c..310c2ff3953 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -6,30 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-02-09 13:28+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Termék"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "A gyűjtőkód felhasználók és termékek közötti kapcsolati táblája"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,34 +53,43 @@ msgid "Analytic Account"
 msgstr "Gyűjtőkód"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Felhasználó/termék kapcsolat"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Felhasználó"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "%s (kód: %d) termékre nem állítottak be beszerzés főkönyvi számlát"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Hiba!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "%s (kód: %d) termékre nem állítottak be beszerzés főkönyvi számlát"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,9 +97,22 @@ msgid "Timesheet Line"
 msgstr "Munkaidő-kimutatás sora"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "A gyűjtőkódhoz kapcsolódó felhasználó és termék"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Felhasználó"
+
+#~ msgid "Product"
+#~ msgstr "Termék"
 
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
@@ -84,6 +120,12 @@ msgstr "A gyűjtőkódhoz kapcsolódó felhasználó és termék"
 #~ msgstr ""
 #~ "Hiba! A pénznemnek meg kell egyeznie a kiválasztott vállalat pénznemével."
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "A gyűjtőkód felhasználók és termékek közötti kapcsolati táblája"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -113,3 +155,10 @@ msgstr "A gyűjtőkódhoz kapcsolódó felhasználó és termék"
 
 #~ msgid "Analytic User Function"
 #~ msgstr "Felhasználó funkciója"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Hiba!"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "A gyűjtőkódhoz kapcsolódó felhasználó és termék"
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index eb4a470dc02..7b664f73581 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produk"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabel hubungan antara pengguna dengan produk pada akun analitik"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,49 +53,77 @@ msgid "Analytic Account"
 msgstr "Akun Analisis"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Pengguna/Products Rel"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Pengguna"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Produk Pengguna untuk Akun Analitik ini"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Pengguna"
+
+#~ msgid "Product"
+#~ msgstr "Produk"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "Nama Obyek harus berawalan _x dan tidak mengandung karakter khusus !"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabel hubungan antara pengguna dengan produk pada akun analitik"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Produk Pengguna untuk Akun Analitik ini"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Fungsi Pengguna Analitik"
 
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 1d006112526..3a4c90ff4a7 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-01-12 16:48+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Prodotto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabella di collegamento tra utenti e prodotti su un conto analitico"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,35 +53,44 @@ msgid "Analytic Account"
 msgstr "Conto Analitico"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Utenti/Prodotti Rel."
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Nome utente"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"Non è stato definito alcun conto spese per questo prodotto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Errore !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"Non è stato definito alcun conto spese per questo prodotto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,9 +98,19 @@ msgid "Timesheet Line"
 msgstr "Linea del Timesheet"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Prodotto di utente per questo conto analitico"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Nome utente"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
@@ -87,9 +121,25 @@ msgstr "Prodotto di utente per questo conto analitico"
 #~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 #~ "speciali!"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabella di collegamento tra utenti e prodotti su un conto analitico"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Errore !"
+
+#~ msgid "Product"
+#~ msgstr "Prodotto"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Funzione di utente analitico"
 
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Prodotto di utente per questo conto analitico"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
diff --git a/addons/analytic_user_function/i18n/ja.po b/addons/analytic_user_function/i18n/ja.po
new file mode 100644
index 00000000000..5388571d8e2
--- /dev/null
+++ b/addons/analytic_user_function/i18n/ja.po
@@ -0,0 +1,132 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-04-08 05:16+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
+"Language-Team: Japanese <ja@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: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Service"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "ユーザ・商品の関係"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "商品 \"%s\" (id:%d) のアカウントが定義されていません。"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "タイムシートの行"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "エラー"
+
+#~ msgid "Product"
+#~ msgstr "商品"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "エラー。反復した分析アカウントを作ることはできません"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "この分析アカウントのユーザの商品"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "分析アカウントのユーザと商品の関係テーブル"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index ecaf7afcf89..1029a520074 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "상품"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "분석 계정 상의 사용자와 상품 간의 관계 테이블"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,44 +54,72 @@ msgid "Analytic Account"
 msgstr "분석 계정"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "사용자/상품 관계"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "사용자"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "이 분석 계정을 위한 사용자의 상품"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "사용자"
+
+#~ msgid "Product"
+#~ msgstr "상품"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "이 분석 계정을 위한 사용자의 상품"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "분석 계정 상의 사용자와 상품 간의 관계 테이블"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po
index 188c09e28da..e4edc02126b 100644
--- a/addons/analytic_user_function/i18n/lt.po
+++ b/addons/analytic_user_function/i18n/lt.po
@@ -6,30 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2009-09-08 16:50+0000\n"
-"Last-Translator: Giedrius Slavinskas - inovera.lt "
-"<giedrius.slavinskas@gmail.com>\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,41 +53,60 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/mk.po b/addons/analytic_user_function/i18n/mk.po
new file mode 100644
index 00000000000..99404699242
--- /dev/null
+++ b/addons/analytic_user_function/i18n/mk.po
@@ -0,0 +1,120 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-11-20 17:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Service"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Аналитичко конто"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Корисник"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Грешка !"
+
+#~ msgid "Product"
+#~ msgstr "Производ"
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 355518cc745..f9c90dfe56c 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-01-11 03:25+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Бараа"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Хэрэглэгч болон барааны аналитик дансны хамаарлын хүснэгт"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,34 +54,43 @@ msgid "Analytic Account"
 msgstr "Аналитик данс"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr "Хэрэглэгч/Бүтээгдэхүүн"
+msgstr "Хэрэглэгч/Барааны холбоо"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Хэрэглэгч"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Энэ бараанд зардлын тооцоо тодорхойлогдоогүй байна:  \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Алдаа !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Энэ бараанд зардлын тооцоо тодорхойлогдоогүй байна:  \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,13 +98,29 @@ msgid "Timesheet Line"
 msgstr "Цаг бүртгэлийн мөр"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик данс"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Хэрэглэгч болон барааны аналитик дансны хамаарлын хүснэгт"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн XML алдаатай!"
 
+#~ msgid "Product"
+#~ msgstr "Бараа"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -90,8 +130,21 @@ msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик �
 #~ msgid "Analytic User Function"
 #~ msgstr "Аналитик хэрэглэгчийн үүрэг"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Алдаа !"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr ""
 #~ "Алдаа! Мөнгөн тэмдэгт сонгогдсон компанийн мөнгөн тэмдэгттэй ижил байх ёстой."
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "Батласан/хийгдсэн бичлэгийг өөрчлөх боломжгүй !"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Хэрэглэгчийн барааны шинжилгээний данс"
diff --git a/addons/analytic_user_function/i18n/nb.po b/addons/analytic_user_function/i18n/nb.po
new file mode 100644
index 00000000000..27af82a0578
--- /dev/null
+++ b/addons/analytic_user_function/i18n/nb.po
@@ -0,0 +1,132 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-11-29 13:16+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@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: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analytisk linje."
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr "Faktura pris, vurder per bruker."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Service"
+msgstr "Tjeneste."
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Price per User"
+msgstr "Pris per bruker."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr "Pris."
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
+msgstr "Pris per time for denne brukeren."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr "Feil!"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr "Faktura data."
+
+#. module: analytic_user_function
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Brukere / Produkter rel."
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr "Måleenhet."
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Det er ingen regning definert for dette produktet: \"% s\" (id:% d)"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timelistelinje"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Forhold bordet mellom brukere og produkter på en analytisk konto."
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Feil !"
+
+#~ msgid "Product"
+#~ msgstr "Produkt"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "Du kan ikke endre en oppføring i en Bekreftet / Ferdig timeliste!."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Brukerens produkt for dette Analytisk konto"
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index 1105b900b51..b47b008217d 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -6,32 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-10 09:35+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-11-24 21:59+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Kostenplaatsboeking"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Product"
+msgid "Service"
+msgstr "Dienst"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Koppeltabel tussen gebruikers en producten op een kostenplaats"
+msgid "Price per User"
+msgstr "Prijs per gebruiker"
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr "Bedrag"
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
-"Het is niet mogelijk een bevestigde/Gereed zijnde boeking van een urenstaat "
-"te wijzigen!"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -40,45 +53,73 @@ msgid "Analytic Account"
 msgstr "Kostenplaats"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr "Fout!"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr "Facturatie gegevens"
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Gebruikers/Producten rel."
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Gebruiker"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr "Maateenheid"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
-#, python-format
-msgid "Error !"
-msgstr "Fout !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Fout! U kunt geen recursieve kostenplaatsen maken."
-
-#. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
 msgstr "Urenstaatregel"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Product van gebruiker voor deze kostenplaats"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Gebruiker"
+
+#~ msgid "Product"
+#~ msgstr "Product"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Koppeltabel tussen gebruikers en producten op een kostenplaats"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Product van gebruiker voor deze kostenplaats"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
@@ -88,12 +129,24 @@ msgstr "Product van gebruiker voor deze kostenplaats"
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fout !"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analytische gebruikers funktie"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Fout! U kunt geen recursieve kostenplaatsen maken."
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr ""
 #~ "Fout! De munteenheid moet hetzelfde zijn als de munteenheid van het "
 #~ "geselecteerde bedrijf"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Het is niet mogelijk een bevestigde/Gereed zijnde boeking van een urenstaat "
+#~ "te wijzigen!"
diff --git a/addons/analytic_user_function/i18n/nl_BE.po b/addons/analytic_user_function/i18n/nl_BE.po
index 979cef10b2c..cac5a110ba9 100644
--- a/addons/analytic_user_function/i18n/nl_BE.po
+++ b/addons/analytic_user_function/i18n/nl_BE.po
@@ -1,63 +1,139 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_user_function
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:34:14+0000\n"
-"PO-Revision-Date: 2009-08-28 15:34:14+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-10-02 07:35+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
+msgstr "Analytische rekening"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Rel. gebruikers/producten"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
-msgid "User"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
+"Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
-msgid "User's Product for this Analytic Account"
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Uurroosterlijn"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Gebruiker"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr ""
+#~ "Relatietabel tussen gebruikers en producten van een analytische rekening"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fout"
+
+#~ msgid "Product"
+#~ msgstr "Product"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "U kunt niet dezelfde analytische rekeningen maken."
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "In een bevestigde/afgesloten uurrooster kunt u geen regels wijzigen."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Product van gebruiker voor deze analytische rekening"
diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po
index 1c3e775bfa0..fab1ca6342f 100644
--- a/addons/analytic_user_function/i18n/oc.po
+++ b/addons/analytic_user_function/i18n/oc.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produch"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,44 +54,66 @@ msgid "Analytic Account"
 msgstr "Compte Analitic"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Relacion Utilizaires/Produches"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Utilizaire"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Produch de l'Utilizaire per aqueste Compte Analitic"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Utilizaire"
+
+#~ msgid "Product"
+#~ msgstr "Produch"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid per l'arquitectura de la vista"
@@ -86,3 +123,6 @@ msgstr "Produch de l'Utilizaire per aqueste Compte Analitic"
 #~ msgstr ""
 #~ "Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
 #~ "especials !"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Produch de l'Utilizaire per aqueste Compte Analitic"
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index dedc08db4a5..f8222036302 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-01-02 01:26+0000\n"
 "Last-Translator: Jarosław Ogrodnik <nobodythere@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,33 +53,42 @@ msgid "Analytic Account"
 msgstr "Konto analityczne"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
-#: field:account.analytic.account,user_product_ids:0
-msgid "Users/Products Rel."
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Użytkownik"
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
-#, python-format
-msgid "Error !"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
@@ -73,10 +97,20 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 
@@ -85,3 +119,10 @@ msgstr ""
 #~ msgstr ""
 #~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
 #~ "specjalnych !"
+
+#~ msgid "Product"
+#~ msgstr "Produkt"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Błąd !"
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index 860bd64f7c8..6624a55cb8d 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -6,30 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-12-04 09:29+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
-"Tabela da Relação entre utilizadores e produtos em uma Conta Analítica"
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,49 +53,72 @@ msgid "Analytic Account"
 msgstr "Conta Analítica"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr "Utilizadores/Relação de Produtos"
+msgstr "Utilizadores/Relação de Artigos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Utilizador"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"Não há qualquer conta de despesas definida para o produto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Erro !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Não pode criar contas analíticas recursivamente"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"Não há qualquer conta de despesas definida para o artigo: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linha de folha de horas"
+msgstr "Linha da Folha de Horas"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Produto do Utilizador para esta Conta Analítica"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Utilizador"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML Inválido para a Arquitectura de Vista !"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro !"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -90,3 +127,19 @@ msgstr "Produto do Utilizador para esta Conta Analítica"
 
 #~ msgid "Analytic User Function"
 #~ msgstr "Função do Utilizador Analítico"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Não pode modificar uma entrada num folha de horas Confirmada / Concluída!."
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabela da Relação entre utilizadores e artigos numa Conta Analítica"
+
+#~ msgid "Product"
+#~ msgstr "Artigo"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Erro! Não pode criar contas analíticas recursivas."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Artigo do Utilizador para esta Conta Analítica"
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index 405617cc8eb..8a77d1d48df 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -6,29 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-13 21:15+0000\n"
-"Last-Translator: Joe Pimentel <joe.b.pimentel@gmail.com>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-07-28 16:30+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produto"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabela da relação entre usuários e produtos em uma conta analítica"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,44 +54,63 @@ msgid "Analytic Account"
 msgstr "Conta Analítica"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Rel. Usuários/Produtos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Usuário"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Não há conta de despesa definida para este produto:%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Erro!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Você não pode criar contas analíticas recursivas"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Não há conta de despesa definida para este produto:%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linha de Apontamento de Horas"
+msgstr "Linha da Planilha de Horas"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Produto de Usuário para esta Conta Analítica"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuário"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
@@ -86,11 +121,27 @@ msgstr "Produto de Usuário para esta Conta Analítica"
 #~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
 #~ "especial!"
 
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Produto de Usuário para esta Conta Analítica"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabela da relação entre usuários e produtos em uma conta analítica"
+
+#~ msgid "Product"
+#~ msgstr "Produto"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro!"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "Erro! A moeda deve ser a mesma da empresa selecionada"
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Erro! Você não pode criar contas analíticas recursivas"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Função do Usuário Analista"
 
@@ -121,3 +172,7 @@ msgstr "Produto de Usuário para esta Conta Analítica"
 #~ "é perfeitamente compatível com as configurações antigas.\n"
 #~ "\n"
 #~ "    "
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Você não pode modificar uma entrada que está como Confirmada/Concluída"
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index 3a7c4495f45..f055349a5a4 100644
--- a/addons/analytic_user_function/i18n/ro.po
+++ b/addons/analytic_user_function/i18n/ro.po
@@ -6,78 +6,114 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-08-03 02:56+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produs"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
-"Tabel de relaţii între utilizatori  şi produsele dintrun cont analitic"
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Cont analitic"
+msgstr "Cont Analitic"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr "Rel. utilizatori/produse"
+msgstr "Rel. Utilizatori/Produse"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Utilizator"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "Nu exista un cont de cheltuieli definit pentru acest produs: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
-#, python-format
-msgid "Error !"
-msgstr "Eroare !"
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Linie Fisa de pontaj"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Eroare! Nu puteti crea conturi analitice recursive."
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linie foaie de pontaj"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Utilizator"
 
-#. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Produsul utilizatorului pentru acest cont analitic"
+#~ msgid "Product"
+#~ msgstr "Produs"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
@@ -91,6 +127,10 @@ msgstr "Produsul utilizatorului pentru acest cont analitic"
 #~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
 #~ "special !"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Eroare !"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -119,8 +159,23 @@ msgstr "Produsul utilizatorului pentru acest cont analitic"
 #~ "\n"
 #~ "    "
 
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Eroare! Nu puteti crea conturi analitice recursive."
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr ""
 #~ "Eroare! Moneda trebuie sa fie aceeasi ca si moneda companiei selectate"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr ""
+#~ "Tabel de relatii intre utilizatori si produsele dintr-un cont analitic"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Nu puteti modifica o inregistrare dintr-o fisa de pontaj "
+#~ "Confirmata/Efectuata !."
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Produsul Utilizatorului pentru acest Cont Analitic"
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index b6373a8f1a4..4a48c5f009c 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-04-16 13:24+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Продукт"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Таблица связи между пользователем и продуктом для счёта аналитики"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,34 +53,43 @@ msgid "Analytic Account"
 msgstr "Счет аналитического учета"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Пользователь/Свяь в продукцией"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Пользователь"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Ошибка !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Ошибка! Вы не можете создавать рекурсивные аналитический счета."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -73,9 +97,19 @@ msgid "Timesheet Line"
 msgstr "Строка табеля"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Продуктв пользователей для счета аналитики"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Пользователь"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
@@ -86,9 +120,25 @@ msgstr "Продуктв пользователей для счета анали
 #~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
 #~ "символов !"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Таблица связи между пользователем и продуктом для счёта аналитики"
+
+#~ msgid "Product"
+#~ msgstr "Продукт"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Пользовательская функция аналитики"
 
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Продуктв пользователей для счета аналитики"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Ошибка !"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Ошибка! Вы не можете создавать рекурсивные аналитический счета."
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index 42cb5e1fd5d..d773065897c 100644
--- a/addons/analytic_user_function/i18n/sk.po
+++ b/addons/analytic_user_function/i18n/sk.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-08-03 02:57+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produkt"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,33 +54,42 @@ msgid "Analytic Account"
 msgstr "Analytický účet"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
-#: field:account.analytic.account,user_product_ids:0
-msgid "Users/Products Rel."
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Užívateľ"
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
-#, python-format
-msgid "Error !"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
@@ -74,10 +98,23 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Užívateľ"
+
+#~ msgid "Product"
+#~ msgstr "Produkt"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index 99e0e564187..20d20f33b52 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-12-16 18:01+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Izdelek"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabela odnosov med uporabniki in produkti na analitičnem kontu"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,34 +53,43 @@ msgid "Analytic Account"
 msgstr "Analitični konto"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Odnos Uporabniki/Produkti"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Uporabnik"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Ni definiranega konta stroškov za ta izdelek: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Napaka!"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Ni definiranega konta stroškov za ta izdelek: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -73,9 +97,19 @@ msgid "Timesheet Line"
 msgstr "Postavka časovnice"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Uporabniški proizvodi za ta analitični konto"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Uporabnik"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
@@ -85,9 +119,25 @@ msgstr "Uporabniški proizvodi za ta analitični konto"
 #~ msgstr ""
 #~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Napaka!"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Tabela odnosov med uporabniki in produkti na analitičnem kontu"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analitična uporabniška funkcija"
 
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Uporabniški proizvodi za ta analitični konto"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
+
+#~ msgid "Product"
+#~ msgstr "Izdelek"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
diff --git a/addons/analytic_user_function/i18n/sq.po b/addons/analytic_user_function/i18n/sq.po
index 29b16c64a8e..ca73ff6b69f 100644
--- a/addons/analytic_user_function/i18n/sq.po
+++ b/addons/analytic_user_function/i18n/sq.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,41 +54,60 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
index a919f617f8a..e647d08dc55 100644
--- a/addons/analytic_user_function/i18n/sr.po
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-10-27 08:09+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Proizvod"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,33 +54,42 @@ msgid "Analytic Account"
 msgstr "Analitički konto"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Korisnik/Proizvod Relac."
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Korisnik"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Greška !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
@@ -74,13 +98,32 @@ msgid "Timesheet Line"
 msgstr "Niz Kontrolne kartice"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
+#~ msgid "Product"
+#~ msgstr "Proizvod"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Korisnicka Funkcija Analitike"
 
@@ -88,3 +131,7 @@ msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Greška !"
diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index e0226c171af..8a41a96f672 100644
--- a/addons/analytic_user_function/i18n/sr@latin.po
+++ b/addons/analytic_user_function/i18n/sr@latin.po
@@ -7,31 +7,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2011-12-27 15:49+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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Proizvod"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relaciona tabela između korisnika i proizvoda u analitičkom kontu"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
-"Ne možete izmeniti unos u tabelama obeleženim kao Potvrđenim/Završenim"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -40,35 +54,44 @@ msgid "Analytic Account"
 msgstr "Analitički konto"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Korisnik/Proizvod Odnos"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Korisnik"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
-"Nema dodatnih troškova za nalog određenog za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Greška !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"Nema dodatnih troškova za nalog određenog za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -76,9 +99,26 @@ msgid "Timesheet Line"
 msgstr "Niz kontrolne kartice"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Korisnički proizvod za ovaj Analitički Konto"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Greška !"
+
+#~ msgid "Product"
+#~ msgstr "Proizvod"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
@@ -91,7 +131,20 @@ msgstr "Korisnički proizvod za ovaj Analitički Konto"
 #~ msgid "Analytic User Function"
 #~ msgstr "Korisnicka Funkcija Analitike"
 
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Relaciona tabela između korisnika i proizvoda u analitičkom kontu"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Ne možete izmeniti unos u tabelama obeleženim kao Potvrđenim/Završenim"
+
 #~ msgid ""
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Korisnički proizvod za ovaj Analitički Konto"
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index 69486b21c7f..0930fa08a51 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -6,81 +6,134 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-11-23 09:44+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Produkt"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Objekt"
+msgstr "Objektkonto"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Användare/produkt relation"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Användare"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
-#, python-format
-msgid "Error !"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Utgiftskonto saknas för denna produkt: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
+msgstr "Tidrapportrad"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Användarens produkt för detta objekt"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Användare"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
+#~ msgid "Product"
+#~ msgstr "Produkt"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Användarens produkt för detta objekt"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analytic User Function"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fel !"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Fel! Du kan inte skapa rekursiva objekt."
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "Du kan inte ändra en post i en bekräftad/färdig tidrapport !"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "Relationstabell mellan användare och produkter för ett objektkonto"
diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po
index 1e523eb5863..f2ba26158d2 100644
--- a/addons/analytic_user_function/i18n/tlh.po
+++ b/addons/analytic_user_function/i18n/tlh.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,41 +53,60 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index fa360c75d5a..fb4d3f33834 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -6,31 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2012-01-10 23:17+0000\n"
 "Last-Translator: Ahmet Altınışık <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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Ürün"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "İlişkili tablo analitik hesapta kullanıcılar ve ürün arasında"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
-"Onaylandı/Tamanlandı durumundaki zaman çizelgesini değiştiremezsiniz !."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -39,34 +53,43 @@ msgid "Analytic Account"
 msgstr "Analiz Hesabı"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Kullanıcı/Ürün İlşk."
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Kullanıcı"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "Bu ürün için tanımlı gider hesabı yok: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Hata !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Bu ürün için tanımlı gider hesabı yok: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,13 +97,36 @@ msgid "Timesheet Line"
 msgstr "Mesai Kartı Satırı"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "Bu Analitik Hesap İçin Kullanıcının Ürünü"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Kullanıcı"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Hata !"
+
+#~ msgid "Product"
+#~ msgstr "Ürün"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "İlişkili tablo analitik hesapta kullanıcılar ve ürün arasında"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "Bu Analitik Hesap İçin Kullanıcının Ürünü"
+
 #~ msgid "Analytic User Function"
 #~ msgstr "Analitik Kullanıcı Fonksiyonu"
 
@@ -119,3 +165,10 @@ msgstr "Bu Analitik Hesap İçin Kullanıcının Ürünü"
 #~ "ne mükemmel bir uyum içinde olduğunu gösterir.\n"
 #~ "\n"
 #~ "    "
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız."
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr ""
+#~ "Onaylandı/Tamanlandı durumundaki zaman çizelgesini değiştiremezsiniz !."
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 3af37f3a3ca..424d80cd42e 100644
--- a/addons/analytic_user_function/i18n/uk.po
+++ b/addons/analytic_user_function/i18n/uk.po
@@ -6,29 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -38,43 +53,62 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
 msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
diff --git a/addons/analytic_user_function/i18n/vi.po b/addons/analytic_user_function/i18n/vi.po
index d23f9a1d1e8..ac92764f85a 100644
--- a/addons/analytic_user_function/i18n/vi.po
+++ b/addons/analytic_user_function/i18n/vi.po
@@ -7,29 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "Sản phẩm"
+msgid "Service"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
@@ -39,34 +54,43 @@ msgid "Analytic Account"
 msgstr "Tài khoản KTQT"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "Liên kết Người sử dụng/Sản phẩm"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "Người sử dụng"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "Lỗi !"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Lỗi! Bạn không thể tạo các tài khoản phân tích đệ quy."
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -74,6 +98,26 @@ msgid "Timesheet Line"
 msgstr "Dòng chấm công"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Người sử dụng"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Lỗi !"
+
+#~ msgid "Product"
+#~ msgstr "Sản phẩm"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Lỗi! Bạn không thể tạo các tài khoản phân tích đệ quy."
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 82e41abc584..ed402f1806b 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -6,30 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 03:46+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-11-29 14:18+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "辅助核算明细"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr "每用户的开票单价"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
-msgstr "产品"
+msgid "Service"
+msgstr "服务"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "用在有关系的用户和产品的辅助核算项"
+msgid "Price per User"
+msgstr "每用户价格"
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "已经确认和完成的计工单行不能修改！"
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
+msgstr "价格"
+
+#. module: analytic_user_function
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
+msgstr "用户每小时价格"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -38,34 +53,43 @@ msgid "Analytic Account"
 msgstr "辅助核算项"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
+msgstr "错误!"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
+msgstr "发票数据"
+
+#. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
 msgstr "用户/相关产品"
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
-msgstr "用户"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
+msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr "此产品 \"%s\" （id：%d）没有定义辅助核算项"
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
+msgstr "计量单位"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
 #, python-format
-msgid "Error !"
-msgstr "错误！"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "错误! 你不能创建递归的辅助核算项"
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "此产品 \"%s\" （id：%d）没有定义辅助核算项"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
@@ -73,9 +97,29 @@ msgid "Timesheet Line"
 msgstr "计工单明细"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
-msgstr "用户产品的辅助核算项"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "用户"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "错误！"
+
+#~ msgid "Product"
+#~ msgstr "产品"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "用在有关系的用户和产品的辅助核算项"
 
 #~ msgid "Analytic User Function"
 #~ msgstr "辅助核算用的函数"
@@ -112,3 +156,12 @@ msgstr "用户产品的辅助核算项"
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "错误！此币别必须是选定公司的默认币别。"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "错误! 你不能创建递归的辅助核算项"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "用户产品的辅助核算项"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "已经确认和完成的计工单行不能修改！"
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index d0300e2ff7b..28255a7ee1a 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/i18n/zh_TW.po
@@ -6,73 +6,126 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-23 16:16+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-08-20 03:00+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.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: 2012-02-09 06:47+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
+"X-Generator: Launchpad (build 16335)\n"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+msgid "Invoice Price Rate per User"
+msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
-msgid "Product"
+msgid "Service"
 msgstr ""
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+msgid "Price per User"
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,price:0
+msgid "Price"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#: help:analytic.user.funct.grid,price:0
+msgid "Price per hour for this user."
 msgstr ""
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: analytic_user_function
-#: view:account.analytic.account:0
-#: field:account.analytic.account,user_product_ids:0
-msgid "Users/Products Rel."
+#: code:addons/analytic_user_function/analytic_user_function.py:106
+#: code:addons/analytic_user_function/analytic_user_function.py:135
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic.user.funct.grid,user_id:0
-msgid "User"
+#: view:analytic.user.funct.grid:0
+msgid "Invoicing Data"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "使用者/產品 關聯"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:95
-#: code:addons/analytic_user_function/analytic_user_function.py:130
-#, python-format
-msgid "Error !"
+#: view:account.analytic.account:0
+msgid ""
+"Define a specific service (e.g. Senior Consultant)\n"
+"                            and price for some users to use these data "
+"instead\n"
+"                            of the default values when invoicing the "
+"customer."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: field:analytic.user.funct.grid,uom_id:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:107
+#: code:addons/analytic_user_function/analytic_user_function.py:136
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "此產品未定義費用科目: \"%s\" (id:%d)"
+
+#. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "工時表明細"
 
 #. module: analytic_user_function
-#: view:analytic.user.funct.grid:0
-msgid "User's Product for this Analytic Account"
+#: view:account.analytic.account:0
+msgid ""
+"OpenERP will recursively search on parent accounts\n"
+"                            to check if specific conditions are defined for "
+"a\n"
+"                            specific user. This allows to set invoicing\n"
+"                            conditions for a group of contracts."
 msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#~ msgid "Relation table between users and products on a analytic account"
+#~ msgstr "使用者及產品在核助核算項目的關聯資料表"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "錯誤！"
+
+#~ msgid "Product"
+#~ msgstr "產品"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "錯誤! 你不能建立遞歸的輔助核算項目"
+
+#~ msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+#~ msgstr "你不可修改一個已確認/完成的工時表記錄！"
+
+#~ msgid "User's Product for this Analytic Account"
+#~ msgstr "此輔助核算項目的使用者產品"
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv
index fe48e329aea..e97dc28bca7 100644
--- a/addons/analytic_user_function/security/ir.model.access.csv
+++ b/addons/analytic_user_function/security/ir.model.access.csv
@@ -4,3 +4,4 @@ access_analytic_user_funct_manager,analytic user funct manager,model_analytic_us
 access_analytic_user_funct_account_manager,analytic user funct account manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1

 access_analytic_user_funct_grid_hr_user,analytic user funct grid hr user,model_analytic_user_funct_grid,base.group_hr_user,1,0,0,0

 access_analytic_user_funct_grid_hr_manager,analytic user funct grid hr manager,model_analytic_user_funct_grid,base.group_hr_manager,1,1,1,1

+access_analytic_user_funct_grid_all,analytic user funct grid,model_analytic_user_funct_grid,base.group_user,1,0,0,0