diff options
| author | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-10-30 12:49:35 +0530 |
|---|---|---|
| committer | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2012-10-30 12:49:35 +0530 |
| commit | e8e3438b8501b69f14d682e69c069d90b8d34053 (patch) | |
| tree | 9101c8ae7b6880f4bca4f6ae4fd1901d64508bd2 /addons/analytic_user_function | |
| parent | 5735b6843188349353e136b44bdc02ab1d55336f (diff) | |
| parent | 87d3caa50f8598eda05b1638edf46491ef01d27a (diff) | |
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20121030071935-76vxkolncxzwa8z1
Diffstat (limited to 'addons/analytic_user_function')
51 files changed, 164 insertions, 136 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 9233845f7eb..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): @@ -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: @@ -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 6fa141f480d..490b3026d7f 100644 --- a/addons/analytic_user_function/analytic_user_function_view.xml +++ b/addons/analytic_user_function/analytic_user_function_view.xml @@ -7,9 +7,11 @@ <field name="name">analytic_user_funct_grid.tree</field> <field name="model">analytic.user.funct.grid</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,9 +20,13 @@ <field name="name">analytic_user_funct_grid.form</field> <field name="model">analytic.user.funct.grid</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> @@ -29,13 +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 eval="60" name="priority"/> <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> <field name="arch" type="xml"> - <xpath expr="//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> diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po index d251f888092..f656162013d 100644 --- a/addons/analytic_user_function/i18n/ar.po +++ b/addons/analytic_user_function/i18n/ar.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po index 4c9a22b68ef..02b8ce0b521 100644 --- a/addons/analytic_user_function/i18n/bg.po +++ b/addons/analytic_user_function/i18n/bg.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po index 300d1b9a728..d7717c2b3ab 100644 --- a/addons/analytic_user_function/i18n/bs.po +++ b/addons/analytic_user_function/i18n/bs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po index 5f28555a7d3..14fa73f7f23 100644 --- a/addons/analytic_user_function/i18n/ca.po +++ b/addons/analytic_user_function/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po index 3a6c6288e07..1294b8cb7c4 100644 --- a/addons/analytic_user_function/i18n/cs.po +++ b/addons/analytic_user_function/i18n/cs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/da.po b/addons/analytic_user_function/i18n/da.po index d151dfcc79a..742ffa3a947 100644 --- a/addons/analytic_user_function/i18n/da.po +++ b/addons/analytic_user_function/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po index 007ecea8d5e..0d2774baeaf 100644 --- a/addons/analytic_user_function/i18n/de.po +++ b/addons/analytic_user_function/i18n/de.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po index 50301d8be4c..93dd69e562f 100644 --- a/addons/analytic_user_function/i18n/el.po +++ b/addons/analytic_user_function/i18n/el.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/en_GB.po b/addons/analytic_user_function/i18n/en_GB.po index 28c540f8036..060f9f2971d 100644 --- a/addons/analytic_user_function/i18n/en_GB.po +++ b/addons/analytic_user_function/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po index 81c4a9a1c2a..327168c58f4 100644 --- a/addons/analytic_user_function/i18n/es.po +++ b/addons/analytic_user_function/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po index 1f6b615e005..aa0c13c9dca 100644 --- a/addons/analytic_user_function/i18n/es_AR.po +++ b/addons/analytic_user_function/i18n/es_AR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/es_CR.po b/addons/analytic_user_function/i18n/es_CR.po index c76b5076091..635ae7281fd 100644 --- a/addons/analytic_user_function/i18n/es_CR.po +++ b/addons/analytic_user_function/i18n/es_CR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" "Language: \n" #. module: analytic_user_function diff --git a/addons/analytic_user_function/i18n/es_EC.po b/addons/analytic_user_function/i18n/es_EC.po index 18b93c9c19f..cff6373adc1 100644 --- a/addons/analytic_user_function/i18n/es_EC.po +++ b/addons/analytic_user_function/i18n/es_EC.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/es_PY.po b/addons/analytic_user_function/i18n/es_PY.po index 5a1536ce192..a0db1f4918a 100644 --- a/addons/analytic_user_function/i18n/es_PY.po +++ b/addons/analytic_user_function/i18n/es_PY.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po index 3d16f93d9e0..7f92bae1dab 100644 --- a/addons/analytic_user_function/i18n/et.po +++ b/addons/analytic_user_function/i18n/et.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/fa.po b/addons/analytic_user_function/i18n/fa.po index f1bb2090653..e5ec9551f31 100644 --- a/addons/analytic_user_function/i18n/fa.po +++ b/addons/analytic_user_function/i18n/fa.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po index 8470aaceaad..c1a6c0c8eb5 100644 --- a/addons/analytic_user_function/i18n/fi.po +++ b/addons/analytic_user_function/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po index 2bbb31c75d5..8cb870411af 100644 --- a/addons/analytic_user_function/i18n/fr.po +++ b/addons/analytic_user_function/i18n/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po index c71c39607d7..9092351be34 100644 --- a/addons/analytic_user_function/i18n/gl.po +++ b/addons/analytic_user_function/i18n/gl.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/gu.po b/addons/analytic_user_function/i18n/gu.po index d21aaeb8e23..281b7483cf6 100644 --- a/addons/analytic_user_function/i18n/gu.po +++ b/addons/analytic_user_function/i18n/gu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po index 252a8a77420..362a68d52b2 100644 --- a/addons/analytic_user_function/i18n/hr.po +++ b/addons/analytic_user_function/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" "Language: hr\n" #. module: analytic_user_function diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po index fbb7834355a..bfcb2a545ad 100644 --- a/addons/analytic_user_function/i18n/hu.po +++ b/addons/analytic_user_function/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po index de39733e135..7c2546e4484 100644 --- a/addons/analytic_user_function/i18n/id.po +++ b/addons/analytic_user_function/i18n/id.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po index 2b8692597b5..9e2a76e0e76 100644 --- a/addons/analytic_user_function/i18n/it.po +++ b/addons/analytic_user_function/i18n/it.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/ja.po b/addons/analytic_user_function/i18n/ja.po index fdf0b81b605..296acd1de1a 100644 --- a/addons/analytic_user_function/i18n/ja.po +++ b/addons/analytic_user_function/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po index 99600d588ad..07ce8c8b3d5 100644 --- a/addons/analytic_user_function/i18n/ko.po +++ b/addons/analytic_user_function/i18n/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po index 90ab912925f..c8d53248898 100644 --- a/addons/analytic_user_function/i18n/lt.po +++ b/addons/analytic_user_function/i18n/lt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po index 1e843a2c436..b6f435f56c2 100644 --- a/addons/analytic_user_function/i18n/mn.po +++ b/addons/analytic_user_function/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/nb.po b/addons/analytic_user_function/i18n/nb.po index 7bde01e230b..dbc40c1eaa3 100644 --- a/addons/analytic_user_function/i18n/nb.po +++ b/addons/analytic_user_function/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po index 303c206d55c..0138c103179 100644 --- a/addons/analytic_user_function/i18n/nl.po +++ b/addons/analytic_user_function/i18n/nl.po @@ -8,13 +8,13 @@ msgstr "" "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" +"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-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/nl_BE.po b/addons/analytic_user_function/i18n/nl_BE.po index 04943a48f1d..38231af6a66 100644 --- a/addons/analytic_user_function/i18n/nl_BE.po +++ b/addons/analytic_user_function/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-03 05:09+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po index 38f59eb6594..1d42339824f 100644 --- a/addons/analytic_user_function/i18n/oc.po +++ b/addons/analytic_user_function/i18n/oc.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po index da0572234c7..2432993af65 100644 --- a/addons/analytic_user_function/i18n/pl.po +++ b/addons/analytic_user_function/i18n/pl.po @@ -13,13 +13,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 msgid "Product" -msgstr "" +msgstr "Produkt" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid @@ -60,7 +60,7 @@ msgstr "" #: code:addons/analytic_user_function/analytic_user_function.py:130 #, python-format msgid "Error !" -msgstr "" +msgstr "Błąd !" #. module: analytic_user_function #: constraint:account.analytic.account:0 diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po index 7a239c89357..b5dc16d6a23 100644 --- a/addons/analytic_user_function/i18n/pt.po +++ b/addons/analytic_user_function/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po index 0613e83e526..1160aaa38cc 100644 --- a/addons/analytic_user_function/i18n/pt_BR.po +++ b/addons/analytic_user_function/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 @@ -72,7 +72,7 @@ msgstr "Erro! Você não pode criar contas analíticas recursivas" #. 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 diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po index e24ab6757e9..63b1b2abbf1 100644 --- a/addons/analytic_user_function/i18n/ro.po +++ b/addons/analytic_user_function/i18n/ro.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po index a07a47ab0f5..8e93d6a5a98 100644 --- a/addons/analytic_user_function/i18n/ru.po +++ b/addons/analytic_user_function/i18n/ru.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po index 30fbc04e165..90911d1ddb5 100644 --- a/addons/analytic_user_function/i18n/sk.po +++ b/addons/analytic_user_function/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po index 4e3cd47b64f..ce2c342cd7d 100644 --- a/addons/analytic_user_function/i18n/sl.po +++ b/addons/analytic_user_function/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/sq.po b/addons/analytic_user_function/i18n/sq.po index d268f8a71b9..0bde0079110 100644 --- a/addons/analytic_user_function/i18n/sq.po +++ b/addons/analytic_user_function/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po index b4b60497f26..7ee8869d5b4 100644 --- a/addons/analytic_user_function/i18n/sr.po +++ b/addons/analytic_user_function/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po index 611e0f1fa7f..c47e4d70cf9 100644 --- a/addons/analytic_user_function/i18n/sr@latin.po +++ b/addons/analytic_user_function/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po index f280564f26f..e750a485800 100644 --- a/addons/analytic_user_function/i18n/sv.po +++ b/addons/analytic_user_function/i18n/sv.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po index 28939868ced..33985023674 100644 --- a/addons/analytic_user_function/i18n/tlh.po +++ b/addons/analytic_user_function/i18n/tlh.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po index 039495d5415..768f57f0c0b 100644 --- a/addons/analytic_user_function/i18n/tr.po +++ b/addons/analytic_user_function/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po index 5799e9bdd8f..236e1796c8b 100644 --- a/addons/analytic_user_function/i18n/uk.po +++ b/addons/analytic_user_function/i18n/uk.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/vi.po b/addons/analytic_user_function/i18n/vi.po index 214ad512369..2be9312edc7 100644 --- a/addons/analytic_user_function/i18n/vi.po +++ b/addons/analytic_user_function/i18n/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po index 3e30aaa18dc..4418d1a3813 100644 --- a/addons/analytic_user_function/i18n/zh_CN.po +++ b/addons/analytic_user_function/i18n/zh_CN.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po index 7ffee376498..bf5030632c0 100644 --- a/addons/analytic_user_function/i18n/zh_TW.po +++ b/addons/analytic_user_function/i18n/zh_TW.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:27+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n" +"X-Generator: Launchpad (build 16206)\n" #. module: analytic_user_function #: field:analytic.user.funct.grid,product_id:0 |
