summaryrefslogtreecommitdiff
path: root/addons/hr_expense
diff options
context:
space:
mode:
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>2011-09-16 11:11:38 +0530
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>2011-09-16 11:11:38 +0530
commitd979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch)
tree592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/hr_expense
parenteea80125f7d1c739260929fb1f38866ef21439e1 (diff)
parentd101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff)
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
Diffstat (limited to 'addons/hr_expense')
-rw-r--r--addons/hr_expense/__init__.py4
-rw-r--r--addons/hr_expense/__openerp__.py5
-rw-r--r--addons/hr_expense/hr_expense.py17
-rw-r--r--addons/hr_expense/hr_expense_data.xml25
-rw-r--r--addons/hr_expense/hr_expense_demo.xml12
-rw-r--r--addons/hr_expense/hr_expense_installer_view.xml35
-rw-r--r--addons/hr_expense/hr_expense_view.xml4
-rw-r--r--addons/hr_expense/i18n/ar.po11
-rw-r--r--addons/hr_expense/i18n/bg.po11
-rw-r--r--addons/hr_expense/i18n/bs.po11
-rw-r--r--addons/hr_expense/i18n/ca.po113
-rw-r--r--addons/hr_expense/i18n/cs.po11
-rw-r--r--addons/hr_expense/i18n/de.po49
-rw-r--r--addons/hr_expense/i18n/el.po11
-rw-r--r--addons/hr_expense/i18n/es.po15
-rw-r--r--addons/hr_expense/i18n/es_AR.po11
-rw-r--r--addons/hr_expense/i18n/es_EC.po11
-rw-r--r--addons/hr_expense/i18n/et.po11
-rw-r--r--addons/hr_expense/i18n/fi.po11
-rw-r--r--addons/hr_expense/i18n/fr.po39
-rw-r--r--addons/hr_expense/i18n/hr.po11
-rw-r--r--addons/hr_expense/i18n/hu.po14
-rw-r--r--addons/hr_expense/i18n/id.po11
-rw-r--r--addons/hr_expense/i18n/it.po44
-rw-r--r--addons/hr_expense/i18n/ko.po11
-rw-r--r--addons/hr_expense/i18n/lt.po11
-rw-r--r--addons/hr_expense/i18n/lv.po11
-rw-r--r--addons/hr_expense/i18n/mn.po33
-rw-r--r--addons/hr_expense/i18n/nl.po44
-rw-r--r--addons/hr_expense/i18n/nl_BE.po11
-rw-r--r--addons/hr_expense/i18n/pl.po11
-rw-r--r--addons/hr_expense/i18n/pt.po56
-rw-r--r--addons/hr_expense/i18n/pt_BR.po11
-rw-r--r--addons/hr_expense/i18n/ro.po29
-rw-r--r--addons/hr_expense/i18n/ru.po11
-rw-r--r--addons/hr_expense/i18n/sl.po11
-rw-r--r--addons/hr_expense/i18n/sq.po11
-rw-r--r--addons/hr_expense/i18n/sr.po11
-rw-r--r--addons/hr_expense/i18n/sr@latin.po11
-rw-r--r--addons/hr_expense/i18n/sv.po11
-rw-r--r--addons/hr_expense/i18n/tlh.po11
-rw-r--r--addons/hr_expense/i18n/tr.po11
-rw-r--r--addons/hr_expense/i18n/uk.po11
-rw-r--r--addons/hr_expense/i18n/vi.po11
-rw-r--r--addons/hr_expense/i18n/zh_CN.po238
-rw-r--r--addons/hr_expense/i18n/zh_TW.po11
-rw-r--r--addons/hr_expense/report/hr_expense_report_view.xml2
47 files changed, 506 insertions, 580 deletions
diff --git a/addons/hr_expense/__init__.py b/addons/hr_expense/__init__.py
index 06f78648101..55a87f95400 100644
--- a/addons/hr_expense/__init__.py
+++ b/addons/hr_expense/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 95d2b60300b..09352fcfa89 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -24,6 +24,7 @@
'name': 'Human Resources Expenses Tracking',
'version': '1.0',
'category': 'Human Resources',
+ 'complexity': "easy",
'description': """
This module aims to manage employee's expenses.
===============================================
@@ -46,6 +47,7 @@ re-invoice your customer's expenses if your work by project.
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
+ 'hr_expense_data.xml',
'hr_expense_sequence.xml',
'hr_expense_workflow.xml',
'hr_expense_view.xml',
@@ -54,7 +56,8 @@ re-invoice your customer's expenses if your work by project.
'security/ir_rule.xml',
'report/hr_expense_report_view.xml',
'board_hr_expense_view.xml',
- 'board_hr_expense_manager_view.xml'
+ 'board_hr_expense_manager_view.xml',
+ 'hr_expense_installer_view.xml',
],
'demo_xml': [
'hr_expense_demo.xml',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 2e7020306b5..68d607b0335 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -24,6 +24,7 @@ import time
from osv import fields, osv
from tools.translate import _
import decimal_precision as dp
+import netsvc
def _employee_get(obj, cr, uid, context=None):
if context is None:
@@ -70,7 +71,7 @@ class hr_expense_expense(osv.osv):
'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
'note': fields.text('Note'),
- 'amount': fields.function(_amount, method=True, string='Total Amount'),
+ 'amount': fields.function(_amount, string='Total Amount'),
'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'department_id':fields.many2one('hr.department','Department'),
@@ -227,6 +228,16 @@ class product_product(osv.osv):
'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
}
+ def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):
+
+ if not hr_expense_ok:
+ return {}
+ data_obj = self.pool.get('ir.model.data')
+ cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
+ categ_id = data_obj.browse(cr, uid, cat_id).res_id
+ res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
+ return res
+
product_product()
class hr_expense_line(osv.osv):
@@ -244,7 +255,7 @@ class hr_expense_line(osv.osv):
'name': fields.char('Expense Note', size=128, required=True),
'date_value': fields.date('Date', required=True),
'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
- 'total_amount': fields.function(_amount, method=True, string='Total', digits_compute=dp.get_precision('Account')),
+ 'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Account')),
'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Account')),
'unit_quantity': fields.float('Quantities' ),
'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
@@ -265,7 +276,7 @@ class hr_expense_line(osv.osv):
if product_id:
product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
res['name'] = product.name
- amount_unit = product.price_get('standard_price', context=context)[product.id]
+ amount_unit = product.price_get('standard_price')[product.id]
res['unit_amount'] = amount_unit
if not uom_id:
res['uom_id'] = product.uom_id.id
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
new file mode 100644
index 00000000000..9660dbb2543
--- /dev/null
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="1">
+ <!--
+ Resource: product.uom.categ
+ -->
+ <record id="cat_expense" model="product.category">
+ <field name="parent_id" ref="product.cat0"/>
+ <field name="name">Expenses</field>
+ </record>
+
+ <record id="product_product_expense_car" model="product.product">
+ <field name="list_price">0.32</field>
+ <field name="standard_price">0.32</field>
+ <field name="uom_id" ref="product.product_uom_km"/>
+ <field name="uom_po_id" ref="product.product_uom_km"/>
+ <field name="type">consu</field>
+ <field name="name">Travel Expenses</field>
+ <field name="default_code">TRA</field>
+ <field name="categ_id" ref="hr_expense.cat_expense"/>
+ <field name="hr_expense_ok" eval="True" />
+ </record>
+
+ </data>
+</openerp> \ No newline at end of file
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 49afbd8523c..80c9cd66694 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -26,18 +26,6 @@
<field name="hr_expense_ok" eval="True" />
</record>
- <record id="product_product_expense_car" model="product.product">
- <field name="list_price">0.30</field>
- <field name="standard_price">0.30</field>
- <field name="uom_id" ref="product.product_uom_km"/>
- <field name="uom_po_id" ref="product.product_uom_km"/>
- <field name="type">consu</field>
- <field name="name">Car Travel</field>
- <field name="default_code">CAR</field>
- <field name="categ_id" ref="product.cat2"/>
- <field name="hr_expense_ok" eval="True" />
- </record>
-
<record id="hr_expense_expense_septemberexpenses0" model="hr.expense.expense">
<field name="currency_id" ref="base.EUR"/>
<field name="employee_id" ref="hr.employee1"/>
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
new file mode 100644
index 00000000000..a5c378238a6
--- /dev/null
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -0,0 +1,35 @@
+<openerp>
+ <data>
+ <record id="product_expense_installer_tree_view" model="ir.ui.view">
+ <field name="name">product.product.tree</field>
+ <field name="model">product.product</field>
+ <field name="type">tree</field>
+ <field eval="7" name="priority"/>
+ <field name="arch" type="xml">
+ <tree editable="bottom" string="Products">
+ <field name="name"/>
+ <field name="standard_price"/>
+ <field name="list_price"/>
+ <field name="uom_id" string="UoM"/>
+ </tree>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="product_normal_form_view_installer">
+ <field name="name">Review Your Expenses Products</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">product.product</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="context" eval="'{\'default_type\':\'service\',\'default_procure_method\':\'make_to_stock\',\'default_supply_method\':\'buy\',\'default_purchase_ok\':True, \'default_sale_ok\':False, \'default_hr_expense_ok\':True,\'default_categ_id\': ' + str(ref('cat_expense')) +'}'"/>
+ <field name="domain">[('hr_expense_ok','=',True)]</field>
+ <field name="view_id" ref="product_expense_installer_tree_view"/>
+ </record>
+
+ <record id="product_normal_form_view_todo" model="ir.actions.todo">
+ <field name="action_id" ref="product_normal_form_view_installer"/>
+ <field name="category_id" ref="hr.category_hr_management_config"/>
+ <field name="sequence">3</field>
+ </record>
+ </data>
+</openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 5aa2fe5c38e..60dffa22d24 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -46,7 +46,7 @@
<field name="model">hr.expense.expense</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')" string="Expenses" editable="top">
+ <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses" editable="top">
<field name="employee_id"/>
<field name="date"/>
<field name="department_id" groups="base.group_extended"/>
@@ -189,7 +189,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<field name="purchase_ok" position="after">
- <field name="hr_expense_ok"/>
+ <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
</field>
</field>
</record>
diff --git a/addons/hr_expense/i18n/ar.po b/addons/hr_expense/i18n/ar.po
index cf9be899fd8..04b6d58249b 100644
--- a/addons/hr_expense/i18n/ar.po
+++ b/addons/hr_expense/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index b3af4f31cf7..71f609b39d1 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr "Състояние"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Грешка!"
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index 8147943ccfa..c897b83296c 100644
--- a/addons/hr_expense/i18n/bs.po
+++ b/addons/hr_expense/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr "Stanje"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Greška !"
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index 2970f013a21..1522883cc38 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -138,6 +138,22 @@ msgid ""
" re-invoice your customer's expenses if your work by project.\n"
" "
msgstr ""
+"\n"
+" Aquest mòdul permet gestionar les despeses dels treballadors.\n"
+"\n"
+" S'ha implementat el flux complet:\n"
+" * Despesa en esborrany\n"
+" * Confirmació del full de despeses per l'empleat\n"
+" * Validació pel seu responsable\n"
+" * Validació pel comptable i creació de la factura\n"
+" * Pagament de la factura a l'empleat\n"
+"\n"
+" Aquest mòdul també utilitza la comptabilitat analítica i és compatible "
+"amb\n"
+" el mòdul de facturació de fulls de serveis de forma que pugui\n"
+" re-facturar automàticament les seves despeses de clients si treballa "
+"per projectes.\n"
+" "
#. module: hr_expense
#: selection:hr.expense.report,state:0
@@ -189,7 +205,7 @@ msgstr ""
#: view:hr.expense.report:0
#: field:hr.expense.report,nbr:0
msgid "# of Lines"
-msgstr ""
+msgstr "Núm. de línies"
#. module: hr_expense
#: model:process.transition,name:hr_expense.process_transition_refuseexpense0
@@ -253,7 +269,7 @@ msgid "State"
msgstr "Estat"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -288,8 +304,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Alguns costos poden ser refacturats al client"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Error !"
@@ -330,7 +347,7 @@ msgstr "Diari forçat"
#: view:hr.expense.report:0
#: field:hr.expense.report,no_of_products:0
msgid "# of Products"
-msgstr ""
+msgstr "Núm. de productes"
#. module: hr_expense
#: selection:hr.expense.report,month:0
@@ -389,24 +406,24 @@ msgstr "Línies de despeses"
#. module: hr_expense
#: field:hr.expense.report,delay_confirm:0
msgid "Delay to Confirm"
-msgstr ""
+msgstr "Temps fins a confirmar"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "September"
-msgstr ""
+msgstr "Setembre"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "December"
-msgstr ""
+msgstr "Desembre"
#. module: hr_expense
#: view:hr.expense.expense:0
#: view:hr.expense.report:0
#: field:hr.expense.report,month:0
msgid "Month"
-msgstr ""
+msgstr "Mes"
#. module: hr_expense
#: field:hr.expense.expense,currency_id:0
@@ -417,7 +434,7 @@ msgstr "Moneda"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Waiting Approval"
-msgstr ""
+msgstr "Està esperant l'aprovació"
#. module: hr_expense
#: model:process.node,note:hr_expense.process_node_draftexpenses0
@@ -434,12 +451,12 @@ msgstr "Facturat"
#. module: hr_expense
#: field:product.product,hr_expense_ok:0
msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "Pot ser una despesa"
#. module: hr_expense
#: view:hr.expense.report:0
msgid " Year "
-msgstr ""
+msgstr " Any "
#. module: hr_expense
#: selection:hr.expense.expense,state:0
@@ -477,7 +494,7 @@ msgstr "Despesa està aprovada."
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "August"
-msgstr ""
+msgstr "Agost"
#. module: hr_expense
#: model:process.node,note:hr_expense.process_node_approved0
@@ -492,7 +509,7 @@ msgstr "Import total"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "June"
-msgstr ""
+msgstr "Juny"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_draftexpenses0
@@ -502,7 +519,7 @@ msgstr "Despeses esborrany"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Customer Project"
-msgstr ""
+msgstr "Projecte del client"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -520,17 +537,17 @@ msgstr "Data"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "November"
-msgstr ""
+msgstr "Novembre"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "October"
-msgstr ""
+msgstr "Octubre"
#. module: hr_expense
#: report:hr.expense:0
@@ -540,7 +557,7 @@ msgstr "Total:"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "January"
-msgstr ""
+msgstr "Gener"
#. module: hr_expense
#: report:hr.expense:0
@@ -571,13 +588,13 @@ msgstr "Full de despeses"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Waiting"
-msgstr ""
+msgstr "En espera"
#. module: hr_expense
#: view:hr.expense.report:0
#: field:hr.expense.report,day:0
msgid "Day"
-msgstr ""
+msgstr "Dia"
#. module: hr_expense
#: model:ir.module.module,shortdesc:hr_expense.module_meta_information
@@ -587,7 +604,7 @@ msgstr "Seguiment de les despeses dels recursos humans"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "References"
-msgstr ""
+msgstr "Referències"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -605,7 +622,7 @@ msgstr "Refactura"
#: view:board.board:0
#: model:ir.actions.act_window,name:hr_expense.action_employee_expense
msgid "All Employee Expenses"
-msgstr ""
+msgstr "Totes les despeses del treballador"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -615,7 +632,7 @@ msgstr "Altra info."
#. module: hr_expense
#: help:hr.expense.expense,journal_id:0
msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "El diari utilitzat quan es factura la despesa"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -665,7 +682,7 @@ msgstr "Producte"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Expenses of My Department"
-msgstr ""
+msgstr "Despeses del meu departament"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -677,7 +694,7 @@ msgstr "Descripció"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "May"
-msgstr ""
+msgstr "Maig"
#. module: hr_expense
#: field:hr.expense.line,unit_quantity:0
@@ -687,12 +704,12 @@ msgstr "Quantitats"
#. module: hr_expense
#: report:hr.expense:0
msgid "Price"
-msgstr ""
+msgstr "Preu"
#. module: hr_expense
#: field:hr.expense.report,no_of_account:0
msgid "# of Accounts"
-msgstr ""
+msgstr "Núm. de comptes"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
@@ -708,7 +725,7 @@ msgstr "Ref."
#. module: hr_expense
#: field:hr.expense.report,employee_id:0
msgid "Employee's Name"
-msgstr ""
+msgstr "Nom del treballador"
#. module: hr_expense
#: model:ir.actions.act_window,help:hr_expense.expense_all
@@ -720,11 +737,17 @@ msgid ""
"and the employee can be reimbursed. You can also reinvoice the customer at "
"the end of the flow."
msgstr ""
+"El mòdul de gestió de despeses d'OpenERP li permet fer un seguiment de tot "
+"el procés. Cada mes, els treballadors introdueixen les seves despeses. Al "
+"final del mes, els seus responsables validen els fulls de despeses les quals "
+"creen costos en comptes analítics. El comptable valida les entrades "
+"proposades i es pot reemborsar al treballador. Podeu re-facturar al client "
+"al final del procés."
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "This Month"
-msgstr ""
+msgstr "Aquest mes"
#. module: hr_expense
#: field:hr.expense.expense,user_valid:0
@@ -741,7 +764,7 @@ msgstr "(Data i signatura)"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "February"
-msgstr ""
+msgstr "Febrer"
#. module: hr_expense
#: report:hr.expense:0
@@ -751,7 +774,7 @@ msgstr "Nom"
#. module: hr_expense
#: field:hr.expense.expense,account_move_id:0
msgid "Ledger Posting"
-msgstr ""
+msgstr "Fixat llibre comptable"
#. module: hr_expense
#: model:process.transition,note:hr_expense.process_transition_approveinvoice0
@@ -761,17 +784,17 @@ msgstr "Crea factura de proveïdor."
#. module: hr_expense
#: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
msgid "Hotel Accommodation"
-msgstr ""
+msgstr "Allotjament hotel"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "April"
-msgstr ""
+msgstr "Abril"
#. module: hr_expense
#: field:hr.expense.line,name:0
msgid "Expense Note"
-msgstr ""
+msgstr "Nota de despesa"
#. module: hr_expense
#: help:hr.expense.expense,state:0
@@ -783,11 +806,17 @@ msgid ""
" If an invoice is made for the expense request, the state is 'Invoiced'.\n"
" If the expense is paid to user, the state is 'Reimbursed'."
msgstr ""
+"Quan la sol·licitud de despesa és creada l'estat és 'esborrany'.\n"
+" Si l'usuari la confirma i s'envia al responsable, l'estat és 'esperant "
+"confirmació'. \n"
+"Si el responsable l'accepta, l'estat és 'acceptada'.\n"
+" Si es factura, l'estat és 'facturada'.\n"
+" Si es paga a l'usuari, l'estat és 'reemborsada'"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Approve"
-msgstr ""
+msgstr "Aprova"
#. module: hr_expense
#: view:hr.expense.line:0
@@ -816,18 +845,18 @@ msgstr "Despeses"
#. module: hr_expense
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Codi EAN no vàlid"
#. module: hr_expense
#: view:hr.expense.report:0
#: field:hr.expense.report,year:0
msgid "Year"
-msgstr ""
+msgstr "Any"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "To Approve"
-msgstr ""
+msgstr "Per aprovar"
#. module: hr_expense
#: help:product.product,hr_expense_ok:0
@@ -835,6 +864,8 @@ msgid ""
"Determines if the product can be visible in the list of product within a "
"selection from an HR expense sheet line."
msgstr ""
+"Determina si el producte es pot visualitzar en la llista de productes a "
+"seleccionar en una línia del full de despeses."
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_reinvoicing0
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index cf9be899fd8..5835644c7a3 100644
--- a/addons/hr_expense/i18n/cs.po
+++ b/addons/hr_expense/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index f0b45f28555..d60101e9cad 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -271,7 +271,7 @@ msgid "State"
msgstr "Status"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -306,8 +306,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Einige Aufwendungen können an Kunde weiterberechnet werden"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Fehler !"
@@ -963,41 +964,3 @@ msgstr "Weiterberechnung"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#~ msgid "Extended filters..."
-#~ msgstr "Erweiterter Filter..."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Fehler: Verkaufseinheit sollte in einer anderen Kategorie sein als "
-#~ "Mengeneinheit (ME)"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "Der Mitarbeiter muss eine gültige Anschrift hinterlegt haben."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fehler: Die Standard Mengeneinheit sowie die Beschaffungs ME muss in "
-#~ "derselben Kategorie sein."
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Rules werden nicht durch osv_memory Objekte unterstützt!"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr ""
-#~ "Die Berechtigung für diese Regel sollte mindestens bei einem Benutzer "
-#~ "vorhanden sein !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index 7e3def5c5df..0eab65c4c3d 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -251,7 +251,7 @@ msgid "State"
msgstr "Νομός"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -284,8 +284,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Κάποια έξοδα μπορεί να είναι ανατιμολογήσεις στον πελάτη"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Σφάλμα!"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index fc5946d8602..3a6c2ccf317 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -267,7 +267,7 @@ msgid "State"
msgstr "Estado"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -302,8 +302,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Algunos costes pueden ser refacturados al cliente"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "¡Error!"
@@ -950,7 +951,3 @@ msgstr "Refacturació"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "El empleado debe tener una dirección de trabajo"
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index 15ce1cb40ee..da34143708f 100644
--- a/addons/hr_expense/i18n/es_AR.po
+++ b/addons/hr_expense/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: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr "Provincia"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Algunos costos pueden ser refacturaciones al cliente"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "¡Error!"
diff --git a/addons/hr_expense/i18n/es_EC.po b/addons/hr_expense/i18n/es_EC.po
index cf65f33b503..b8956014d95 100644
--- a/addons/hr_expense/i18n/es_EC.po
+++ b/addons/hr_expense/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
msgstr "Estado"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Algunos costes pueden ser refacturados al cliente"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index 274223fc4c3..bacefdf99ab 100644
--- a/addons/hr_expense/i18n/et.po
+++ b/addons/hr_expense/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr "Olek"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Mõned kulud võivad olla taasarvedused kliendile"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Viga!"
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index 1665475be2c..723c9348497 100644
--- a/addons/hr_expense/i18n/fi.po
+++ b/addons/hr_expense/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Virhe !"
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index 90668584808..bb4d6487a59 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -270,7 +270,7 @@ msgid "State"
msgstr "État"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -305,8 +305,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Certains coûts peuvent être refacturés au client"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Erreur !"
@@ -924,22 +925,6 @@ msgstr "Refacturation"
#~ msgid "Can be Expensed"
#~ msgstr "Peut être dépensé"
-#~ msgid "Extended filters..."
-#~ msgstr "Filtres étendus..."
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Erreur: UDV doit être dans une catégorie différente de l'UDM"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "L'employé doit avoir une adresse professionnelle"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Erreur : L'UDM par défaut et l'UDM d'achat doivent être dans la même "
-#~ "catégorie."
-
#, python-format
#~ msgid ""
#~ "Please configure Default Expanse account for Product purchase, "
@@ -947,15 +932,3 @@ msgstr "Refacturation"
#~ msgstr ""
#~ "Veuiller configurer le compte de notes de frais par défaut pour le produit "
#~ "acheté, `property_account_expense_categ`"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La taille du champ ne peut jamais être inférieure à 1 !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Les règles doivent avoir au moins un droit d'accès sélectionné !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID du certificat pour un module doit être unique !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Le nom d'un module doit être unique !"
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index 71236afeecb..37167382ca7 100644
--- a/addons/hr_expense/i18n/hr.po
+++ b/addons/hr_expense/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr "Država"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index d108a963388..8e4841d087b 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.po
@@ -8,13 +8,14 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
"PO-Revision-Date: 2011-02-03 17:56+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -266,7 +267,7 @@ msgid "State"
msgstr "Állapot"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -302,8 +303,9 @@ msgstr ""
"A költségek egy részét valószínűleg tovább lehet számlázni a vevőknek"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Hiba !"
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index d6ed6e1de0a..989de3fa75a 100644
--- a/addons/hr_expense/i18n/id.po
+++ b/addons/hr_expense/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index c808c06ec80..0bc7d80df84 100644
--- a/addons/hr_expense/i18n/it.po
+++ b/addons/hr_expense/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -269,7 +269,7 @@ msgid "State"
msgstr "Stato"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -304,8 +304,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Alcuni costi devono essere rifatturati al cliente"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Errore!"
@@ -952,36 +953,3 @@ msgstr "In fase di rifatturazione"
#~ msgstr ""
#~ "Si deve configurare il conto di spesa di default per acquisto prodotti: "
#~ "`property_account_expense_categ`"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "L'ID del certificato del modulo deve essere unico!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr ""
-#~ "Errore: L'Unità di misura per la Vendita (UOS) deve essere in una categoria "
-#~ "diversa da quella dell'Unità di misura (UOM)"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "L'impiegato deve avere un indirizzo"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Errore ! Non è possibile creare menu ricorsivi."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Errore: l'unità misura di default e quella di acquisto devono essere nella "
-#~ "stessa categoria."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Il nome del modulo deve essere unico !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "La regola deve avere almento un diritto di accesso spuntato!"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Le regole non sono supportate per gli oggetti: osv_memory!"
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index d1806e13ffb..6eed2f317a4 100644
--- a/addons/hr_expense/i18n/ko.po
+++ b/addons/hr_expense/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
msgstr "상태"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "일부 비요은 고객에게 재차 인보이스될 수 있습니다."
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "에러!"
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index cf9be899fd8..5835644c7a3 100644
--- a/addons/hr_expense/i18n/lt.po
+++ b/addons/hr_expense/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index 654616cc0e5..9b72ea6d308 100644
--- a/addons/hr_expense/i18n/lv.po
+++ b/addons/hr_expense/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index f8606728dd0..53f5e13f577 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -267,7 +267,7 @@ msgid "State"
msgstr "Төлөв"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -302,8 +302,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Зарим үнүүдийг харилцагч дахин нэхэмжилж магадгүй"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Алдаа !"
@@ -943,31 +944,9 @@ msgstr "Дахин нэхэмжлэх"
#~ "Худалдан авч буй барааны 'Өгөгдмөл өсөлт' талбарын тохируулна уу. "
#~ "`property_account_expense_categ`"
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Алдаа: Борлуулалтын нэгж нь хэмжилтийн нэгжээс өөр нэр томъёл"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "Ажилтан ажлын хаягтай байх ёстой"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Алдаа ! Рекурс цэсийг үүсгэж болохгүй"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Алдаа: Өгөгдмөл хэмжих нэгж ба худалдан авалтын хэмжилт нь 1 ангилалд байх "
-#~ "ёстой"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "osv_memory обьект нь дүрмийг дэмжихгүй"
-
#~ msgid ""
#~ "Determine if the product can be visible in the list of product within a "
#~ "selection from an HR expense sheet line."
#~ msgstr ""
#~ "Зардлын хүснэгтийн мөр дөх барааны жагсаалтаас сонгоход тухайн бараа "
#~ "харагдах эсэхийг тодорхойлно."
-
-#~ msgid "Extended filters..."
-#~ msgstr "Өргөтгөсөн хайлт..."
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index fa626b2b4d5..21c3990201a 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -267,7 +267,7 @@ msgid "State"
msgstr "Status"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -302,8 +302,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Sommige kosten kunnen doorbelast worden aan de klant"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Fout !"
@@ -944,9 +945,6 @@ msgstr "Doorbelasten"
#~ msgid "Draft expenses"
#~ msgstr "Conceptdeclaraties"
-#~ msgid "Extended filters..."
-#~ msgstr "Uitgebreide filters..."
-
#, python-format
#~ msgid ""
#~ "Please configure Default Expanse account for Product purchase, "
@@ -954,33 +952,3 @@ msgstr "Doorbelasten"
#~ msgstr ""
#~ "Configureer aub de standaard uitgaverekening voor productinkoop, "
#~ "`property_account_expense_categ`"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Fout: UOS moet in andere categorie staan dan UOM"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "De medewerker moet een werkadres hebben"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Fout ! U kunt geen recursief menu maken."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Fout: De standaard UOM en de inkoop UOM moeten in dezelfde categorie staan."
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "Regels worden niet ondersteund bij osv_memory objecten !"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "De modulenaam moet uniek zijn !"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "Regel moet tenminste één toegangsrecht aangevinkt hebben !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index 22c022bc454..1e6625c4841 100644
--- a/addons/hr_expense/i18n/nl_BE.po
+++ b/addons/hr_expense/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index 91ee9236c6d..ba24926d866 100644
--- a/addons/hr_expense/i18n/pl.po
+++ b/addons/hr_expense/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr "Stan"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Część kosztów może być refakturowana na klienta"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Błąd !"
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index 06a93f00062..39e15c9a01d 100644
--- a/addons/hr_expense/i18n/pt.po
+++ b/addons/hr_expense/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -106,6 +106,7 @@ msgid ""
"Date of the acceptation of the sheet expense. It's filled when the button "
"Accept is pressed."
msgstr ""
+"Data de aprovação da folha de despesas. É preenchida pelo botão de aprovação."
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -180,6 +181,8 @@ msgid ""
"Date of the confirmation of the sheet expense. It's filled when the button "
"Confirm is pressed."
msgstr ""
+"Data de confirmação da folha de despesas. É preenchida ao carregar no botão "
+"de confirmação."
#. module: hr_expense
#: view:hr.expense.report:0
@@ -221,12 +224,13 @@ msgstr "O contabilista valida a folha"
#. module: hr_expense
#: field:hr.expense.report,delay_valid:0
msgid "Delay to Valid"
-msgstr ""
+msgstr "Espera para Validar"
#. module: hr_expense
#: help:hr.expense.line,sequence:0
msgid "Gives the sequence order when displaying a list of expense lines."
msgstr ""
+"Indica a sequência de ordenação ao mostrar uma lista de linhas de despesa."
#. module: hr_expense
#: field:hr.expense.line,analytic_account:0
@@ -248,12 +252,14 @@ msgid "State"
msgstr "Estado"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
"`property_account_expense_categ`"
msgstr ""
+"Por favor configure a conta de despesas padrão para Compra de Produto, "
+"'property_account_expense_categ'"
#. module: hr_expense
#: report:hr.expense:0
@@ -281,8 +287,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Alguns custos podem ser re-facturados para o cliente"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Erro !"
@@ -382,7 +389,7 @@ msgstr "Linhas de Despesa"
#. module: hr_expense
#: field:hr.expense.report,delay_confirm:0
msgid "Delay to Confirm"
-msgstr ""
+msgstr "Espera para Confirmar"
#. module: hr_expense
#: selection:hr.expense.report,month:0
@@ -427,7 +434,7 @@ msgstr "Facturado"
#. module: hr_expense
#: field:product.product,hr_expense_ok:0
msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "Pode ser uma Despesa"
#. module: hr_expense
#: view:hr.expense.report:0
@@ -518,7 +525,7 @@ msgstr "Novembro"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros avançados..."
#. module: hr_expense
#: selection:hr.expense.report,month:0
@@ -598,7 +605,7 @@ msgstr "Re-Facturar"
#: view:board.board:0
#: model:ir.actions.act_window,name:hr_expense.action_employee_expense
msgid "All Employee Expenses"
-msgstr ""
+msgstr "Todas as despesas do funcionário"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -608,7 +615,7 @@ msgstr "Outras Informações"
#. module: hr_expense
#: help:hr.expense.expense,journal_id:0
msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "Diário usado quando a despesa é faturada"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -680,7 +687,7 @@ msgstr "Quantidades"
#. module: hr_expense
#: report:hr.expense:0
msgid "Price"
-msgstr ""
+msgstr "Preço"
#. module: hr_expense
#: field:hr.expense.report,no_of_account:0
@@ -764,7 +771,7 @@ msgstr "Abril"
#. module: hr_expense
#: field:hr.expense.line,name:0
msgid "Expense Note"
-msgstr ""
+msgstr "Nota de despesa"
#. module: hr_expense
#: help:hr.expense.expense,state:0
@@ -828,6 +835,7 @@ msgid ""
"Determines if the product can be visible in the list of product within a "
"selection from an HR expense sheet line."
msgstr ""
+"Indica se o produto está disponível para ser usado em folhas de despesa."
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_reinvoicing0
@@ -915,25 +923,3 @@ msgstr "Re-facturamento"
#~ msgid "Short Description"
#~ msgstr "Descrição Curta"
-
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "O ID do certificado do módulo tem de ser único!"
-
-#, python-format
-#~ msgid "The employee must have a working address"
-#~ msgstr "O empregado tem de ter um endereço de trabalho"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Erro ! Não pode criar menus recursivos"
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "O nome do módulo deve ser único!"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "O tamanho do campo não pode ser inferior a 1 !"
-
-#~ msgid "Rules are not supported for osv_memory objects !"
-#~ msgstr "O objecto osv_memory não suporta regras!"
-
-#~ msgid "Rule must have at least one checked access right !"
-#~ msgstr "A regra tem de ter pelo menos um direito de acesso marcado!"
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index a783d231cc1..10637cabc95 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -268,7 +268,7 @@ msgid "State"
msgstr "Status"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -303,8 +303,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Alguns custos podem ser refaturados para o cliente"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Erro !"
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index 97a9c5c0e66..ba051631cc6 100644
--- a/addons/hr_expense/i18n/ro.po
+++ b/addons/hr_expense/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Eroare !"
@@ -850,24 +851,6 @@ msgstr ""
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nume invalid de model în definirea acțiunii."
-#~ msgid "The certificate ID of the module must be unique !"
-#~ msgstr "ID-ul certificatului trebuie să fie unic !"
-
-#~ msgid "Error ! You can not create recursive Menu."
-#~ msgstr "Eroare ! Nu este posibilă crearea unui meniu recursiv."
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Eroare: unitatea de masura implicita si unitatea de masura furnizor trebuie "
-#~ "sa faca parte din aceeasi categorie."
-
-#~ msgid "The name of the module must be unique !"
-#~ msgstr "Numele modulului trebuie să fie unic !"
-
-#~ msgid "Size of the field can never be less than 1 !"
-#~ msgstr "Lungimea acestui câmp trebuie să fie cel puţin 1 !"
-
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index b90e7caf9f7..8f4df7afecf 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr "Состояние"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Некоторые расходы могут быть пересчитаны клиенту"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Ошибка !"
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index 229ca366edc..ad9db40b7ac 100644
--- a/addons/hr_expense/i18n/sl.po
+++ b/addons/hr_expense/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Napaka!"
diff --git a/addons/hr_expense/i18n/sq.po b/addons/hr_expense/i18n/sq.po
index eef87a8ee60..2e82b7030bb 100644
--- a/addons/hr_expense/i18n/sq.po
+++ b/addons/hr_expense/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: 2011-04-29 05:27+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index a30d401099f..824f8b516ef 100644
--- a/addons/hr_expense/i18n/sr.po
+++ b/addons/hr_expense/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/sr@latin.po b/addons/hr_expense/i18n/sr@latin.po
index e8ade41b97b..cb1f552a8f0 100644
--- a/addons/hr_expense/i18n/sr@latin.po
+++ b/addons/hr_expense/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -265,7 +265,7 @@ msgid "State"
msgstr "Stanje"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -300,8 +300,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr "Neki troškovi mogu da budu prefakturisani na kupca"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr "Greška!"
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index 94465331455..c4ab91562cc 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index 23a057bcdc3..ee4104d86ad 100644
--- a/addons/hr_expense/i18n/tlh.po
+++ b/addons/hr_expense/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 2d65eee73a3..3688091b5d8 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr "Durum"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index 5d575fc1f7d..b5fd6ff6e06 100644
--- a/addons/hr_expense/i18n/uk.po
+++ b/addons/hr_expense/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/vi.po b/addons/hr_expense/i18n/vi.po
index 3cf862d8b07..dbc6eed688a 100644
--- a/addons/hr_expense/i18n/vi.po
+++ b/addons/hr_expense/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -249,7 +249,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -282,8 +282,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 5f91e41fbe2..4b8d31ec770 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
"PO-Revision-Date: 2010-03-20 08:27+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -29,24 +29,24 @@ msgstr "费用明细"
#. module: hr_expense
#: model:process.node,note:hr_expense.process_node_reimbursement0
msgid "The accoutant reimburse the expenses"
-msgstr "会计人员报销这费用"
+msgstr "财务报销这费用"
#. module: hr_expense
#: field:hr.expense.expense,date_confirm:0
#: field:hr.expense.report,date_confirm:0
msgid "Confirmation Date"
-msgstr ""
+msgstr "确认日期"
#. module: hr_expense
#: view:hr.expense.expense:0
#: view:hr.expense.report:0
msgid "Group By..."
-msgstr ""
+msgstr "分组..."
#. module: hr_expense
#: model:product.template,name:hr_expense.product_product_expense_air_product_template
msgid "Air Ticket"
-msgstr ""
+msgstr "飞机票"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -54,24 +54,24 @@ msgstr ""
#: view:hr.expense.report:0
#: field:hr.expense.report,department_id:0
msgid "Department"
-msgstr ""
+msgstr "部门"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "March"
-msgstr ""
+msgstr "3月"
#. module: hr_expense
#: field:hr.expense.report,invoiced:0
msgid "# of Invoiced Lines"
-msgstr ""
+msgstr "#发票明细"
#. module: hr_expense
#: field:hr.expense.expense,company_id:0
#: view:hr.expense.report:0
#: field:hr.expense.report,company_id:0
msgid "Company"
-msgstr ""
+msgstr "公司"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -81,31 +81,31 @@ msgstr "设为草稿"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "To Pay"
-msgstr ""
+msgstr "支付"
#. module: hr_expense
#: model:ir.model,name:hr_expense.model_hr_expense_report
msgid "Expenses Statistics"
-msgstr ""
+msgstr "费用统计"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
#: view:hr.expense.report:0
#: model:process.node,name:hr_expense.process_node_approved0
msgid "Approved"
-msgstr "批准"
+msgstr "已审批"
#. module: hr_expense
#: field:hr.expense.line,uom_id:0
msgid "UoM"
-msgstr "单位"
+msgstr "计量单位"
#. module: hr_expense
#: help:hr.expense.expense,date_valid:0
msgid ""
"Date of the acceptation of the sheet expense. It's filled when the button "
"Accept is pressed."
-msgstr ""
+msgstr "费用表的同意日期,它填好时按下同意按钮。"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -115,7 +115,7 @@ msgstr "备注"
#. module: hr_expense
#: field:hr.expense.expense,invoice_id:0
msgid "Employee's Invoice"
-msgstr ""
+msgstr "员工的发票"
#. module: hr_expense
#: model:ir.module.module,description:hr_expense.module_meta_information
@@ -136,6 +136,17 @@ msgid ""
" re-invoice your customer's expenses if your work by project.\n"
" "
msgstr ""
+"\n"
+" 这模块用来管理员工的费用。\n"
+" 工作流程为:\n"
+" * 费用草稿\n"
+" * 员工确认申请表\n"
+" * 经理审核\n"
+" * 财务人员审核并开发票\n"
+" * 按发票付款给员工\n"
+"\n"
+" 这模块还用在管理会计的模块并集成计工单的发票模块,所以如果您的工作是一个项目,将能自动开出您的费用的发票。\n"
+" "
#. module: hr_expense
#: selection:hr.expense.report,state:0
@@ -145,7 +156,7 @@ msgstr "已取消"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Validation"
-msgstr "批准"
+msgstr "审核"
#. module: hr_expense
#: selection:hr.expense.report,state:0
@@ -160,32 +171,32 @@ msgstr "已同意"
#. module: hr_expense
#: view:hr.expense.report:0
msgid " Month "
-msgstr ""
+msgstr " 月份 "
#. module: hr_expense
#: report:hr.expense:0
#: field:hr.expense.expense,ref:0
#: field:hr.expense.line,ref:0
msgid "Reference"
-msgstr "参考"
+msgstr "单号"
#. module: hr_expense
#: report:hr.expense:0
msgid "Certified honest and conform,"
-msgstr "证明是诚实和遵守约定"
+msgstr "已证明真实和一致"
#. module: hr_expense
#: help:hr.expense.expense,date_confirm:0
msgid ""
"Date of the confirmation of the sheet expense. It's filled when the button "
"Confirm is pressed."
-msgstr ""
+msgstr "费用表的确认日期,它填满时按下确认按钮"
#. module: hr_expense
#: view:hr.expense.report:0
#: field:hr.expense.report,nbr:0
msgid "# of Lines"
-msgstr ""
+msgstr "# 明细"
#. module: hr_expense
#: model:process.transition,name:hr_expense.process_transition_refuseexpense0
@@ -195,17 +206,17 @@ msgstr "拒绝费用"
#. module: hr_expense
#: model:product.template,name:hr_expense.product_product_expense_car_product_template
msgid "Car Travel"
-msgstr ""
+msgstr "汽车历程"
#. module: hr_expense
#: field:hr.expense.report,price_average:0
msgid "Average Price"
-msgstr ""
+msgstr "均价"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Total Invoiced Lines"
-msgstr ""
+msgstr "发票明细数"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -221,24 +232,24 @@ msgstr "会计人员使这表生效"
#. module: hr_expense
#: field:hr.expense.report,delay_valid:0
msgid "Delay to Valid"
-msgstr ""
+msgstr "推延生效"
#. module: hr_expense
#: help:hr.expense.line,sequence:0
msgid "Gives the sequence order when displaying a list of expense lines."
-msgstr ""
+msgstr "当显示费用明细时指定一个序列顺序。"
#. module: hr_expense
#: field:hr.expense.line,analytic_account:0
#: view:hr.expense.report:0
#: field:hr.expense.report,analytic_account:0
msgid "Analytic account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
#. module: hr_expense
#: field:hr.expense.report,date:0
msgid "Date "
-msgstr ""
+msgstr "日期 "
#. module: hr_expense
#: field:hr.expense.expense,state:0
@@ -248,12 +259,12 @@ msgid "State"
msgstr "状态"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
"`property_account_expense_categ`"
-msgstr ""
+msgstr "请设置产品采购的默认费用科目,'属性_科目_费用_类别'"
#. module: hr_expense
#: report:hr.expense:0
@@ -273,19 +284,20 @@ msgstr "数量"
#: view:hr.expense.report:0
#: field:hr.expense.report,price_total:0
msgid "Total Price"
-msgstr "价格合计"
+msgstr "总价格"
#. module: hr_expense
#: model:process.node,note:hr_expense.process_node_reinvoicing0
msgid "Some costs may be reinvoices to the customer"
-msgstr "有些成本可以要重开发票给客户"
+msgstr "有些成本可能要重开发票给客户"
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
-msgstr ""
+msgstr "错误!"
#. module: hr_expense
#: view:board.board:0
@@ -296,12 +308,12 @@ msgstr "我的费用"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
#. module: hr_expense
#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
msgid "HR expenses"
-msgstr ""
+msgstr "人力资源费用"
#. module: hr_expense
#: field:hr.expense.expense,id:0
@@ -317,23 +329,23 @@ msgstr "报销费用"
#: field:hr.expense.expense,journal_id:0
#: field:hr.expense.report,journal_id:0
msgid "Force Journal"
-msgstr "强制分类帐"
+msgstr "强制的账薄"
#. module: hr_expense
#: view:hr.expense.report:0
#: field:hr.expense.report,no_of_products:0
msgid "# of Products"
-msgstr ""
+msgstr "# 产品"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "July"
-msgstr ""
+msgstr "7月"
#. module: hr_expense
#: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
msgid "After creating invoice, reimburse expenses"
-msgstr "报销费用后创建发票"
+msgstr "创建发票后报销费用"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_reimbursement0
@@ -349,20 +361,20 @@ msgstr ""
#. module: hr_expense
#: view:hr.expense.report:0
msgid " Month-1 "
-msgstr ""
+msgstr " 上月 "
#. module: hr_expense
#: field:hr.expense.expense,date_valid:0
#: field:hr.expense.report,date_valid:0
msgid "Validation Date"
-msgstr ""
+msgstr "审核日期"
#. module: hr_expense
#: view:hr.expense.report:0
#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
msgid "Expenses Analysis"
-msgstr ""
+msgstr "费用分析"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -382,57 +394,57 @@ msgstr "费用明细"
#. module: hr_expense
#: field:hr.expense.report,delay_confirm:0
msgid "Delay to Confirm"
-msgstr ""
+msgstr "推延确认"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "September"
-msgstr ""
+msgstr "9月"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "December"
-msgstr ""
+msgstr "12月"
#. module: hr_expense
#: view:hr.expense.expense:0
#: view:hr.expense.report:0
#: field:hr.expense.report,month:0
msgid "Month"
-msgstr ""
+msgstr "月份"
#. module: hr_expense
#: field:hr.expense.expense,currency_id:0
#: field:hr.expense.report,currency_id:0
msgid "Currency"
-msgstr "货币"
+msgstr "币种"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Waiting Approval"
-msgstr ""
+msgstr "等待审批"
#. module: hr_expense
#: model:process.node,note:hr_expense.process_node_draftexpenses0
msgid "Employee encode all his expenses"
-msgstr "员工编码所有的费用"
+msgstr "员工所有的费用"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
#: view:hr.expense.report:0
#: selection:hr.expense.report,state:0
msgid "Invoiced"
-msgstr "已开发票"
+msgstr "已开票"
#. module: hr_expense
#: field:product.product,hr_expense_ok:0
msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "能构成费用"
#. module: hr_expense
#: view:hr.expense.report:0
msgid " Year "
-msgstr ""
+msgstr " 年 "
#. module: hr_expense
#: selection:hr.expense.expense,state:0
@@ -460,32 +472,32 @@ msgstr "草稿"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Accounting data"
-msgstr "会计日期"
+msgstr "财务日期"
#. module: hr_expense
#: model:process.transition,note:hr_expense.process_transition_approveexpense0
msgid "Expense is approved."
-msgstr "费用已批准"
+msgstr "费用已审批"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "August"
-msgstr ""
+msgstr "8月"
#. module: hr_expense
#: model:process.node,note:hr_expense.process_node_approved0
msgid "The direct manager approves the sheet"
-msgstr "管理者直接批准这表"
+msgstr "经理直接审批这表"
#. module: hr_expense
#: field:hr.expense.expense,amount:0
msgid "Total Amount"
-msgstr "金额合计"
+msgstr "总金额"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "June"
-msgstr ""
+msgstr "6月"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_draftexpenses0
@@ -495,7 +507,7 @@ msgstr "费用草稿"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Customer Project"
-msgstr ""
+msgstr "客户项目"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -513,17 +525,17 @@ msgstr "日期"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "November"
-msgstr ""
+msgstr "11月"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "增加筛选条件"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "October"
-msgstr ""
+msgstr "10月"
#. module: hr_expense
#: report:hr.expense:0
@@ -533,7 +545,7 @@ msgstr "合计:"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "January"
-msgstr ""
+msgstr "1月"
#. module: hr_expense
#: report:hr.expense:0
@@ -564,13 +576,13 @@ msgstr "费用表"
#. module: hr_expense
#: view:hr.expense.report:0
msgid "Waiting"
-msgstr ""
+msgstr "等待中"
#. module: hr_expense
#: view:hr.expense.report:0
#: field:hr.expense.report,day:0
msgid "Day"
-msgstr ""
+msgstr "日"
#. module: hr_expense
#: model:ir.module.module,shortdesc:hr_expense.module_meta_information
@@ -580,7 +592,7 @@ msgstr "人力资源费用跟踪"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "References"
-msgstr ""
+msgstr "单号"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -598,7 +610,7 @@ msgstr "重开发票"
#: view:board.board:0
#: model:ir.actions.act_window,name:hr_expense.action_employee_expense
msgid "All Employee Expenses"
-msgstr ""
+msgstr "所有员工费用"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -608,7 +620,7 @@ msgstr "其它信息"
#. module: hr_expense
#: help:hr.expense.expense,journal_id:0
msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "这费开发票时用这账簿"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -624,7 +636,7 @@ msgstr "确认费用"
#. module: hr_expense
#: model:process.transition,name:hr_expense.process_transition_approveexpense0
msgid "Approve expense"
-msgstr "批准费用"
+msgstr "审批费用"
#. module: hr_expense
#: model:process.transition.action,name:hr_expense.process_transition_action_accept0
@@ -634,7 +646,7 @@ msgstr "同意"
#. module: hr_expense
#: report:hr.expense:0
msgid "This document must be dated and signed for reimbursement"
-msgstr "这报销单据必须有日期和签名"
+msgstr "这报销单据必须要有日期和签名"
#. module: hr_expense
#: model:process.transition,note:hr_expense.process_transition_refuseexpense0
@@ -658,7 +670,7 @@ msgstr "产品"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Expenses of My Department"
-msgstr ""
+msgstr "我部门的费用"
#. module: hr_expense
#: view:hr.expense.expense:0
@@ -670,7 +682,7 @@ msgstr "说明"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "May"
-msgstr ""
+msgstr "5月"
#. module: hr_expense
#: field:hr.expense.line,unit_quantity:0
@@ -680,12 +692,12 @@ msgstr "数量"
#. module: hr_expense
#: report:hr.expense:0
msgid "Price"
-msgstr ""
+msgstr "价格"
#. module: hr_expense
#: field:hr.expense.report,no_of_account:0
msgid "# of Accounts"
-msgstr ""
+msgstr "# 科目"
#. module: hr_expense
#: selection:hr.expense.expense,state:0
@@ -696,12 +708,12 @@ msgstr "已拒绝"
#. module: hr_expense
#: report:hr.expense:0
msgid "Ref."
-msgstr "参考"
+msgstr "单号"
#. module: hr_expense
#: field:hr.expense.report,employee_id:0
msgid "Employee's Name"
-msgstr ""
+msgstr "员工姓名"
#. module: hr_expense
#: model:ir.actions.act_window,help:hr_expense.expense_all
@@ -713,18 +725,20 @@ msgid ""
"and the employee can be reimbursed. You can also reinvoice the customer at "
"the end of the flow."
msgstr ""
+"系统的费用管理模块允许你跟踪整个流程。每个月员工记录他们的费用。在本月底经理审核这费用表并创建项目成本/辅助核算項。财务人员审核这项目的分录同时员工可以做"
+"报销。您也可以在流程末尾重开客户发票。"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "This Month"
-msgstr ""
+msgstr "本月"
#. module: hr_expense
#: field:hr.expense.expense,user_valid:0
#: view:hr.expense.report:0
#: field:hr.expense.report,user_id:0
msgid "Validation User"
-msgstr "批准用户"
+msgstr "审核用户"
#. module: hr_expense
#: report:hr.expense:0
@@ -734,7 +748,7 @@ msgstr "(日期和签名)"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "February"
-msgstr ""
+msgstr "2月"
#. module: hr_expense
#: report:hr.expense:0
@@ -744,7 +758,7 @@ msgstr "名称"
#. module: hr_expense
#: field:hr.expense.expense,account_move_id:0
msgid "Ledger Posting"
-msgstr ""
+msgstr "过账"
#. module: hr_expense
#: model:process.transition,note:hr_expense.process_transition_approveinvoice0
@@ -754,17 +768,17 @@ msgstr "创建供应商发票"
#. module: hr_expense
#: model:product.template,name:hr_expense.product_product_expense_hotel_product_template
msgid "Hotel Accommodation"
-msgstr ""
+msgstr "酒店住宿"
#. module: hr_expense
#: selection:hr.expense.report,month:0
msgid "April"
-msgstr ""
+msgstr "4月"
#. module: hr_expense
#: field:hr.expense.line,name:0
msgid "Expense Note"
-msgstr ""
+msgstr "费用备注"
#. module: hr_expense
#: help:hr.expense.expense,state:0
@@ -776,11 +790,16 @@ msgid ""
" If an invoice is made for the expense request, the state is 'Invoiced'.\n"
" If the expense is paid to user, the state is 'Reimbursed'."
msgstr ""
+"当申请费用建立时状态是“草稿”。\n"
+"它被用户确认后和向admin申请时,它的状态是“等待确认”。\n"
+"如果admin同意,那它的状态是“已同意”。\n"
+"如果申请费用已经建立一个发票,它的状态是“已开票”。\n"
+"如果该费已支付给用户,那它的状态是“已报销”。"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "Approve"
-msgstr ""
+msgstr "审批"
#. module: hr_expense
#: view:hr.expense.line:0
@@ -791,7 +810,7 @@ msgstr "合计"
#. module: hr_expense
#: field:hr.expense.line,sequence:0
msgid "Sequence"
-msgstr "序号"
+msgstr "序列"
#. module: hr_expense
#: model:process.transition,note:hr_expense.process_transition_confirmexpense0
@@ -809,25 +828,25 @@ msgstr "费用"
#. module: hr_expense
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误:无效EAN代码"
#. module: hr_expense
#: view:hr.expense.report:0
#: field:hr.expense.report,year:0
msgid "Year"
-msgstr ""
+msgstr "年"
#. module: hr_expense
#: view:hr.expense.expense:0
msgid "To Approve"
-msgstr ""
+msgstr "待审批"
#. module: hr_expense
#: help:product.product,hr_expense_ok:0
msgid ""
"Determines if the product can be visible in the list of product within a "
"selection from an HR expense sheet line."
-msgstr ""
+msgstr "如果这产品可以显示在人力资源费用表明细的可选产品列表中,确认。"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_reinvoicing0
@@ -874,39 +893,6 @@ msgstr "重开发票"
#~ msgstr "无效XML视图结构!"
#~ msgid ""
-#~ "\n"
-#~ " This module aims to manage employee's expenses.\n"
-#~ "\n"
-#~ " The whole workflow is implemented:\n"
-#~ " * Draft expense\n"
-#~ " * Confirmation of the sheet by the employee\n"
-#~ " * Validation by his manager\n"
-#~ " * Validation by the accountant and invoice creation\n"
-#~ " * Payment of the invoice to the employee\n"
-#~ "\n"
-#~ " This module also use the analytic accounting and is compatible with\n"
-#~ " the invoice on timesheet module so that you will be able to "
-#~ "automatically\n"
-#~ " re-invoice your customer's expenses if your work by project.\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ " 这模块的目的是管理员工的费用\n"
-#~ "\n"
-#~ " 整个工作流实现:\n"
-#~ " *费用草稿\n"
-#~ " *确认员工工作表\n"
-#~ " *主管审批\n"
-#~ " *会计人员审批生成的发票\n"
-#~ " *员工的付款发票\n"
-#~ "\n"
-#~ " 这模块还用分析会计\n"
-#~ "和使时间表的发票相一致\n"
-#~ "因此如果你工作在项目模块\n"
-#~ "你将能够自动重开客户费用发票\n"
-#~ " "
-
-#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index e4311f1e690..594d273e0b4 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:28+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:32+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
#. module: hr_expense
#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -248,7 +248,7 @@ msgid "State"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:144
#, python-format
msgid ""
"Please configure Default Expense account for Product purchase, "
@@ -281,8 +281,9 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:145
-#: code:addons/hr_expense/hr_expense.py:158
+#: code:addons/hr_expense/hr_expense.py:144
+#: code:addons/hr_expense/hr_expense.py:157
+#: code:addons/hr_expense/hr_expense.py:159
#, python-format
msgid "Error !"
msgstr ""
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0018a7e2ce2..9f4d88a0c20 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -7,7 +7,7 @@
<field name="model">hr.expense.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')" string="Expenses Analysis">
+ <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses Analysis">
<field name="date" invisible="1"/>
<field name="employee_id" invisible="1"/>
<field name="user_id" invisible="1"/>