odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]merge with trunk 

bzr revid: kbh@tinyerp.com-20121128051612-ikk4lsa9v0jh76kb
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-11-28 10:46:12 +05:30
parent 6daa367cad 09eccd07dc
commit 1ed7f35860
203 changed files with 9942 additions and 5160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/account/account_invoice.py
View File

@ -457,7 +457,7 @@ class account_invoice(osv.osv):
invoice_addr_id = res['invoice']
p = self.pool.get('res.partner').browse(cr, uid, partner_id)
if company_id:
if p.property_account_receivable.company_id.id != company_id and p.property_account_payable.company_id.id != company_id:
if (p.property_account_receivable.company_id and (p.property_account_receivable.company_id.id != company_id)) and (p.property_account_payable.company_id and (p.property_account_payable.company_id.id != company_id)):
property_obj = self.pool.get('ir.property')
rec_pro_id = property_obj.search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)])
pay_pro_id = property_obj.search(cr,uid,[('name','=','property_account_payable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)])
@ -958,9 +958,14 @@ class account_invoice(osv.osv):
})
date = inv.date_invoice or time.strftime('%Y-%m-%d')
part = inv.partner_id.id
line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part, date, context=ctx)),iml)
#if the chosen partner is not a company and has a parent company, use the parent for the journal entries
#because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
part = inv.partner_id
if part.parent_id and not part.is_company:
part = part.parent_id
line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part.id, date, context=ctx)),iml)
line = self.group_lines(cr, uid, iml, line, inv)

12
addons/account/account_invoice_view.xml
View File

@ -61,7 +61,7 @@
<group>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
</group>
</group>
@ -95,7 +95,7 @@
<field name="name"/>
<field name="sequence"/>
<field name="account_id" groups="account.group_account_user"/>
<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" groups="analytic.group_analytic_accounting"/>
<field name="manual"/>
<field name="amount"/>
<field name="base" readonly="0"/>
@ -199,7 +199,7 @@
domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"
domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>
<field name="quantity"/>
<field name="uos_id" groups="product.group_uom"
on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
@ -229,7 +229,7 @@
<tree editable="bottom" string="Taxes">
<field name="name"/>
<field name="account_id" groups="account.group_account_invoice"/>
<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
<field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" groups="analytic.group_analytic_accounting"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
@ -292,7 +292,7 @@
<form string="Invoice" version="7.0">
<header>
<button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
<button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
<button name="invoice_print" string="Print" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
<button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
<button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
<button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
@ -354,7 +354,7 @@
domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"
domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>
<field name="quantity"/>
<field name="uos_id" groups="product.group_uom"
on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>

39
addons/account/account_move_line.py
View File

@ -166,28 +166,35 @@ class account_move_line(osv.osv):
del data[f]
return data
def _prepare_analytic_line(self, cr, uid, obj_line, context=None):
"""
Prepare the values given at the create() of account.analytic.line upon the validation of a journal item having
an analytic account. This method is intended to be extended in other modules.
:param obj_line: browse record of the account.move.line that triggered the analytic line creation
"""
return {'name': obj_line.name,
'date': obj_line.date,
'account_id': obj_line.analytic_account_id.id,
'unit_amount': obj_line.quantity,
'product_id': obj_line.product_id and obj_line.product_id.id or False,
'product_uom_id': obj_line.product_uom_id and obj_line.product_uom_id.id or False,
'amount': (obj_line.credit or 0.0) - (obj_line.debit or 0.0),
'general_account_id': obj_line.account_id.id,
'journal_id': obj_line.journal_id.analytic_journal_id.id,
'ref': obj_line.ref,
'move_id': obj_line.id,
'user_id': uid,
}
def create_analytic_lines(self, cr, uid, ids, context=None):
acc_ana_line_obj = self.pool.get('account.analytic.line')
for obj_line in self.browse(cr, uid, ids, context=context):
if obj_line.analytic_account_id:
if not obj_line.journal_id.analytic_journal_id:
raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
amt = (obj_line.credit or 0.0) - (obj_line.debit or 0.0)
vals_lines = {
'name': obj_line.name,
'date': obj_line.date,
'account_id': obj_line.analytic_account_id.id,
'unit_amount': obj_line.quantity,
'product_id': obj_line.product_id and obj_line.product_id.id or False,
'product_uom_id': obj_line.product_uom_id and obj_line.product_uom_id.id or False,
'amount': amt,
'general_account_id': obj_line.account_id.id,
'journal_id': obj_line.journal_id.analytic_journal_id.id,
'ref': obj_line.ref,
'move_id': obj_line.id,
'user_id': uid
}
acc_ana_line_obj.create(cr, uid, vals_lines)
vals_line = self._prepare_analytic_line(cr, uid, obj_line, context=context)
acc_ana_line_obj.create(cr, uid, vals_line)
return True
def _default_get_move_form_hook(self, cursor, user, data):

44
addons/account/account_view.xml
View File

@ -1227,6 +1227,7 @@
<field name="model">account.move.line</field>
<field name="arch" type="xml">
<search string="Search Journal Items">
<field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
<field name="date"/>
<filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
<separator/>
@ -1717,8 +1718,8 @@
<field name="search_view_id" ref="view_model_search"/>
</record>
<menuitem
action="action_model_form" id="menu_action_model_form" sequence="5"
parent="account.menu_configuration_misc"/>
action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
parent="account.menu_finance_recurrent_entries"/>
<!--
# Payment Terms
@ -2064,7 +2065,7 @@
<menuitem
id="account_template_folder"
name="Templates"
parent="menu_finance_accounting"
parent="account_account_menu"
groups="account.group_account_manager"/>
<menuitem
id="account_template_taxes"
@ -2083,28 +2084,23 @@
<field name="model">account.account.template</field>
<field name="arch" type="xml">
<form string="Account Template" version="7.0">
<notebook>
<page string="General Information">
<group col="4">
<field name="name"/>
<field name="code"/>
<newline/>
<field name="parent_id"/>
<field name="shortcut"/>
<field name="type"/>
<field name="user_type"/>
<group col="4">
<field name="name"/>
<field name="code"/>
<newline/>
<field name="parent_id"/>
<field name="shortcut"/>
<field name="type"/>
<field name="user_type"/>
<field name="currency_id" groups="base.group_multi_currency"/>
<field name="reconcile"/>
<field name="chart_template_id"/>
</group>
<separator string="Default Taxes"/>
<field name="tax_ids"/>
</page>
<page string="Notes">
<field name="note"/>
</page>
</notebook>
<field name="currency_id" groups="base.group_multi_currency"/>
<field name="reconcile"/>
<field name="chart_template_id"/>
</group>
<separator string="Default Taxes"/>
<field name="tax_ids"/>
<separator string="Notes"/>
<field name="note" placeholder="Internal notes..."/>
</form>
</field>
</record>

37
addons/account/i18n/fr.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-24 10:58+0000\n"
"Last-Translator: Eric Vernichon <evernichon@fiefmanage.ch>\n"
"PO-Revision-Date: 2012-11-26 11:52+0000\n"
"Last-Translator: Numérigraphe <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 05:54+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account
#: code:addons/account/wizard/account_fiscalyear_close.py:41
@ -3399,8 +3399,8 @@ msgid ""
"The quantity is not a legal requirement but is very useful for some reports."
msgstr ""
"La quantité facultative correspondant à cette ligne, par exemple le nombre "
"de produits vendus. La quantité n'est pas obligatoire en droit, mais elle "
"est très utile dans certains rapports."
"d'articles vendus. La quantité n'est pas obligatoire en droit, mais elle est "
"très utile dans certains rapports."
#. module: account
#: view:account.payment.term.line:0
@ -4096,7 +4096,7 @@ msgstr "Continuer"
#: view:account.invoice.report:0
#: field:account.invoice.report,categ_id:0
msgid "Category of Product"
msgstr "Catégorie de produit"
msgstr "Catégorie de produits"
#. module: account
#: code:addons/account/account.py:987
@ -4142,6 +4142,7 @@ msgstr "Détail"
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
msgstr ""
"Cette taxe d'achat sera attribuée par défaut à tous les nouveaux produits."
#. module: account
#: report:account.invoice:0
@ -4769,9 +4770,9 @@ msgid ""
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft supplier invoices."
msgstr ""
"Les coûts analytiques (feuilles de temps, dépenses, achats, ...) proviennent "
"des comptes analytiques. Cela permet d'éditer des factures fournisseurs en "
"état \"brouillon\"."
"Les coûts analytiques (feuilles de temps, achats de certains articles, ...) "
"proviennent des comptes analytiques. Cela permet d'éditer des factures "
"fournisseurs en état \"brouillon\"."
#. module: account
#: view:account.bank.statement:0
@ -4828,7 +4829,7 @@ msgstr ""
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product Unit of Measure"
msgstr ""
msgstr "Unité de mesure d'article"
#. module: account
#: field:res.company,paypal_account:0
@ -5600,7 +5601,7 @@ msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
msgstr ""
"Cochez cette case si le prix que vous utilisez pour le produit et les "
"Cochez cette case si le prix que vous utilisez pour l'article et les "
"factures inclut cette taxe."
#. module: account
@ -6121,7 +6122,7 @@ msgstr "Lignes d'abonnement"
#. module: account
#: field:account.entries.report,quantity:0
msgid "Products Quantity"
msgstr "Quantité de produits"
msgstr "Quantité d'articles"
#. module: account
#: view:account.entries.report:0
@ -9686,7 +9687,7 @@ msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Product Information"
msgstr "Information du produit"
msgstr "Information de l'article"
#. module: account
#: report:account.analytic.account.journal:0
@ -9743,7 +9744,7 @@ msgid ""
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft invoices."
msgstr ""
"Les coûts analytiques (feuilles de temps, quelques produits achetés, ...) "
"Les coûts analytiques (feuilles de temps, certains articles achetés, ...) "
"viennent des comptes analytiques. Ils génèrent des brouillons de facture."
#. module: account
@ -10626,7 +10627,7 @@ msgstr "Factures fournisseur"
#: field:report.account.sales,product_id:0
#: field:report.account_type.sales,product_id:0
msgid "Product"
msgstr "Produit"
msgstr "Article"
#. module: account
#: model:ir.actions.act_window,help:account.action_validate_account_move
@ -11237,7 +11238,7 @@ msgstr "novembre"
#. module: account
#: help:account.invoice.line,account_id:0
msgid "The income or expense account related to the selected product."
msgstr "Le compte de revenu ou de dépense associé au produit sélectionné."
msgstr "Le compte de revenu ou de dépense associé à l'article sélectionné."
#. module: account
#: view:account.config.settings:0
@ -11478,7 +11479,7 @@ msgstr "Plan comptable analytiques"
#. module: account
#: field:account.chart.template,property_account_expense:0
msgid "Expense Account on Product Template"
msgstr "Compte de Dépense sur les Modèles de Produits"
msgstr "Compte de dépense sur les modèles d'article"
#. module: account
#: help:accounting.report,label_filter:0

4
addons/account/i18n/it.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-26 04:41+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

156
addons/account/i18n/nb.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-24 12:49+0000\n"
"PO-Revision-Date: 2012-11-27 20:06+0000\n"
"Last-Translator: Kaare Pettersen <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 05:57+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -310,7 +310,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
msgstr ""
msgstr "Neste kredit notat nummer."
#. module: account
#: help:account.config.settings,module_account_voucher:0
@ -731,7 +731,7 @@ msgstr "Hovedsekvensen må være anderledes en gjeldende"
#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not configured properly."
msgstr ""
msgstr "Dagens valuta er ikke riktig konfigurert."
#. module: account
#: field:account.journal,profit_account_id:0
@ -763,6 +763,10 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p>\n"
"Ingen tidsskriftet elementer funnet.\n"
"</ p>\n"
" "
#. module: account
#: code:addons/account/account.py:1606
@ -826,7 +830,7 @@ msgstr "Debitorkonti"
#. module: account
#: view:account.config.settings:0
msgid "Configure your company bank accounts"
msgstr ""
msgstr "Konfigurer bedriftens bankkonto."
#. module: account
#: constraint:account.move.line:0
@ -964,7 +968,7 @@ msgstr "Kontoanalyse Journal"
#. module: account
#: view:account.invoice:0
msgid "Send by Email"
msgstr ""
msgstr "Send med e-post."
#. module: account
#: help:account.central.journal,amount_currency:0
@ -984,12 +988,12 @@ msgstr "J.C./Move name"
#. module: account
#: view:account.account:0
msgid "Account Code and Name"
msgstr ""
msgstr "Konto kode og navn."
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_new
msgid "created"
msgstr ""
msgstr "Opprettet."
#. module: account
#: selection:account.entries.report,month:0
@ -1052,7 +1056,7 @@ msgstr "Forfall"
#. module: account
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
msgstr ""
msgstr "Kjøp journal."
#. module: account
#: code:addons/account/account.py:1374
@ -1168,7 +1172,7 @@ msgstr "Kode"
#. module: account
#: view:account.config.settings:0
msgid "Features"
msgstr ""
msgstr "Funksjoner."
#. module: account
#: code:addons/account/account.py:2323
@ -1257,7 +1261,7 @@ msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Refund "
msgstr ""
msgstr "Tilbakebetaling. "
#. module: account
#: help:account.config.settings,company_footer:0
@ -1320,7 +1324,7 @@ msgstr "Periodestart"
#. module: account
#: view:account.tax:0
msgid "Refunds"
msgstr ""
msgstr "Tilbakebetaling."
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@ -1390,7 +1394,7 @@ msgstr "Utgående valutakurs"
#. module: account
#: field:account.config.settings,chart_template_id:0
msgid "Template"
msgstr ""
msgstr "Mal."
#. module: account
#: selection:account.analytic.journal,type:0
@ -1565,7 +1569,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_sequence_prefix:0
msgid "Invoice sequence"
msgstr ""
msgstr "Faktura sekvens."
#. module: account
#: model:ir.model,name:account.model_account_entries_report
@ -1588,7 +1592,7 @@ msgstr ""
#. module: account
#: field:account.invoice.report,state:0
msgid "Invoice Status"
msgstr ""
msgstr "Fakturastatus."
#. module: account
#: view:account.invoice.report:0
@ -1864,7 +1868,7 @@ msgstr "Regnskapsåret sekvens"
#. module: account
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
msgstr ""
msgstr "Analytisk regnskap."
#. module: account
#: report:account.overdue:0
@ -2049,7 +2053,7 @@ msgstr ""
#. module: account
#: model:account.journal.view,name:account.account_journal_bank_view
msgid "Bank/Cash Journal View"
msgstr ""
msgstr "Bank/kontanter journal vis."
#. module: account
#: report:account.journal.period.print.sale.purchase:0
@ -2084,7 +2088,7 @@ msgstr ""
#. module: account
#: view:account.period:0
msgid "Duration"
msgstr ""
msgstr "Varighet."
#. module: account
#: view:account.bank.statement:0
@ -2143,7 +2147,7 @@ msgstr "Utkast kontoutdrag"
#. module: account
#: field:account.config.settings,module_account_check_writing:0
msgid "Pay your suppliers by check"
msgstr ""
msgstr "Betal dine leverandører med sjekk."
#. module: account
#: field:account.move.line.reconcile,credit:0
@ -2154,7 +2158,7 @@ msgstr "Kreditbeløp"
#: field:account.bank.statement,message_ids:0
#: field:account.invoice,message_ids:0
msgid "Messages"
msgstr ""
msgstr "Meldinger."
#. module: account
#: view:account.vat.declaration:0
@ -2298,7 +2302,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,currency_id:0
msgid "Default company currency"
msgstr ""
msgstr "Standard selskapet valuta."
#. module: account
#: field:account.invoice,move_id:0
@ -2351,7 +2355,7 @@ msgstr "Gyldig"
#: field:account.bank.statement,message_follower_ids:0
#: field:account.invoice,message_follower_ids:0
msgid "Followers"
msgstr ""
msgstr "Følgere."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_journal
@ -2395,7 +2399,7 @@ msgstr "Avgiftsdefinisjon"
#: view:account.config.settings:0
#: model:ir.actions.act_window,name:account.action_account_config
msgid "Configure Accounting"
msgstr ""
msgstr "konfigurere regnskap."
#. module: account
#: field:account.invoice.report,uom_name:0
@ -2416,7 +2420,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
#, python-format
msgid "Good job!"
msgstr ""
msgstr "Bra jobba!"
#. module: account
#: field:account.config.settings,module_account_asset:0
@ -2511,7 +2515,7 @@ msgstr "Åpne poster"
#. module: account
#: field:account.config.settings,purchase_refund_sequence_next:0
msgid "Next supplier credit note number"
msgstr ""
msgstr "Neste leverandør kredit notat nummer."
#. module: account
#: field:account.automatic.reconcile,account_ids:0
@ -2551,12 +2555,12 @@ msgstr "Konto for avgifter"
#: code:addons/account/account_cash_statement.py:256
#, python-format
msgid "You do not have rights to open this %s journal !"
msgstr ""
msgstr "Du har ikke rett til å åpne denne %s journalen !"
#. module: account
#: model:res.groups,name:account.group_supplier_inv_check_total
msgid "Check Total on supplier invoices"
msgstr ""
msgstr "Sjekk total på leverandør fakturaer."
#. module: account
#: selection:account.invoice,state:0
@ -2777,7 +2781,7 @@ msgstr "skattemessige posisjoner"
#: code:addons/account/account_move_line.py:592
#, python-format
msgid "You cannot create journal items on a closed account %s %s."
msgstr ""
msgstr "Du kan ikke opprette journal elementer på en lukket konto% s% s."
#. module: account
#: field:account.period.close,sure:0
@ -2812,7 +2816,7 @@ msgstr "Kunde fakturakladd"
#. module: account
#: view:product.category:0
msgid "Account Properties"
msgstr ""
msgstr "Konto egenskaper."
#. module: account
#: view:account.partner.reconcile.process:0
@ -2822,7 +2826,7 @@ msgstr "Avstemming av partner"
#. module: account
#: view:account.analytic.line:0
msgid "Fin. Account"
msgstr ""
msgstr "Fin. Konto."
#. module: account
#: field:account.tax,tax_code_id:0
@ -2899,7 +2903,7 @@ msgstr "EXJ"
#. module: account
#: view:account.invoice.refund:0
msgid "Create Credit Note"
msgstr ""
msgstr "Opprett kredit notat."
#. module: account
#: field:product.template,supplier_taxes_id:0
@ -2997,7 +3001,7 @@ msgstr "Kontodimensjon"
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
msgstr ""
msgstr "Standard omsetnings skatt."
#. module: account
#: view:account.account:0
@ -3171,7 +3175,7 @@ msgstr "Kommuniksjonstype"
#. module: account
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
msgstr "Konto og periode må tilhøre samme selskap."
#. module: account
#: constraint:res.currency:0
@ -3209,7 +3213,7 @@ msgstr "Avskrivningsbeløp"
#: field:account.bank.statement,message_unread:0
#: field:account.invoice,message_unread:0
msgid "Unread Messages"
msgstr ""
msgstr "Uleste meldinger."
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@ -3218,12 +3222,14 @@ msgid ""
"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state."
msgstr ""
"Valgt faktura (e) kan ikke bekreftes som de ikke er i \"Kladd\" eller \"pro-"
"forma 'tilstand."
#. module: account
#: code:addons/account/account.py:1114
#, python-format
msgid "You should choose the periods that belong to the same company."
msgstr ""
msgstr "Du bør velge de periodene som tilhører samme selskap."
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@ -3236,17 +3242,17 @@ msgstr "Salg pr. konto"
#: code:addons/account/account.py:1471
#, python-format
msgid "You cannot delete a posted journal entry \"%s\"."
msgstr ""
msgstr "Du kan ikke slette en publisert bilagsregistrering \"% s\"."
#. module: account
#: view:account.invoice:0
msgid "Accounting Period"
msgstr ""
msgstr "Regnskaps periode."
#. module: account
#: field:account.config.settings,sale_journal_id:0
msgid "Sale journal"
msgstr ""
msgstr "Salgs journal."
#. module: account
#: code:addons/account/account.py:2323
@ -3342,7 +3348,7 @@ msgstr "Obligatorisk"
#. module: account
#: field:wizard.multi.charts.accounts,only_one_chart_template:0
msgid "Only One Chart Template Available"
msgstr ""
msgstr "Bare en diagram mal tilgjengelig."
#. module: account
#: view:account.chart.template:0
@ -3355,7 +3361,7 @@ msgstr "Kostnadskonto"
#: field:account.bank.statement,message_summary:0
#: field:account.invoice,message_summary:0
msgid "Summary"
msgstr ""
msgstr "Oppsummering."
#. module: account
#: help:account.invoice,period_id:0
@ -3477,7 +3483,7 @@ msgstr "Velg regnskapsår"
#: view:account.config.settings:0
#: view:account.installer:0
msgid "Date Range"
msgstr ""
msgstr "Dato område."
#. module: account
#: view:account.period:0
@ -3529,7 +3535,7 @@ msgstr ""
#: code:addons/account/account.py:2650
#, python-format
msgid "There is no parent code for the template account."
msgstr ""
msgstr "Det er ingen overordnede kode for denne malen kontoen."
#. module: account
#: help:account.chart.template,code_digits:0
@ -3613,12 +3619,12 @@ msgstr "Elektonisk fil"
#. module: account
#: constraint:res.partner:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "Feil: Ugyldig ean kode."
#. module: account
#: field:account.config.settings,has_chart_of_accounts:0
msgid "Company has a chart of accounts"
msgstr ""
msgstr "Selskapet har en konto plan."
#. module: account
#: view:account.payment.term.line:0
@ -3634,7 +3640,7 @@ msgstr "Konto Partner ledger"
#: code:addons/account/account_invoice.py:1321
#, python-format
msgid "%s <b>created</b>."
msgstr ""
msgstr "%s <b>Opprettet</b>."
#. module: account
#: help:account.journal.column,sequence:0
@ -3644,7 +3650,7 @@ msgstr "Gir sekvensen for å merke kolonne."
#. module: account
#: view:account.period:0
msgid "Account Period"
msgstr ""
msgstr "Konto periode."
#. module: account
#: help:account.account,currency_id:0
@ -3672,7 +3678,7 @@ msgstr "Kontoplanmal"
#. module: account
#: view:account.bank.statement:0
msgid "Transactions"
msgstr ""
msgstr "Transaksjoner."
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
@ -3847,6 +3853,10 @@ msgid ""
"You can create one in the menu: \n"
"Configuration/Journals/Journals."
msgstr ""
"Kan ikke finne noen konto journal of% s for denne bedriften.\n"
"\n"
"Du kan opprette en i menyen:\n"
"Konfigurasjon / Tidsskrifter / tidsskrifter."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
@ -3886,7 +3896,7 @@ msgstr "år"
#. module: account
#: field:account.config.settings,date_start:0
msgid "Start date"
msgstr ""
msgstr "Starts dato."
#. module: account
#: view:account.invoice.refund:0
@ -3934,7 +3944,7 @@ msgstr "Kontoplan"
#: view:cash.box.out:0
#: model:ir.actions.act_window,name:account.action_cash_box_out
msgid "Take Money Out"
msgstr ""
msgstr "Ta ut penger."
#. module: account
#: report:account.vat.declaration:0
@ -4055,7 +4065,7 @@ msgstr "Detaljert"
#. module: account
#: help:account.config.settings,default_purchase_tax:0
msgid "This purchase tax will be assigned by default on new products."
msgstr ""
msgstr "Kjøpet skatt vil bli tildelt som standard på nye produkter."
#. module: account
#: report:account.invoice:0
@ -4083,7 +4093,7 @@ msgstr "(Hvis du ikke velger periode vil alle åpne perioder bli valgt)"
#. module: account
#: model:ir.model,name:account.model_account_journal_cashbox_line
msgid "account.journal.cashbox.line"
msgstr ""
msgstr "konto.journal.Pengeboks.linje."
#. module: account
#: model:ir.model,name:account.model_account_partner_reconcile_process
@ -4223,7 +4233,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_check_supplier_invoice_total:0
msgid "Check the total of supplier invoices"
msgstr ""
msgstr "Sjekk totalen av leverandør fakturaer."
#. module: account
#: view:account.tax:0
@ -4310,7 +4320,7 @@ msgstr "Multiplikasjonsfaktor Skatt kode"
#. module: account
#: field:account.config.settings,complete_tax_set:0
msgid "Complete set of taxes"
msgstr ""
msgstr "Fullfør sett av skatter."
#. module: account
#: field:account.account,name:0
@ -4338,7 +4348,7 @@ msgstr ""
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_paid
msgid "paid"
msgstr ""
msgstr "Betalt."
#. module: account
#: field:account.move.line,date:0
@ -4372,7 +4382,7 @@ msgstr "Standardkoder"
#: help:account.bank.statement,message_ids:0
#: help:account.invoice,message_ids:0
msgid "Messages and communication history"
msgstr ""
msgstr "Meldinger og kommunikasjon historie."
#. module: account
#: help:account.journal,analytic_journal_id:0
@ -4413,7 +4423,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:1236
#, python-format
msgid "You cannot use an inactive account."
msgstr ""
msgstr "Du kan ikke bruke en inaktiv konto."
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
@ -4481,7 +4491,7 @@ msgstr "tittel"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft credit note"
msgstr ""
msgstr "Opprett en kladd kredit notat."
#. module: account
#: view:account.invoice:0
@ -4513,7 +4523,7 @@ msgstr "Eiendeler"
#. module: account
#: view:account.config.settings:0
msgid "Accounting & Finance"
msgstr ""
msgstr "Regnskap & Finans."
#. module: account
#: view:account.invoice.confirm:0
@ -4540,7 +4550,7 @@ msgstr "(Faktura må settes ikke-avstemt før den kan åpnes)"
#. module: account
#: field:account.tax,account_analytic_collected_id:0
msgid "Invoice Tax Analytic Account"
msgstr ""
msgstr "Faktura skatt analytisk konto."
#. module: account
#: field:account.chart,period_from:0
@ -4701,6 +4711,8 @@ msgid ""
"Error!\n"
"You cannot create recursive Tax Codes."
msgstr ""
"Feil!\n"
"Du kan ikke opprette rekursive skatte koder."
#. module: account
#: constraint:account.period:0
@ -4708,6 +4720,8 @@ msgid ""
"Error!\n"
"The duration of the Period(s) is/are invalid."
msgstr ""
"Feil!\n"
"Varigheten av perioden (e) er / er ugyldig."
#. module: account
#: field:account.entries.report,month:0
@ -4723,7 +4737,7 @@ msgstr "Måned"
#. module: account
#: field:account.config.settings,purchase_sequence_prefix:0
msgid "Supplier invoice sequence"
msgstr ""
msgstr "Leverandør faktura sekvens."
#. module: account
#: code:addons/account/account_invoice.py:571
@ -4855,7 +4869,7 @@ msgstr "Vis modus"
#. module: account
#: selection:account.move.line,state:0
msgid "Balanced"
msgstr ""
msgstr "Balansert."
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
@ -4873,7 +4887,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Set Your Accounting Options"
msgstr ""
msgstr "Sett dine regnskaps tillegg."
#. module: account
#: model:ir.model,name:account.model_account_chart
@ -4964,7 +4978,7 @@ msgstr "Navnet på perioden må være unikt per selskap!"
#. module: account
#: help:wizard.multi.charts.accounts,currency_id:0
msgid "Currency as per company's country."
msgstr ""
msgstr "Valuta som per selskapets land."
#. module: account
#: view:account.tax:0
@ -5005,6 +5019,8 @@ msgid ""
"Error!\n"
"You cannot create an account which has parent account of different company."
msgstr ""
"Feil!\n"
"Du kan ikke opprette en konto som har overordnede hensyn til ulike selskap."
#. module: account
#: code:addons/account/account_invoice.py:615
@ -5136,7 +5152,7 @@ msgstr "Annulert faktura"
#. module: account
#: view:account.invoice:0
msgid "My Invoices"
msgstr ""
msgstr "Mine fakturaer."
#. module: account
#: selection:account.bank.statement,state:0
@ -5146,7 +5162,7 @@ msgstr "Ny"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Sale Tax"
msgstr ""
msgstr "Selg skatt."
#. module: account
#: field:account.tax,ref_tax_code_id:0
@ -5221,7 +5237,7 @@ msgstr "SAJ"
#. module: account
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
msgstr ""
msgstr "Du kan ikke opprette en analytisk linje på vis konto."
#. module: account
#: view:account.aged.trial.balance:0
@ -5261,7 +5277,7 @@ msgstr ""
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "or"
msgstr ""
msgstr "Eller."
#. module: account
#: view:account.invoice.report:0
@ -5354,7 +5370,7 @@ msgstr ""
#: field:account.invoice,message_comment_ids:0
#: help:account.invoice,message_comment_ids:0
msgid "Comments and emails"
msgstr ""
msgstr "Kommentarer og E-poster."
#. module: account
#: view:account.bank.statement:0
@ -5389,7 +5405,7 @@ msgstr "Aktiv"
#: view:account.bank.statement:0
#: field:account.journal,cash_control:0
msgid "Cash Control"
msgstr ""
msgstr "Kontant kontroll."
#. module: account
#: field:account.analytic.balance,date2:0

6
addons/account/product_view.xml
View File

@ -7,14 +7,14 @@
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Accounting" groups="account.group_account_user">
<page string="Accounting" groups="account.group_account_invoice">
<group name="properties">
<group>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="account.group_account_user"/>
<field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
</group>
<group>
<field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" />
<field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="account.group_account_user"/>
<field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
</group>
</group>

2
addons/account/report/account_central_journal.py
View File

@ -103,6 +103,6 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return True
return data['form']['amount_currency']
report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='internal')
report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='external')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

44
addons/account/report/account_invoice_report.py
View File

@ -102,11 +102,11 @@ class account_invoice_report(osv.osv):
'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
}
_order = 'date desc'
def init(self, cr):
tools.drop_view_if_exists(cr, 'account_invoice_report')
cr.execute("""
create or replace view account_invoice_report as (
select min(ail.id) as id,
def _select(self):
select_str = """
SELECT min(ail.id) as id,
ai.date_invoice as date,
to_char(ai.date_invoice, 'YYYY') as year,
to_char(ai.date_invoice, 'MM') as month,
@ -183,15 +183,30 @@ class account_invoice_report(osv.osv):
where a.id=ai.id)
ELSE 1
END) / cr.rate as residual
from account_invoice_line as ail
"""
return select_str
def _where(self):
where_str = """
WHERE cr.id in (select id from res_currency_rate cr2 where (cr2.currency_id = ai.currency_id)
and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
"""
return where_str
def _from(self):
from_str = """
FROM account_invoice_line as ail
left join account_invoice as ai ON (ai.id=ail.invoice_id)
left join product_product pr on (pr.id=ail.product_id)
left join product_template pt on (pt.id=pr.product_tmpl_id)
left join product_uom u on (u.id=ail.uos_id),
res_currency_rate cr
where cr.id in (select id from res_currency_rate cr2 where (cr2.currency_id = ai.currency_id)
and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
group by ail.product_id,
"""
return from_str
def _group_by(self):
group_by_str = """
GROUP BY ail.product_id,
ai.date_invoice,
ai.id,
cr.rate,
@ -218,8 +233,15 @@ class account_invoice_report(osv.osv):
ai.amount_total,
u.uom_type,
u.category_id
)
""")
"""
return group_by_str
def init(self, cr):
# self._table = account_invoice_report
tools.drop_view_if_exists(cr, self._table)
cr.execute("CREATE or REPLACE VIEW %s as (%s %s %s %s)" % (
self._table,
self._select(), self._from(), self._where(), self._group_by()))
account_invoice_report()

4
addons/account/report/account_journal.py
View File

@ -195,7 +195,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
return 'Reference Number'
return 'Date'
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='internal')
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='internal')
report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

10
addons/account/test/account_validate_account_move.yml
View File

@ -32,8 +32,8 @@
import time
date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu',
'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False,
'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_eaction_account_moves_sale')],
'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_action_account_moves_all')],
'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12'))
vals = {
@ -62,11 +62,11 @@
!python {model: account.move.line}: |
ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1,
'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False,
'visible_id': 1, 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0,
'active_id': ref('menu_eaction_account_moves_sale')})
'visible_id': 1, 'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0,
'active_id': ref('menu_action_account_moves_all')})
assert bal, 'Balance has not been computed correctly'
-
I check that Initially account move state is "Draft"

3
addons/account/wizard/account_automatic_reconcile_view.xml
View File

@ -56,6 +56,9 @@
<field name="reconciled"/>
<field name="unreconciled"/>
</group>
<footer>
<button string="Close" class="oe_highlight" special="cancel"/>
</footer>
</form>
</field>
</record>

46
addons/account/wizard/account_move_journal_view.xml
View File

@ -12,51 +12,5 @@
</field>
</record>
<record id="action_account_moves_sale" model="ir.actions.act_window">
<field name="name">Journal Items</field>
<field name="res_model">account.move.journal</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_account_move_journal_form"/>
<field name="context">{'journal_type':'sale','view_mode':False}</field>
<field name="target">new</field>
<field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable".</field>
</record>
<menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
<record id="action_account_moves_purchase" model="ir.actions.act_window">
<field name="name">Journal Items</field>
<field name="res_model">account.move.journal</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_account_move_journal_form"/>
<field name="context">{'journal_type':'purchase','view_mode':False}</field>
<field name="target">new</field>
<field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
</record>
<menuitem action="action_account_moves_purchase"
id="menu_eaction_account_moves_purchase"
parent="menu_finance_payables"
icon="STOCK_JUSTIFY_FILL"
sequence="16"
groups="group_account_user,group_account_manager"/>
<record id="action_account_moves_bank" model="ir.actions.act_window">
<field name="name">Journal Items</field>
<field name="res_model">account.move.journal</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_account_move_journal_form"/>
<field name="context">{'journal_type':'bank','view_mode':False}</field>
<field name="target">new</field>
<field name="help">This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments.</field>
</record>
<menuitem
action="action_account_moves_bank"
icon="STOCK_JUSTIFY_FILL"
id="menu_action_account_moves_bank"
parent="account.menu_finance_bank_and_cash"
sequence="16"
groups="group_account_user,group_account_manager"
/>
</data>
</openerp>

12
addons/account/wizard/account_use_model_view.xml
View File

@ -19,18 +19,6 @@
</field>
</record>
<record id="action_view_account_use_model" model="ir.actions.act_window">
<field name="name">Manual Recurring</field>
<field name="res_model">account.use.model</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_use_model"/>
<field name="target">new</field>
<field name="context">{'model_line':'model_line'}</field>
</record>
<menuitem name="Manual Recurring" action="action_view_account_use_model" id="menu_action_manual_recurring" sequence="10" parent="account.menu_finance_recurrent_entries"/>
<record id="view_account_use_model_create_entry" model="ir.ui.view">
<field name="name">account.use.model.create.entry.form</field>
<field name="model">account.use.model</field>

41
addons/account_accountant/i18n/es_MX.po
View File

@ -1,39 +1,24 @@
# Spanish translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# Spanish (Mexico) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-26 08:18+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: Spanish <es@li.org>\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
"PO-Revision-Date: 2012-11-26 08:57+0000\n"
"Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
"<anegrinm@gmail.com>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_accountant
#: model:ir.module.module,description:account_accountant.module_meta_information
msgid ""
"\n"
"This module gives the admin user the access to all the accounting features "
"like the journal\n"
"items and the chart of accounts.\n"
" "
msgstr ""
"\n"
"Este módulo proporciona al usuario admin el acceso a todas las "
"funcionalidades de contabilidad como\n"
"los asientos y el plan contable.\n"
" "
#. module: account_accountant
#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
msgid "Accountant"
msgstr "Contable"
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
msgid "Open Accounting Menu"
msgstr "Menú Contabilidad"

10
addons/account_accountant/i18n/nl_BE.po
View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
"PO-Revision-Date: 2010-12-17 09:40+0000\n"
"Last-Translator: Niels Huylebroeck <Unknown>\n"
"PO-Revision-Date: 2012-11-27 13:16+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
msgid "Open Accounting Menu"
msgstr ""
msgstr "Menu Boekhouding openen"
#~ msgid "Accountant"
#~ msgstr "Accountant"

5
addons/account_analytic_analysis/account_analytic_analysis.py
View File

@ -296,11 +296,14 @@ class account_analytic_account(osv.osv):
def _timesheet_ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
lines_obj = self.pool.get('account.analytic.line')
res = {}
inv_ids = []
for account in self.browse(cr, uid, ids, context=context):
res[account.id] = 0.0
line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'general')], context=context)
for line in lines_obj.browse(cr, uid, line_ids, context=context):
res[account.id] += line.invoice_id.amount_untaxed
if line.invoice_id not in inv_ids:
inv_ids.append(line.invoice_id)
res[account.id] += line.invoice_id.amount_untaxed
return res
def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):

5
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -60,14 +60,13 @@
or view
</span>
<span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
<span attrs="{'invisible': ['|',('fix_price_to_invoice','&lt;&gt;',0.0 ),('partner_id','=',False)]}" class="oe_grey">
No order to invoice, create
</span>
<button name="%(action_sales_order)d" string="Sale Orders"
type="action"
class="oe_link"
context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
/>
/></span>
</td>
</tr><tr>
<td class="oe_timesheet_grey">

841
addons/account_analytic_analysis/i18n/es_MX.po
View File

@ -1,91 +1,46 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_analytic_analysis
# Spanish (Mexico) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-13 09:42+0000\n"
"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
"Language-Team: \n"
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-27 23:22+0000\n"
"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:25+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_invoiced:0
msgid ""
"Number of hours that can be invoiced plus those that already have been "
"invoiced."
msgstr ""
"Número de horas que pueden ser facturadas más aquellas que ya han sido "
"facturadas."
#: view:account.analytic.account:0
msgid "No order to invoice, create"
msgstr "No existe orden a facturar"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_ca:0
msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
msgstr ""
"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
#: view:account.analytic.account:0
msgid "Group By..."
msgstr "Agrupar por..."
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours:0
msgid "Computed using the formula: Maximum Quantity - Hours Tot."
msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales."
#: view:account.analytic.account:0
msgid "To Invoice"
msgstr "Para facturar"
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
#, python-format
msgid "AccessError"
msgstr "Error de acceso"
#: view:account.analytic.account:0
msgid "Remaining"
msgstr "Restante"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
msgid "Date of the last invoice created for this analytic account."
msgstr "Fecha de la última factura creada para esta cuenta analítica."
#. module: account_analytic_analysis
#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
msgid ""
"\n"
"This module is for modifying account analytic view to show\n"
"important data to project manager of services companies.\n"
"Adds menu to show relevant information to each manager..\n"
"\n"
"You can also view the report of account analytic summary\n"
"user-wise as well as month wise.\n"
msgstr ""
"\n"
"Este módulo modifica la vista de cuenta analítica para mostrar\n"
"datos importantes para el director de proyectos en empresas de servicios.\n"
"Añade menú para mostrar información relevante para cada director.\n"
"\n"
"También puede ver el informe del resumen contable analítico\n"
"a nivel de usuario, así como a nivel mensual.\n"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
msgid "Last Invoice Date"
msgstr "Fecha última factura"
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
msgid "Computed using the formula: Theorial Revenue - Total Costs"
msgstr "Calculado usando la fórmula: Ingresos teóricos - Costes totales"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin_rate:0
msgid "Real Margin Rate (%)"
msgstr "Tasa de margen real (%)"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
msgid "Theoretical Revenue"
msgstr "Ingresos teóricos"
#: view:account.analytic.account:0
msgid "Contracts in progress"
msgstr "Contratos en progreso"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_invoiced_date:0
@ -93,59 +48,13 @@ msgid ""
"If invoice from the costs, this is the date of the latest work or cost that "
"have been invoiced."
msgstr ""
"Si factura a partir de los costes, ésta es la fecha del último trabajo o "
"coste que se ha facturado."
#. module: account_analytic_analysis
#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
msgid "Billing"
msgstr "Facturación"
"Si factura a partir de los costos, ésta es la fecha del último trabajo o "
"costo que se ha facturado."
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_date:0
msgid "Date of Last Cost/Work"
msgstr "Fecha del último coste/trabajo"
#. module: account_analytic_analysis
#: field:account.analytic.account,total_cost:0
msgid "Total Costs"
msgstr "Costes totales"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_quantity:0
msgid ""
"Number of hours you spent on the analytic account (from timesheet). It "
"computes on all journal of type 'general'."
msgstr ""
"Cantidad de horas que dedica a la cuenta analítica (desde horarios). Calcula "
"en todos los diarios del tipo 'general'."
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_hours:0
msgid "Remaining Hours"
msgstr "Horas restantes"
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
msgid "Theoretical Margin"
msgstr "Márgen teórico"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_theorical:0
msgid ""
"Based on the costs you had on the project, what would have been the revenue "
"if all these costs have been invoiced at the normal sale price provided by "
"the pricelist."
msgstr ""
"Basado en los costes que tenía en el proyecto, lo que habría sido el "
"ingreso si todos estos costes se hubieran facturado con el precio de venta "
"normal proporcionado por la tarifa."
#. module: account_analytic_analysis
#: field:account.analytic.account,user_ids:0
#: field:account_analytic_analysis.summary.user,user:0
msgid "User"
msgstr "Usuario"
msgstr "Fecha del último costo/trabajo"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_to_invoice:0
@ -153,71 +62,194 @@ msgid "Uninvoiced Amount"
msgstr "Importe no facturado"
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin:0
msgid "Computed using the formula: Invoiced Amount - Total Costs."
msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
#: view:account.analytic.account:0
msgid ""
"When invoicing on timesheet, OpenERP uses the\n"
" pricelist of the contract which uses the price\n"
" defined on the product related to each employee "
"to\n"
" define the customer invoice price rate."
msgstr ""
"Cuando se factura la Hoja de trabajo, OpenERP usa la\n"
" lista de precios del contracto que a su vez usa "
"el precio\n"
" definido en el producto relacionado a cada "
"empleado para\n"
" definir el precio de la factura del cliente."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0
msgid "Uninvoiced Hours"
msgstr "Horas no facturadas"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_date:0
msgid "Date of the latest work done on this account."
msgstr "Fecha del último trabajo realizado en esta cuenta."
#. module: account_analytic_analysis
#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
msgid "report_account_analytic"
msgstr "Informes contabilidad analítica"
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
msgid "Hours Summary by User"
msgstr "Resumen de horas por usuario"
#: view:account.analytic.account:0
msgid "⇒ Invoice"
msgstr "Facturar"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
msgid "Invoiced Amount"
msgstr "Importe facturado"
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
#, python-format
msgid "You try to bypass an access rule (Document type: %s)."
msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)."
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_invoiced_date:0
msgid "Date of Last Invoiced Cost"
msgstr "Fecha del último coste facturado"
msgstr "Fecha del último costo facturado"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_invoiced:0
msgid "Invoiced Hours"
msgstr "Horas facturadas"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin:0
msgid "Real Margin"
msgstr "Margen real"
#. module: account_analytic_analysis
#: constraint:account.analytic.account:0
msgid ""
"Error! The currency has to be the same as the currency of the selected "
"company"
msgstr ""
"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
"seleccionada"
#: help:account.analytic.account,fix_price_to_invoice:0
msgid "Sum of quotations for this contract."
msgstr "Suma de las cotizaciones para este contrato"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
msgid "Total customer invoiced amount for this account."
msgstr "Importe total facturado al cliente para esta cuenta."
#. module: account_analytic_analysis
#: help:account.analytic.account,timesheet_ca_invoiced:0
msgid "Sum of timesheet lines invoiced for this contract."
msgstr ""
"Suma de las lineas de la hoja de trabajo facturadas para este contrato."
#. module: account_analytic_analysis
#: help:account.analytic.account,revenue_per_hour:0
msgid "Computed using the formula: Invoiced Amount / Total Time"
msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts not assigned"
msgstr "No tiene contratos asignados"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Partner"
msgstr "Empresa"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts that are not assigned to an account manager."
msgstr "Contratos que no han sido asignados a un gerente de cuenta"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to define a new contract.\n"
" </p><p>\n"
" You will find here the contracts to be renewed because the\n"
" end date is passed or the working effort is higher than the\n"
" maximum authorized one.\n"
" </p><p>\n"
" OpenERP automatically sets contracts to be renewed in a "
"pending\n"
" state. After the negociation, the salesman should close or "
"renew\n"
" pending contracts.\n"
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click para definir un nuevo contrato.\n"
" </p><p>\n"
" Aquí encontrará los contratos que serán renovados a los que "
"\n"
" la fecha ha expirado o la cantidad de trabajo es mayor que "
"el \n"
" máximo autorizado.\n"
" </p><p>\n"
" OpenERP cambia automaticamente los contratos a ser renovados "
"a estado pendiente.\n"
" Despues de negociar, el vendedor deve cerrar o renovar "
"contratos pendientes.\n"
" </p>\n"
" "
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "End Date"
msgstr "Fecha de término"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_non_invoiced:0
msgid ""
"Number of time (hours/days) (from journal of type 'general') that can be "
"invoiced if you invoice based on analytic account."
msgstr ""
"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
"facturados si su factura está basada en cuentas analíticas"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours_to_invoice:0
msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
msgstr "Calculado usando la formula: Tiempo Máximo - Tiempo total facturado"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Expected"
msgstr "Esperado"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
#: field:account_analytic_analysis.summary.month,account_id:0
#: field:account_analytic_analysis.summary.user,account_id:0
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
msgid "Analytic Account"
msgstr "Cuenta Analítica"
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
msgid "Computed using the formula: Theoretical Revenue - Total Costs"
msgstr "Calculado utilizando la formula: Ingresos Teóricos - Costos totales"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_invoiced:0
msgid "Invoiced Time"
msgstr "Tiempo facturado"
#. module: account_analytic_analysis
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
msgstr "Error! No es posible crear cuentas analíticas recursivas."
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin_rate:0
msgid "Real Margin Rate (%)"
msgstr "Tasa de margen real (%)"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours:0
msgid "Computed using the formula: Maximum Time - Total Worked Time"
msgstr ""
"Calculado utilizando la formula: Tiempo Maximo - Tiempo Total Trabajado"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_quantity:0
msgid ""
"Number of time you spent on the analytic account (from timesheet). It "
"computes quantities on all journal of type 'general'."
msgstr ""
"Cantidad de tiempo que utilizaste en la cuenta analítica (Hoja de trabajo). "
"Calcula cantidades en todos los diarios de tipo 'General'."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Nothing to invoice, create"
msgstr "Nada por facturar"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
msgid "Template of Contract"
msgstr "Plantilla de contrato"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
msgid "Total Worked Time"
msgstr "Tiempo total trabajado"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin:0
msgid "Real Margin"
msgstr "Margen real"
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
msgid "Hours summary by month"
@ -229,18 +261,346 @@ msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_non_invoiced:0
msgid ""
"Number of hours (from journal of type 'general') that can be invoiced if you "
"invoice based on analytic account."
msgstr ""
"Número de horas (desde diario de tipo 'general') que pueden ser facturadas "
"si factura basado en contabilidad analítica."
#: view:account.analytic.account:0
msgid "or view"
msgstr "o vista"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Analytic accounts"
msgstr "Cuentas analíticas"
msgid "Parent"
msgstr "Padre"
#. module: account_analytic_analysis
#: field:account.analytic.account,month_ids:0
#: field:account_analytic_analysis.summary.month,month:0
msgid "Month"
msgstr "Mes"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
msgid "Time & Materials to Invoice"
msgstr "Tiempo y materiales a facturar."
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
msgid "Contracts"
msgstr "Contratos"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Start Date"
msgstr "Fecha inicial"
#. module: account_analytic_analysis
#: help:account.analytic.account,total_cost:0
msgid ""
"Total of costs for this account. It includes real costs (from invoices) and "
"indirect costs, like time spent on timesheets."
msgstr ""
"Costos totales para esta cuenta. Incluye costos reales (desde facturas) y "
"costos indirectos, como el tiempo empleado en hojas de trabajo (horarios)."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid ""
"The contracts to be renewed because the deadline is passed or the working "
"hours are higher than the allocated hours"
msgstr ""
"El contrato necesita ser renovado porque la fecha de finalización ha "
"terminado o las horas trabajadas son más que las asignadas"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Pending contracts to renew with your customer"
msgstr "Contratos pendientes para renovar con el cliente"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Timesheets"
msgstr "Hojas de trabajo"
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
#, python-format
msgid "Sale Order Lines of %s"
msgstr "Lineas de venta para %s"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Pending"
msgstr "Pendiente"
#. module: account_analytic_analysis
#: field:account.analytic.account,is_overdue_quantity:0
msgid "Overdue Quantity"
msgstr "Cantidad sobrepasada"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Status"
msgstr "Estado"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
msgid "Theoretical Revenue"
msgstr "Ingresos teóricos"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "To Renew"
msgstr "Para renovar"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid ""
"A contract in OpenERP is an analytic account having a partner set on it."
msgstr ""
"Un contrato en OpenERP es una cuenta analítica que tiene un cliente asignado."
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
msgid "Sales Orders"
msgstr "Orden de Venta"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
msgid "If invoice from the costs, this is the date of the latest invoiced."
msgstr "Si factura desde costos, esta es la fecha de lo último facturado"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_theorical:0
msgid ""
"Based on the costs you had on the project, what would have been the revenue "
"if all these costs have been invoiced at the normal sale price provided by "
"the pricelist."
msgstr ""
"Basado en los costes que tenía en el proyecto, lo que habría sido el "
"ingreso si todos estos costes se hubieran facturado con el precio de venta "
"normal proporcionado por la lista de precios."
#. module: account_analytic_analysis
#: field:account.analytic.account,user_ids:0
#: field:account_analytic_analysis.summary.user,user:0
msgid "User"
msgstr "Usuario"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click here to create a template of contract.\n"
" </p><p>\n"
" Templates are used to prefigure contract/project that \n"
" can be selected by the salespeople to quickly configure "
"the\n"
" terms and conditions of the contract.\n"
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click aquí para crear una plantilla de contrato.\n"
" </p><p>\n"
" Las plantillas son utilizadas para pre-configurar "
"contratos/proyectos que \n"
" que pueden ser seleccionados por los agentes de ventas "
"para configurar rápidamente los\n"
" términos y condiciones del contrato.\n"
" </p>\n"
" "
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
msgid "Hours Summary by User"
msgstr "Resumen de horas por usuario"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contract"
msgstr "Contrato"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Invoiced"
msgstr "Facturado"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_invoiced:0
msgid ""
"Number of time (hours/days) that can be invoiced plus those that already "
"have been invoiced."
msgstr ""
"Cantidad de tiempo(horas/días) que pueden ser facturadas más las que ya han "
"sido facturadas."
#. module: account_analytic_analysis
#: field:account.analytic.account,revenue_per_hour:0
msgid "Revenue per Time (real)"
msgstr "Beneficio por tiempo(real)"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to create a new contract.\n"
" </p><p>\n"
" Use contracts to follow tasks, issues, timesheets or "
"invoicing based on\n"
" work done, expenses and/or sales orders. OpenERP will "
"automatically manage\n"
" the alerts for the renewal of the contracts to the right "
"salesperson.\n"
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click aquí para crear un nuevo contrato.\n"
" </p><p>\n"
" Use contratos para dar seguimiento a tareas, problemas, "
"hojas de trabajo o facturacion basada en \n"
" trabajos realizados, gastos y/o ordenes de venta. "
"OpenERP maneja automáticamente alertas\n"
" para la renovación de contratos a la persona de ventas "
"indicada.\n"
" </p>\n"
" "
#. module: account_analytic_analysis
#: field:account.analytic.account,toinvoice_total:0
msgid "Total to Invoice"
msgstr "Total a facturar"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Sale Orders"
msgstr "Pedidos de venta"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Open"
msgstr "Abierta"
#. module: account_analytic_analysis
#: field:account.analytic.account,invoiced_total:0
msgid "Total Invoiced"
msgstr "Total Facturado"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_ca:0
msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
msgstr ""
"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Responsible"
msgstr "Responsable"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
msgid "Last Invoice Date"
msgstr "Ultima fecha de factura"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
msgid ""
"<p>\n"
" You will find here timesheets and purchases you did for\n"
" contracts that can be reinvoiced to the customer. If you "
"want\n"
" to record new activities to invoice, you should use the "
"timesheet\n"
" menu instead.\n"
" </p>\n"
" "
msgstr ""
"<p>\n"
" Encontrara aqui las hojas de trabajo y compras que ha "
"realizado para\n"
" contratos que pueden ser refacturados al cliente. Si desea "
"agregar \n"
" nuevas lineas para facturar, debe utilizar el menú de hoja "
"de trabajo.\n"
" </p>\n"
" "
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0
msgid "Uninvoiced Time"
msgstr "Tiempo sin facturar"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Invoicing"
msgstr "Facturación"
#. module: account_analytic_analysis
#: field:account.analytic.account,total_cost:0
msgid "Total Costs"
msgstr "Costos totales"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_total:0
msgid ""
"Expectation of remaining income for this contract. Computed as the sum of "
"remaining subtotals which, in turn, are computed as the maximum between "
"'(Estimation - Invoiced)' and 'To Invoice' amounts"
msgstr ""
"Expectativa de ingresos restantes para este contrato. Calculado como la suma "
"de los subtotales restantes que, a su vez, se calculan como el máximo entre "
"'(Estimación - facturado)' y cantidades 'a facturar'"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
msgid "Contracts to Renew"
msgstr "Contratos a renovar"
#. module: account_analytic_analysis
#: help:account.analytic.account,toinvoice_total:0
msgid " Sum of everything that could be invoiced for this contract."
msgstr " Suma de todo lo que puede ser facturado en este contrato."
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
msgid "Theoretical Margin"
msgstr "Márgen teórico"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_total:0
msgid "Total Remaining"
msgstr "Total restante"
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin:0
msgid "Computed using the formula: Invoiced Amount - Total Costs."
msgstr "Calculado utilizando la fórmula: Importe facturado - Costos totales."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_est:0
msgid "Estimation of Hours to Invoice"
msgstr "Estimacion de horas a facturar."
#. module: account_analytic_analysis
#: field:account.analytic.account,fix_price_invoices:0
msgid "Fixed Price"
msgstr "Precio fijo"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_date:0
msgid "Date of the latest work done on this account."
msgstr "Fecha del último trabajo realizado en esta cuenta."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts Having a Partner"
msgstr "Contratos que tiene una empresa"
#. module: account_analytic_analysis
#: field:account.analytic.account,est_total:0
msgid "Total Estimation"
msgstr "Estimación Total"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_ca:0
@ -253,128 +613,29 @@ msgid ""
"If invoice from analytic account, the remaining amount you can invoice to "
"the customer based on the total costs."
msgstr ""
"Si factura basado en contabilidad analítica, el importe restante que puede "
"facturar al cliente basado en los costes totales."
#. module: account_analytic_analysis
#: help:account.analytic.account,revenue_per_hour:0
msgid "Computed using the formula: Invoiced Amount / Hours Tot."
msgstr "Calculado utilizando la fórmula: Importe facturado / Horas totales."
#. module: account_analytic_analysis
#: field:account.analytic.account,revenue_per_hour:0
msgid "Revenue per Hours (real)"
msgstr "Ingresos por horas (real)"
"Si factura desde contabilidad analítica, el importe restante que puede "
"facturar al cliente basado en los costos totales."
#. module: account_analytic_analysis
#: field:account_analytic_analysis.summary.month,unit_amount:0
#: field:account_analytic_analysis.summary.user,unit_amount:0
msgid "Total Time"
msgstr "Tiempo total"
msgstr "Tiempo Total"
#. module: account_analytic_analysis
#: field:account.analytic.account,month_ids:0
#: field:account_analytic_analysis.summary.month,month:0
msgid "Month"
msgstr "Mes"
#: field:account.analytic.account,invoice_on_timesheets:0
msgid "On Timesheets"
msgstr "En hojas de trabajo"
#. module: account_analytic_analysis
#: field:account_analytic_analysis.summary.month,account_id:0
#: field:account_analytic_analysis.summary.user,account_id:0
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
msgid "Analytic Account"
msgstr "Cuenta analítica"
#: field:account.analytic.account,fix_price_to_invoice:0
#: field:account.analytic.account,remaining_hours:0
#: field:account.analytic.account,remaining_hours_to_invoice:0
#: field:account.analytic.account,timesheet_ca_invoiced:0
msgid "Remaining Time"
msgstr "Tiempo restante"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
msgid "Overpassed Accounts"
msgstr "Cuentas caducadas"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
msgid "All Uninvoiced Entries"
msgstr "Todas las entradas no facturadas"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
msgid "Hours Tot"
msgstr "Horas totales"
#. module: account_analytic_analysis
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr "¡Error! No puede crear cuentas analíticas recursivas."
#. module: account_analytic_analysis
#: help:account.analytic.account,total_cost:0
msgid ""
"Total of costs for this account. It includes real costs (from invoices) and "
"indirect costs, like time spent on timesheets."
msgstr ""
"Costes totales para esta cuenta. Incluye costes reales (desde facturas) y "
"costes indirectos, como el tiempo empleado en hojas de servicio (horarios)."
#~ msgid "Hours summary by user"
#~ msgstr "Resumen de horas por usuario"
#~ msgid "All Analytic Accounts"
#~ msgstr "Todas las cuentas analíticas"
#~ msgid "My Current Accounts"
#~ msgstr "Mis cuentas actuales"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "¡XML inválido para la definición de la vista!"
#~ msgid "Theorical Revenue"
#~ msgstr "Ingresos teóricos"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
#~ "especial!"
#~ msgid "New Analytic Account"
#~ msgstr "Nueva cuenta analítica"
#~ msgid "Theorical Margin"
#~ msgstr "Margen teórico"
#~ msgid "Current Analytic Accounts"
#~ msgstr "Cuentas analíticas actuales"
#~ msgid "Invoicing"
#~ msgstr "Facturación"
#~ msgid "My Pending Accounts"
#~ msgstr "Mis cuentas pendientes"
#~ msgid "My Uninvoiced Entries"
#~ msgstr "Mis entradas no facturadas"
#~ msgid "My Accounts"
#~ msgstr "Mis cuentas"
#~ msgid "Analytic Accounts"
#~ msgstr "Cuentas analíticas"
#~ msgid "Financial Project Management"
#~ msgstr "Gestión de proyectos financieros"
#~ msgid "Pending Analytic Accounts"
#~ msgstr "Cuentas analíticas pendientes"
#~ msgid ""
#~ "Modify account analytic view to show\n"
#~ "important data for project manager of services companies.\n"
#~ "Add menu to show relevant information for each manager."
#~ msgstr ""
#~ "Modifica la vista de cuenta analítica para mostrar\n"
#~ "datos importantes para el director de proyectos en empresas de servicios.\n"
#~ "Añade menú para mostrar información relevante para cada director."
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nombre de modelo no válido en la definición de acción."
#: view:account.analytic.account:0
msgid "Total"
msgstr "Total"

178
addons/account_analytic_default/i18n/es_MX.po
View File

@ -1,38 +1,21 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_analytic_default
# Spanish (Mexico) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-26 08:03+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-27 23:44+0000\n"
"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:29+0000\n"
"X-Generator: Launchpad (build 13830)\n"
#. module: account_analytic_default
#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
msgid "Account Analytic Default"
msgstr "Cuenta analítica por defecto"
#. module: account_analytic_default
#: help:account.analytic.default,partner_id:0
msgid ""
"select a partner which will use analytical account specified in analytic "
"default (eg. create new cutomer invoice or Sale order if we select this "
"partner, it will automatically take this as an analytical account)"
msgstr ""
"Seleccione una empresa que utilizará esta cuenta analítica como la cuenta "
"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
"pedidos de venta, si se selecciona esta empresa, automáticamente se "
"utilizará esta cuenta analítica)."
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@ -41,16 +24,6 @@ msgstr ""
msgid "Analytic Rules"
msgstr "Reglas analíticas"
#. module: account_analytic_default
#: help:account.analytic.default,analytic_id:0
msgid "Analytical Account"
msgstr "Cuenta analítica"
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Current"
msgstr "Actual"
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Group By..."
@ -58,13 +31,13 @@ msgstr "Agrupar por..."
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytical Account"
msgstr "Fecha final por defecto para esta cuenta analítica."
msgid "Default end date for this Analytic Account."
msgstr "Fecha final default para esta Cuenta Analítica."
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
msgid "Picking List"
msgstr "Albarán"
msgstr "Lista de Movimientos."
#. module: account_analytic_default
#: view:account.analytic.default:0
@ -72,21 +45,15 @@ msgid "Conditions"
msgstr "Condiciones"
#. module: account_analytic_default
#: help:account.analytic.default,company_id:0
#: help:account.analytic.default,partner_id:0
msgid ""
"select a company which will use analytical account specified in analytic "
"default (eg. create new cutomer invoice or Sale order if we select this "
"company, it will automatically take this as an analytical account)"
"Select a partner which will use analytic account specified in analytic "
"default (e.g. create new customer invoice or Sale order if we select this "
"partner, it will automatically take this as an analytic account)"
msgstr ""
"Seleccione una compañía que utilizará esta cuenta analítica como la cuenta "
"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
"pedidos de venta, si se selecciona esta compañía, automáticamente se "
"utilizará esta cuenta analítica)."
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytical Account"
msgstr "Fecha inicial por defecto para esta cuenta analítica."
"Seleccione la empresa que utilizara la cuenta analítica especificada por "
"defecto.(ej. crea una nueva factura de cliente u Orden de venta si "
"seleccionamos esta empresa, este automáticamente toma esta cuenta analítica)"
#. module: account_analytic_default
#: view:account.analytic.default:0
@ -116,65 +83,57 @@ msgstr "Usuario"
msgid "Entries"
msgstr "Asientos"
#. module: account_analytic_default
#: help:account.analytic.default,product_id:0
msgid ""
"Select a product which will use analytic account specified in analytic "
"default (e.g. create new customer invoice or Sale order if we select this "
"product, it will automatically take this as an analytic account)"
msgstr ""
"Seleccione el producto que utilizara la cuenta espeficifcada por defecto "
"(ej. crea una nueva factura de cliente u orden de venta si seleccionamos "
"este producto, este, automáticamente tomara esto como una cuenta analítica)"
#. module: account_analytic_default
#: field:account.analytic.default,date_stop:0
msgid "End Date"
msgstr "Fecha final"
#. module: account_analytic_default
#: help:account.analytic.default,user_id:0
msgid ""
"select a user which will use analytical account specified in analytic default"
msgstr ""
"Seleccione un usuario que utilizará esta cuenta analítica como la cuenta "
"analítica por defecto."
#. module: account_analytic_default
#: view:account.analytic.default:0
#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
msgid "Analytic Defaults"
msgstr "Análisis: Valores por defecto"
msgstr "Valores analíticos por defecto"
#. module: account_analytic_default
#: model:ir.module.module,description:account_analytic_default.module_meta_information
msgid ""
"\n"
"Allows to automatically select analytic accounts based on criterions:\n"
"* Product\n"
"* Partner\n"
"* User\n"
"* Company\n"
"* Date\n"
" "
msgstr ""
"\n"
"Permite seleccionar automáticamente cuentas analíticas según estos "
"criterios:\n"
"* Producto\n"
"* Empresa\n"
"* Usuario\n"
"* Compañía\n"
"* Fecha\n"
" "
#. module: account_analytic_default
#: help:account.analytic.default,product_id:0
msgid ""
"select a product which will use analytical account specified in analytic "
"default (eg. create new cutomer invoice or Sale order if we select this "
"product, it will automatically take this as an analytical account)"
msgstr ""
"Seleccione un producto que utilizará esta cuenta analítica como la cuenta "
"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
"pedidos de venta, si se selecciona este producto, automáticamente se "
"utilizará esta cuenta analítica)."
#: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!"
msgstr "Referencia debe ser única por compañía!"
#. module: account_analytic_default
#: field:account.analytic.default,sequence:0
msgid "Sequence"
msgstr "Secuencia"
#. module: account_analytic_default
#: help:account.analytic.default,company_id:0
msgid ""
"Select a company which will use analytic account specified in analytic "
"default (e.g. create new customer invoice or Sale order if we select this "
"company, it will automatically take this as an analytic account)"
msgstr ""
"Seleccione una compañía que utilizara la cuenta analítica espeficificada por "
"defecto (ej. crea una nueva factura de cliente u orden de venta si "
"selecciona esta compañía, este, automáticamente la toma como una cuenta "
"analítica)"
#. module: account_analytic_default
#: help:account.analytic.default,user_id:0
msgid ""
"Select a user which will use analytic account specified in analytic default."
msgstr "Seleccione un usuario que utilizara la cuenta analítica por defecto."
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
msgid "Invoice Line"
@ -184,7 +143,12 @@ msgstr "Línea de factura"
#: view:account.analytic.default:0
#: field:account.analytic.default,analytic_id:0
msgid "Analytic Account"
msgstr "Cuenta analítica"
msgstr "Cuenta Analítica"
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
msgstr "Fecha inicial por defecto para esta Cuenta Analítica."
#. module: account_analytic_default
#: view:account.analytic.default:0
@ -213,22 +177,4 @@ msgstr ""
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_sale_order_line
msgid "Sales Order Line"
msgstr "Línea pedido de venta"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "¡XML inválido para la definición de la vista!"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
#~ "especial!"
#~ msgid "Seq"
#~ msgstr "Secuencia"
#~ msgid "Analytic Distributions"
#~ msgstr "Distribuciones analíticas"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nombre de modelo no válido en la definición de acción."
msgstr "Línea de Orden de venta"

20
addons/account_analytic_default/i18n/nl_BE.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-07-27 12:58+0000\n"
"PO-Revision-Date: 2012-11-27 13:19+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@ -31,7 +31,7 @@ msgstr "Groeperen op..."
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytic Account."
msgstr ""
msgstr "Standaard einddatum voor deze analytische rekening"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
@ -50,6 +50,9 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"partner, it will automatically take this as an analytic account)"
msgstr ""
"Kies een relatie voor wie de standaard analytische rekening van toepassing "
"is (vb. maak een nieuwe verkoopfactuur of -order, en kies deze relatie; de "
"analytische rekening wordt automatisch voorgesteld)"
#. module: account_analytic_default
#: view:account.analytic.default:0
@ -86,6 +89,9 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"product, it will automatically take this as an analytic account)"
msgstr ""
"Kies een product waarvoor de standaard analytische rekening van toepassing "
"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit product; de "
"analytische rekening wordt automatisch voorgesteld)"
#. module: account_analytic_default
#: field:account.analytic.default,date_stop:0
@ -116,12 +122,16 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"company, it will automatically take this as an analytic account)"
msgstr ""
"Kies een bedrijf waarvoor de standaard analytische rekening van toepassing "
"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit bedrijf; de "
"analytische rekening wordt automatisch voorgesteld)"
#. module: account_analytic_default
#: help:account.analytic.default,user_id:0
msgid ""
"Select a user which will use analytic account specified in analytic default."
msgstr ""
"Kies een gebruiker die de analytische standaardrekening zal gebruiken."
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
@ -137,7 +147,7 @@ msgstr "Analytische rekening"
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
msgstr ""
msgstr "Standaard begindatum voor deze analytische rekening."
#. module: account_analytic_default
#: view:account.analytic.default:0

12
addons/account_analytic_default/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-02-08 03:53+0000\n"
"Last-Translator: 开阖软件 Jeff Wang <jeff@osbzr.com>\n"
"PO-Revision-Date: 2012-11-27 16:42+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@ -31,7 +31,7 @@ msgstr "分组..."
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytic Account."
msgstr ""
msgstr "辅助核算项的默认结束日期"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
@ -137,7 +137,7 @@ msgstr "辅助核算项"
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
msgstr ""
msgstr "辅助核算项的默认开始日期"
#. module: account_analytic_default
#: view:account.analytic.default:0

453
addons/account_analytic_plans/i18n/es_MX.po
View File

@ -1,32 +1,33 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_analytic_plans
# Spanish (Mexico) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-03 16:56+0000\n"
"PO-Revision-Date: 2011-01-12 18:12+0000\n"
"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
"Language-Team: \n"
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-28 00:35+0000\n"
"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:25+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid ""
"This distribution model has been saved.You will be able to reuse it later."
msgstr ""
"Este modelo de distribución ha sido guardado. Lo podrá reutilizar más tarde."
"Este modelo de distribución ha sido guardado. Podrá utilizarlo después."
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,plan_id:0
msgid "Plan Id"
msgstr "Id plan"
msgstr "Id del plan"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@ -51,11 +52,6 @@ msgstr "Analítica cruzada"
msgid "Analytic Plan"
msgstr "Plan analítico"
#. module: account_analytic_plans
#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
msgid "Multiple-plans management in Analytic Accounting"
msgstr "Gestión de múltiples planes en contabilidad analítica"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,journal_id:0
#: view:account.crossovered.analytic:0
@ -69,12 +65,6 @@ msgstr "Diario analítico"
msgid "Analytic Plan Line"
msgstr "Línea de plan analítico"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
#, python-format
msgid "User Error"
msgstr "Error de usuario"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
msgid "Analytic Plan Instance"
@ -85,11 +75,6 @@ msgstr "Instancia de plan analítico"
msgid "Ok"
msgstr "Aceptar"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You can not create move line on closed account."
msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,plan_id:0
msgid "Model's Plan"
@ -98,17 +83,26 @@ msgstr "Plan del modelo"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account2_ids:0
msgid "Account2 Id"
msgstr "Id cuenta2"
msgstr "Id de cuenta2"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account_ids:0
msgid "Account Id"
msgstr "Id cuenta"
msgstr "Id de cuenta"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:221
#: code:addons/account_analytic_plans/account_analytic_plans.py:234
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "Error!"
msgstr "¡Error!"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Amount"
msgstr "Importe"
msgstr "Monto"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@ -123,7 +117,7 @@ msgstr "¡Valor haber o debe erróneo en el asiento contable!"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account6_ids:0
msgid "Account6 Id"
msgstr "Id cuenta6"
msgstr "Id de cuenta6"
#. module: account_analytic_plans
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
@ -136,9 +130,24 @@ msgid "Bank Statement Line"
msgstr "Línea extracto bancario"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,analytic_account_id:0
msgid "Analytic Account"
msgstr "Cuenta analítica"
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr "¡Estructura de comunicación BBA no válida!"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "There is no analytic plan defined."
msgstr "No hay plan analítico definido."
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid ""
"The date of your Journal Entry is not in the defined period! You should "
"change the date or remove this constraint from the journal."
msgstr ""
"¡La fecha de su asiento no está en el periodo definido! Usted debería "
"cambiar la fecha o borrar esta restricción del diario."
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
@ -148,20 +157,12 @@ msgstr "¡El código del diario debe ser único por compañía!"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,ref:0
msgid "Analytic Account Reference"
msgstr "Referencia cuenta analítica"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid ""
"You can not create move line on receivable/payable account without partner"
msgstr ""
"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
"una empresa."
msgstr "Referencia de cuenta analítica"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_sale_order_line
msgid "Sales Order Line"
msgstr "Línea pedido de venta"
msgstr "Línea de Orden de venta"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
@ -182,20 +183,20 @@ msgstr "Imprimir"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
#: field:account.analytic.line,percentage:0
msgid "Percentage"
msgstr "Porcentaje"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:201
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
#, python-format
msgid "A model having this name and code already exists !"
msgstr "¡Ya existe un modelo con este nombre y código!"
msgid "There are no analytic lines related to account %s."
msgstr "No hay lineas analíticas relacionadas a la cuenta %s"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "No analytic plan defined !"
msgstr "¡No se ha definido un plan analítico!"
#: field:account.analytic.plan.instance.line,analytic_account_id:0
msgid "Analytic Account"
msgstr "Cuenta Analítica"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
@ -230,18 +231,31 @@ msgid "Analytic Plan Lines"
msgstr "Líneas de plan analítico"
#. module: account_analytic_plans
#: constraint:account.bank.statement.line:0
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line"
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr "La cuenta y el periodo deben pertenecer a la misma compañía."
#. module: account_analytic_plans
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
msgstr ""
"El importe del recibo debe ser el mismo importe que el de la línea del "
"extracto"
"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
msgid "Invoice Line"
msgstr "Línea factura"
msgstr "Línea de factura"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
"currency. You should remove the secondary currency on the account or select "
"a multi-currency view on the journal."
msgstr ""
"La cuenta seleccionada en su asiento fuerza a tener una moneda secundaria. "
"Debería eliminar la moneda secundaria de la cuenta o asignar al diario una "
"vista multi-moneda"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@ -249,9 +263,9 @@ msgid "Currency"
msgstr "Moneda"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,date1:0
msgid "Start Date"
msgstr "Fecha inicial"
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
msgstr "No puede crear una linea analitica a una cuenta de vista."
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@ -261,7 +275,12 @@ msgstr "Compañía"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account5_ids:0
msgid "Account5 Id"
msgstr "Id cuenta5"
msgstr "Id de cuenta5"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
msgstr "No puedes crear elementos de diario en cuentas cerradas."
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@ -276,14 +295,14 @@ msgstr "Cuenta principal"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "To Date"
msgstr "Hasta fecha"
msgstr "Hasta la Fecha"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:321
#: code:addons/account_analytic_plans/account_analytic_plans.py:462
#: code:addons/account_analytic_plans/account_analytic_plans.py:342
#: code:addons/account_analytic_plans/account_analytic_plans.py:486
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr "¡Debe definir un diario analítico en el diario '%s'!"
msgid "You have to define an analytic journal on the '%s' journal."
msgstr "Tiene que definir un diario analitico en el diario '%s'"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,empty_line:0
@ -295,82 +314,16 @@ msgstr "No mostrar líneas vacías"
msgid "analytic.plan.create.model.action"
msgstr "analitica.plan.crear.modelo.accion"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
msgid "Analytic Line"
msgstr "Línea analítica"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account :"
msgstr "Cuenta analítica:"
#. module: account_analytic_plans
#: model:ir.module.module,description:account_analytic_plans.module_meta_information
msgid ""
"This module allows to use several analytic plans, according to the general "
"journal,\n"
"so that multiple analytic lines are created when the invoice or the entries\n"
"are confirmed.\n"
"\n"
"For example, you can define the following analytic structure:\n"
" Projects\n"
" Project 1\n"
" SubProj 1.1\n"
" SubProj 1.2\n"
" Project 2\n"
" Salesman\n"
" Eric\n"
" Fabien\n"
"\n"
"Here, we have two plans: Projects and Salesman. An invoice line must\n"
"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
"Fabien. The amount can also be split. The following example is for\n"
"an invoice that touches the two subproject and assigned to one salesman:\n"
"\n"
"Plan1:\n"
" SubProject 1.1 : 50%\n"
" SubProject 1.2 : 50%\n"
"Plan2:\n"
" Eric: 100%\n"
"\n"
"So when this line of invoice will be confirmed, it will generate 3 analytic "
"lines,\n"
"for one account entry.\n"
"The analytic plan validates the minimum and maximum percentage at the time "
"of creation\n"
"of distribution models.\n"
" "
msgstr ""
"Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
"diario general,\n"
"para crear múltiples líneas analíticas cuando la factura o los asientos\n"
"sean confirmados.\n"
"\n"
"Por ejemplo, puede definir la siguiente estructura de analítica:\n"
" Proyectos\n"
" Proyecto 1\n"
" Subproyecto 1,1\n"
" Subproyecto 1,2\n"
" Proyecto 2\n"
" Comerciales\n"
" Eduardo\n"
" Marta\n"
"\n"
"Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
"debe\n"
"ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
"1.1 y\n"
"Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
"una factura que implica a los dos subproyectos y asignada a un comercial:\n"
"\n"
"Plan1:\n"
" Subproyecto 1.1: 50%\n"
" Subproyecto 1.2: 50%\n"
"Plan2:\n"
" Eduardo: 100%\n"
"\n"
"Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
"analíticas para un asiento contable.\n"
"El plan analítico valida el porcentaje mínimo y máximo en el momento de "
"creación de los modelos de distribución.\n"
" "
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account Reference:"
@ -379,7 +332,7 @@ msgstr "Referencia cuenta analítica:"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,name:0
msgid "Plan Name"
msgstr "Nombre de plan"
msgstr "Nombre del plan"
#. module: account_analytic_plans
#: field:account.analytic.plan,default_instance_id:0
@ -394,12 +347,7 @@ msgstr "Elementos diario"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account1_ids:0
msgid "Account1 Id"
msgstr "Id cuenta1"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
msgstr "Id de cuenta1"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,min_required:0
@ -411,14 +359,6 @@ msgstr "Mínimo permitido (%)"
msgid "Root account of this plan."
msgstr "Cuenta principal de este plan."
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:201
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "Error"
msgstr "Error"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "Save This Distribution as a Model"
@ -430,10 +370,9 @@ msgid "Quantity"
msgstr "Cantidad"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#, python-format
msgid "Please put a name and a code before saving the model !"
msgstr "¡Introduzca un nombre y un código antes de guardar el modelo!"
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr "¡El número de factura debe ser único por compañía!"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
@ -441,11 +380,11 @@ msgid "Print Crossovered Analytic"
msgstr "Imprimir analítica cruzada"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:321
#: code:addons/account_analytic_plans/account_analytic_plans.py:462
#: code:addons/account_analytic_plans/account_analytic_plans.py:342
#: code:addons/account_analytic_plans/account_analytic_plans.py:486
#, python-format
msgid "No Analytic Journal !"
msgstr "¡No diario analítico!"
msgstr "¡No hay diario analítico!"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@ -455,7 +394,7 @@ msgstr "Extracto bancario"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account3_ids:0
msgid "Account3 Id"
msgstr "Id cuenta3"
msgstr "Id de cuenta3"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_invoice
@ -471,28 +410,28 @@ msgstr "Cancelar"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
msgid "Account4 Id"
msgstr "Id cuenta4"
msgstr "Id de cuenta4"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:234
#, python-format
msgid "The total should be between %s and %s."
msgstr "El total debe estar entre %s y %s"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Lines"
msgstr "Líneas de distribución analítica"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:214
#, python-format
msgid "The Total Should be Between %s and %s"
msgstr "El total debería estar entre %s y %s"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "at"
msgstr "a las"
msgstr "en"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "Account Name"
msgstr "Nombre de cuenta"
msgstr "Nombre de la cuenta"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
@ -504,11 +443,6 @@ msgstr "Línea de distribución analítica"
msgid "Distribution Code"
msgstr "Código de distribución"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "%"
msgstr "%"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "100.00%"
@ -530,6 +464,16 @@ msgstr "Distribución analítica"
msgid "Journal"
msgstr "Diario"
#. module: account_analytic_plans
#: constraint:account.journal:0
msgid ""
"Configuration error!\n"
"The currency chosen should be shared by the default accounts too."
msgstr ""
"¡Error de confuguración!\n"
"La moneda seleccionada también tiene que ser la que está en las cuentas por "
"defecto."
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
msgid "analytic.plan.create.model"
@ -543,7 +487,37 @@ msgstr "Fecha final"
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
msgid "Distribution Models"
msgstr "Modelos distribución"
msgstr "Modelos de distribución"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
msgstr "No puede crear elementos de diario en una cuenta de tipo vista."
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
#, python-format
msgid "User Error!"
msgstr "¡Error de usuario!"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#, python-format
msgid "Please put a name and a code before saving the model."
msgstr "Por favor ponga un nombre y código antes de guardar el modelo."
#. module: account_analytic_plans
#: field:account.crossovered.analytic,date1:0
msgid "Start Date"
msgstr "Fecha inicial"
#. module: account_analytic_plans
#: constraint:account.bank.statement.line:0
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line."
msgstr ""
"El monto del comprobante debe ser el mismo que esta en la linea de asiento."
#. module: account_analytic_plans
#: field:account.analytic.plan.line,sequence:0
@ -556,120 +530,13 @@ msgid "The name of the journal must be unique per company !"
msgstr "¡El nombre del diaro debe ser único por compañía!"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:214
#, python-format
msgid "Value Error"
msgstr "Valor erróneo"
#: view:account.crossovered.analytic:0
#: view:analytic.plan.create.model:0
msgid "or"
msgstr "ó"
#. module: account_analytic_plans
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
#~ "especial!"
#~ msgid "Currency:"
#~ msgstr "Moneda:"
#~ msgid "Select Information"
#~ msgstr "Seleccionar información"
#~ msgid "Analytic Account Ref."
#~ msgstr "Ref. cuenta analítica"
#~ msgid "Create Model"
#~ msgstr "Crear modelo"
#~ msgid "to"
#~ msgstr "hasta"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "¡XML inválido para la definición de la vista!"
#~ msgid "OK"
#~ msgstr "Aceptar"
#~ msgid "Period from"
#~ msgstr "Período desde"
#~ msgid "Printing date:"
#~ msgstr "Fecha impresión:"
#~ msgid "Analytic Distribution's models"
#~ msgstr "Modelos de distribución analítica"
#~ msgid ""
#~ "This distribution model has been saved. You will be able to reuse it later."
#~ msgstr ""
#~ "Este modelo de distribución ha sido guardado. Más tarde podrá reutilizarlo."
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nombre de modelo no válido en la definición de acción."
#~ msgid ""
#~ "This module allows to use several analytic plans, according to the general "
#~ "journal,\n"
#~ "so that multiple analytic lines are created when the invoice or the entries\n"
#~ "are confirmed.\n"
#~ "\n"
#~ "For example, you can define the following analytic structure:\n"
#~ " Projects\n"
#~ " Project 1\n"
#~ " SubProj 1.1\n"
#~ " SubProj 1.2\n"
#~ " Project 2\n"
#~ " Salesman\n"
#~ " Eric\n"
#~ " Fabien\n"
#~ "\n"
#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
#~ "Fabien. The amount can also be split. The following example is for\n"
#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
#~ "\n"
#~ "Plan1:\n"
#~ " SubProject 1.1 : 50%\n"
#~ " SubProject 1.2 : 50%\n"
#~ "Plan2:\n"
#~ " Eric: 100%\n"
#~ "\n"
#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
#~ "lines,\n"
#~ "for one account entry.\n"
#~ " "
#~ msgstr ""
#~ "Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
#~ "diario general,\n"
#~ "para que crea múltiples líneas analíticas cuando la factura o los asientos\n"
#~ "sean confirmados.\n"
#~ "\n"
#~ "Por ejemplo, puede definir la siguiente estructura de analítica:\n"
#~ " Proyectos\n"
#~ " Proyecto 1\n"
#~ " Subproyecto 1,1\n"
#~ " Subproyecto 1,2\n"
#~ " Proyecto 2\n"
#~ " Comerciales\n"
#~ " Eduardo\n"
#~ " Marta\n"
#~ "\n"
#~ "Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
#~ "debe\n"
#~ "ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
#~ "1.1 y\n"
#~ "Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
#~ "una factura que implica a los dos subproyectos y asignada a un comercial:\n"
#~ "\n"
#~ "Plan1:\n"
#~ " Subproyecto 1.1: 50%\n"
#~ " Subproyecto 1.2: 50%\n"
#~ "Plan2:\n"
#~ " Eduardo: 100%\n"
#~ "\n"
#~ "Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
#~ "analíticas para un asiento contable.\n"
#~ " "
#: code:addons/account_analytic_plans/account_analytic_plans.py:221
#, python-format
msgid "A model with this name and code already exists."
msgstr "Un modelo con este código y nombre ya existe."

144
addons/account_anglo_saxon/i18n/es_MX.po
View File

@ -1,44 +1,60 @@
# Spanish translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# Spanish (Mexico) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-12 11:29+0000\n"
"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
"Language-Team: Spanish <es@li.org>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-28 00:37+0000\n"
"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:45+0000\n"
"X-Generator: Launchpad (build 13830)\n"
#. module: account_anglo_saxon
#: view:product.category:0
msgid " Accounting Property"
msgstr " Propiedades de contabilidad"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_anglo_saxon
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique !"
msgstr "¡La referencia del pedido debe ser única!"
msgid "Order Reference must be unique per Company!"
msgstr "¡La referencia del pedido debe ser única por compañía!"
#. module: account_anglo_saxon
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr "¡El número de factura debe ser único por compañía!"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
msgid "Product Category"
msgstr "Categoría de producto"
#. module: account_anglo_saxon
#: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!"
msgstr "¡La referencia debe ser única por compañía!"
#. module: account_anglo_saxon
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
msgstr "¡Error! No puede crear categorías recursivas."
msgid "Error ! You cannot create recursive categories."
msgstr "¡Error! No puede crear categorías recursivas"
#. module: account_anglo_saxon
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr "¡Estructura de comunicación BBA no válida!"
#. module: account_anglo_saxon
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
"Error: The default Unit of Measure and the purchase Unit of Measure must be "
"in the same category."
msgstr ""
"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
"categoría."
"Error: La unidad de medida por defecto y la unidad de medida de compra "
"deben ser de la misma categoría."
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
@ -48,23 +64,13 @@ msgstr "Línea de factura"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_purchase_order
msgid "Purchase Order"
msgstr "Pedido de compra"
msgstr "Orden de Compra"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_template
msgid "Product Template"
msgstr "Plantilla de producto"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
msgid "Product Category"
msgstr "Categoría de producto"
#. module: account_anglo_saxon
#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
msgid "Stock Accounting for Anglo Saxon countries"
msgstr "Contabilidad de stocks para países anglo-sajones"
#. module: account_anglo_saxon
#: field:product.category,property_account_creditor_price_difference_categ:0
#: field:product.template,property_account_creditor_price_difference:0
@ -79,43 +85,7 @@ msgstr "Factura"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_stock_picking
msgid "Picking List"
msgstr "Albarán"
#. module: account_anglo_saxon
#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
msgid ""
"This module will support the Anglo-Saxons accounting methodology by\n"
" changing the accounting logic with stock transactions. The difference "
"between the Anglo-Saxon accounting countries\n"
" and the Rhine or also called Continental accounting countries is the "
"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
" Anglo-Saxons accounting does take the cost when sales invoice is "
"created, Continental accounting will take the cost at the moment the goods "
"are shipped.\n"
" This module will add this functionality by using a interim account, to "
"store the value of shipped goods and will contra book this interim account\n"
" when the invoice is created to transfer this amount to the debtor or "
"creditor account.\n"
" Secondly, price differences between actual purchase price and fixed "
"product standard price are booked on a separate account"
msgstr ""
"Este módulo soporta la metodología de la contabilidad anglo-sajona mediante\n"
" el cambio de la lógica contable con las transacciones de inventario. La "
"diferencia entre contabilidad de países anglo-sajones\n"
" y el RHINE o también llamada contabilidad de países continentales es el "
"momento de considerar los costes de las mercancías vendidas respecto al "
"coste de las ventas.\n"
" La contabilidad anglosajona tiene en cuenta el coste cuando se crea la "
"factura de venta, la contabilidad continental tiene en cuenta ese coste en "
"el momento de que las mercancías son enviadas.\n"
" Este modulo añade esta funcionalidad usando una cuenta provisional, para "
"guardar el valor de la mercancía enviada y anota un contra asiento a esta "
"cuenta provisional\n"
" cuando se crea la factura para transferir este importe a la cuenta "
"deudora o acreedora.\n"
" Secundariamente, las diferencias de precios entre el actual precio de "
"compra y el precio estándar fijo del producto son registrados en cuentas "
"separadas."
msgstr "Lista de Movimientos."
#. module: account_anglo_saxon
#: help:product.category,property_account_creditor_price_difference_categ:0
@ -125,38 +95,4 @@ msgid ""
"and cost price."
msgstr ""
"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
"precio de compra y precio de coste."
#~ msgid "Stock Account"
#~ msgstr "Cuenta de Valores"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "¡XML Inválido para la Arquitectura de la Vista!"
#~ msgid ""
#~ "This module will support the Anglo-Saxons accounting methodology by \n"
#~ " changing the accounting logic with stock transactions. The difference "
#~ "between the Anglo-Saxon accounting countries \n"
#~ " and the Rhine or also called Continental accounting countries is the "
#~ "moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
#~ " Anglo-Saxons accounting does take the cost when sales invoice is "
#~ "created, Continental accounting will take the cost at he moment the goods "
#~ "are shipped.\n"
#~ " This module will add this functionality by using a interim account, to "
#~ "store the value of shipped goods and will contra book this interim account \n"
#~ " when the invoice is created to transfer this amount to the debtor or "
#~ "creditor account."
#~ msgstr ""
#~ "Éste módulo soportará la metodología de contabilización Anglosajona \n"
#~ " cambiando la lógica de contabilización con transacciones de acciones. La "
#~ "diferencia entre los países de contabilización Anglosajona \n"
#~ " y el Rin o también llamados países de contabilización Continental es el "
#~ "momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
#~ " La contabilización Anglosajona toma el costo cuando la factura de ventas "
#~ "es creada, la contabilización Continental tomará el costo en el momento en "
#~ "que los bienes son enviados.\n"
#~ " Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
#~ "para almacenar el valor de los bienes enviados y devolverá esta cuenta "
#~ "provisional \n"
#~ " cuando la factura sea creada para transferir esta cantidad al deudor o "
#~ "acreedor de la cuenta."
"precio de compra y precio de costo."

10
addons/account_anglo_saxon/i18n/nl_BE.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-03-01 17:37+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-11-27 13:28+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:19+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_anglo_saxon
#: sql_constraint:purchase.order:0
@ -53,6 +53,8 @@ msgid ""
"Error: The default Unit of Measure and the purchase Unit of Measure must be "
"in the same category."
msgstr ""
"Fout: de standaardmaateenheid moet tot dezelfde categorie behoren als de "
"aankoopmaateenheid."
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line

10
addons/account_anglo_saxon/i18n/zh_CN.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-02-08 14:34+0000\n"
"Last-Translator: 开阖软件 Jeff Wang <jeff@osbzr.com>\n"
"PO-Revision-Date: 2012-11-27 16:41+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:19+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_anglo_saxon
#: sql_constraint:purchase.order:0
@ -52,7 +52,7 @@ msgstr "BBA传输结构有误！"
msgid ""
"Error: The default Unit of Measure and the purchase Unit of Measure must be "
"in the same category."
msgstr ""
msgstr "错误：默认的计量单位和采购计量单位必须是相同的类别"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line

1014
addons/account_asset/i18n/es_MX.po
View File

File diff suppressed because it is too large Load Diff

38
addons/account_asset/i18n/nl_BE.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-07-27 13:02+0000\n"
"PO-Revision-Date: 2012-11-27 13:35+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_asset
#: view:account.asset.asset:0
@ -160,7 +160,7 @@ msgstr "Afschrijvingsdatum"
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Error ! You cannot create recursive assets."
msgstr ""
msgstr "U kunt niet dezelfde investeringen maken."
#. module: account_asset
#: field:asset.asset.report,posted_value:0
@ -210,7 +210,7 @@ msgstr "# afschrijvingslijnen"
#. module: account_asset
#: field:account.asset.asset,method_period:0
msgid "Number of Months in a Period"
msgstr ""
msgstr "Aantal maanden in een periode"
#. module: account_asset
#: view:asset.asset.report:0
@ -367,7 +367,7 @@ msgstr "Afschrijvingen in status gesloten"
#. module: account_asset
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
msgstr "De rekening en de periode moeten tot dezelfde firma behoren."
#. module: account_asset
#: field:account.asset.asset,parent_id:0
@ -427,12 +427,12 @@ msgstr "Tijdmethode"
#: view:asset.depreciation.confirmation.wizard:0
#: view:asset.modify:0
msgid "or"
msgstr ""
msgstr "of"
#. module: account_asset
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
msgstr ""
msgstr "U kunt geen boekingen doen op een afgesloten rekening."
#. module: account_asset
#: field:account.asset.asset,note:0
@ -489,12 +489,18 @@ msgid ""
"You can manually close an asset when the depreciation is over. If the last "
"line of depreciation is posted, the asset automatically goes in that status."
msgstr ""
"Als een investering wordt gemaakt, is de status 'Concept'.\n"
"Als de investering wordt bevestigd, verandert de status in 'Lopend'; de "
"afschrijvingslijnen kunnen worden geboekt.\n"
"U kunt een investering manueel afsluiten als deze volledig is afgeschreven. "
"Als de laatste lijn van de afschrijving is geboekt, gaat een investering "
"automatisch in deze status."
#. module: account_asset
#: field:account.asset.asset,state:0
#: field:asset.asset.report,state:0
msgid "Status"
msgstr ""
msgstr "Status"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
@ -541,7 +547,7 @@ msgstr "Berekenen"
#. module: account_asset
#: view:account.asset.history:0
msgid "Asset History"
msgstr ""
msgstr "Activahistoriek"
#. module: account_asset
#: field:asset.asset.report,name:0
@ -662,7 +668,7 @@ msgstr "Af te schrijven bedrag"
#. module: account_asset
#: field:account.asset.asset,name:0
msgid "Asset Name"
msgstr ""
msgstr "Activanaam"
#. module: account_asset
#: field:account.asset.category,open_asset:0
@ -713,11 +719,15 @@ msgid ""
" </p>\n"
" "
msgstr ""
"Dit rapport biedt een overzicht van alle afschrijvingen. De zoekfunctie kan "
"worden aangepast om het overzicht van uw investeringen te personaliseren, "
"zodat u de gewenste analyse krijgt.\n"
" "
#. module: account_asset
#: field:account.asset.asset,purchase_value:0
msgid "Gross Value"
msgstr ""
msgstr "Brutowaarde"
#. module: account_asset
#: field:account.asset.category,name:0
@ -727,7 +737,7 @@ msgstr "Naam"
#. module: account_asset
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
msgstr ""
msgstr "U kunt geen boekingen doen op een rekening van het type Weergave."
#. module: account_asset
#: help:account.asset.category,open_asset:0
@ -770,7 +780,7 @@ msgstr "Gemaakte investeringsboekingen"
#. module: account_asset
#: field:account.asset.depreciation.line,sequence:0
msgid "Sequence"
msgstr ""
msgstr "Volgnummer"
#. module: account_asset
#: help:account.asset.category,method_period:0

390
addons/account_bank_statement_extensions/i18n/es_MX.po Normal file
View File

@ -0,0 +1,390 @@
# Spanish (Mexico) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-28 01:06+0000\n"
"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Search Bank Transactions"
msgstr "Buscar transacciones bancarias"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: selection:account.bank.statement.line,state:0
msgid "Confirmed"
msgstr "Confirmado"
#. module: account_bank_statement_extensions
#: view:account.bank.statement:0
#: view:account.bank.statement.line:0
msgid "Glob. Id"
msgstr "Id global"
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "CODA"
msgstr "CODA"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,parent_id:0
msgid "Parent Code"
msgstr "Código padre"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Debit"
msgstr "Debe"
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
msgid "Cancel selected statement lines"
msgstr "Cancelar las líneas seleccionadas"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,val_date:0
msgid "Value Date"
msgstr "Fecha valor"
#. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0
msgid "The RIB and/or IBAN is not valid"
msgstr "La CC y/o IBAN no es válido"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Group By..."
msgstr "Agrupar por..."
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: selection:account.bank.statement.line,state:0
msgid "Draft"
msgstr "Borrador"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement"
msgstr "Extracto"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
msgid "Confirm selected statement lines"
msgstr "Confirma las lineas seleccionadas"
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
msgid "Bank Statement Balances Report"
msgstr "Informe de balances de extractos bancarios"
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
msgid "Cancel Lines"
msgstr "Cancelación de las líneas"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
msgid "Batch Payment Info"
msgstr "Información del pago por lote"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,state:0
msgid "Status"
msgstr "Estado"
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
#, python-format
msgid ""
"Delete operation not allowed. Please go to the associated bank "
"statement in order to delete and/or modify bank statement line."
msgstr ""
"Operacion de borrado no permitida. Por favor vaya a el asiento bancario "
"asociado para poder eliminar y/o modificar lineas de asientos bancarios."
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "or"
msgstr "ó"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Confirm Lines"
msgstr "Confirmar líneas"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Transactions"
msgstr "Transacciones"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,type:0
msgid "Type"
msgstr "Tipo:"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: report:bank.statement.balance.report:0
msgid "Journal"
msgstr "Diario"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Confirmed Statement Lines."
msgstr "Lineas de extracto confirmadas"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Credit Transactions."
msgstr "Transacciones de crédito"
#. module: account_bank_statement_extensions
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
msgid "cancel selected statement lines."
msgstr "Eliminar las lineas de extracto seleccionadas"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_number:0
msgid "Counterparty Number"
msgstr "Numero de contrapartida"
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Closing Balance"
msgstr "Saldo de cierre"
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Date"
msgstr "Fecha"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
#: field:account.bank.statement.line,globalisation_amount:0
msgid "Glob. Amount"
msgstr "Importe global"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Debit Transactions."
msgstr "Transacciones de débito"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Extended Filters..."
msgstr "Filtros extendidos..."
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Confirmed lines cannot be changed anymore."
msgstr "Las líneas confirmadas no pueden ser modificadas."
#. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0
msgid ""
"\n"
"Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments"
msgstr ""
"\n"
"Por favor defina el código BIC/Swift del banco para una cuenta de tipo IBAN "
"para realizar pagos válidos"
#. module: account_bank_statement_extensions
#: view:cancel.statement.line:0
msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
msgstr ""
"¿Estás seguro que quiere cancelar las líneas del extracto bancario "
"seleccionadas?"
#. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0
msgid "Name"
msgstr "Nombre"
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "ISO 20022"
msgstr "ISO 20022"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Notes"
msgstr "Notas"
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "Manual"
msgstr "Manual"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Bank Transaction"
msgstr "Transacción bancaria"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Credit"
msgstr "Haber"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,amount:0
msgid "Amount"
msgstr "Monto"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Fin.Account"
msgstr "Cuenta fin."
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_currency:0
msgid "Counterparty Currency"
msgstr "Moneda de la contrapartida"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_bic:0
msgid "Counterparty BIC"
msgstr "BIC de la contrapartida"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,child_ids:0
msgid "Child Codes"
msgstr "Códigos hijos"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
msgstr ""
"¿Está seguro que desea confirmar las líneas del extracto bancario "
"seleccionadas?"
#. module: account_bank_statement_extensions
#: help:account.bank.statement.line,globalisation_id:0
msgid ""
"Code to identify transactions belonging to the same globalisation level "
"within a batch payment"
msgstr ""
"Código para identificar las transacciones pertenecientes al mismo nivel "
"global en un pago por lotes"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Draft Statement Lines."
msgstr "Líneas de extracto en borrador."
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Glob. Am."
msgstr "Imp. global"
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
msgid "Bank Statement Line"
msgstr "Línea extracto bancario"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,code:0
msgid "Code"
msgstr "Código"
#. module: account_bank_statement_extensions
#: constraint:account.bank.statement.line:0
msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line."
msgstr ""
"El monto del comprobante debe ser el mismo que esta en la linea de asiento."
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_name:0
msgid "Counterparty Name"
msgstr "Nombre de la contrapartida"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,name:0
msgid "Communication"
msgstr "Comunicación"
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
msgid "Bank Accounts"
msgstr "Cuentas bancarias"
#. module: account_bank_statement_extensions
#: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company."
msgstr ""
"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
msgid "Bank Statement"
msgstr "Extracto bancario"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Line"
msgstr "Línea de extracto"
#. module: account_bank_statement_extensions
#: sql_constraint:account.bank.statement.line.global:0
msgid "The code must be unique !"
msgstr "¡El código debe ser único!"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,bank_statement_line_ids:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
msgid "Bank Statement Lines"
msgstr "Líneas de extracto bancario"
#. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
#, python-format
msgid "Warning!"
msgstr "¡Advertencia!"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Child Batch Payments"
msgstr "Pagos por lote hijos"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Cancel"
msgstr "Cancelar"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Statement Lines"
msgstr "Líneas de extracto"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
msgid "Total Amount"
msgstr "Importe total"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line,globalisation_id:0
msgid "Globalisation ID"
msgstr "ID global"

412
addons/account_budget/i18n/es_MX.po
View File

@ -1,20 +1,29 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_budget
# Spanish (Mexico) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-13 20:28+0000\n"
"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
"Language-Team: \n"
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-28 01:18+0000\n"
"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:40+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_budget
#: view:account.budget.analytic:0
#: view:account.budget.crossvered.report:0
#: view:account.budget.crossvered.summary.report:0
#: view:account.budget.report:0
msgid "Select Dates Period"
msgstr "Seleccione fechas del período"
#. module: account_budget
#: field:crossovered.budget,creating_user_id:0
@ -32,12 +41,6 @@ msgstr "Confirmado"
msgid "Budgetary Positions"
msgstr "Posiciones presupuestarias"
#. module: account_budget
#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "The General Budget '%s' has no Accounts!"
msgstr "¡El presupuesto general '%s' no tiene cuentas!"
#. module: account_budget
#: report:account.budget:0
msgid "Printed at:"
@ -80,7 +83,7 @@ msgstr "Borrador"
#. module: account_budget
#: report:account.budget:0
msgid "at"
msgstr "a las"
msgstr "en"
#. module: account_budget
#: view:account.budget.report:0
@ -109,55 +112,22 @@ msgstr "Validado"
msgid "Percentage"
msgstr "Porcentaje"
#. module: account_budget
#: report:crossovered.budget.report:0
msgid "to"
msgstr "hasta"
#. module: account_budget
#: field:crossovered.budget,state:0
msgid "Status"
msgstr "Estado"
#. module: account_budget
#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
msgid ""
"A budget is a forecast of your company's income and expenses expected for a "
"period in the future. With a budget, a company is able to carefully look at "
"how much money they are taking in during a given period, and figure out the "
"best way to divide it among various categories. By keeping track of where "
"your money goes, you may be less likely to overspend, and more likely to "
"meet your financial goals. Forecast a budget by detailing the expected "
"revenue per analytic account and monitor its evolution based on the actuals "
"realised during that period."
msgstr ""
"Un presupuesto es una previsión de los ingresos y gastos esperados por su "
"compañía en un periodo futuro. Con un presupuesto, una compañía es capaz de "
"observar minuciosamente cuánto dinero están ingresando en un período "
"determinado, y pensar en la mejor manera de dividirlo entre varias "
"categorías. Haciendo el seguimiento de los movimientos de su dinero, tendrá "
"menos tendencia a un sobregasto, y se aproximará más a sus metas "
"financieras. Haga una previsión de un presupuesto detallando el ingreso "
"esperado por cuenta analítica y monitorice su evaluación basándose en los "
"valores actuales durante ese período."
#. module: account_budget
#: view:account.budget.crossvered.summary.report:0
msgid "This wizard is used to print summary of budgets"
msgstr ""
"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
#. module: account_budget
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "%"
msgstr "%"
#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "The Budget '%s' has no accounts!"
msgstr "¡El presupuesto '%s' no tiene cuentas!"
#. module: account_budget
#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "Description"
msgstr "Descripción"
msgstr "Descripción"
#. module: account_budget
#: report:crossovered.budget.report:0
@ -169,6 +139,11 @@ msgstr "Moneda"
msgid "Total :"
msgstr "Total :"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
msgstr "Error! No es posible crear cuentas analíticas recursivas."
#. module: account_budget
#: field:account.budget.post,company_id:0
#: field:crossovered.budget,company_id:0
@ -177,9 +152,9 @@ msgid "Company"
msgstr "Compañía"
#. module: account_budget
#: view:crossovered.budget:0
msgid "To Approve"
msgstr "Para aprobar"
#: report:crossovered.budget.report:0
msgid "to"
msgstr "hasta"
#. module: account_budget
#: view:crossovered.budget:0
@ -229,7 +204,7 @@ msgstr "Fecha final"
#: model:ir.model,name:account_budget.model_account_budget_analytic
#: model:ir.model,name:account_budget.model_account_budget_report
msgid "Account Budget report for analytic account"
msgstr "Informe presupuesto contable para contabilidad analítica"
msgstr "Informe de presupuesto contable para contabilidad analítica"
#. module: account_budget
#: view:account.analytic.account:0
@ -247,12 +222,6 @@ msgstr "Nombre"
msgid "Budget Line"
msgstr "Línea de presupuesto"
#. module: account_budget
#: view:account.analytic.account:0
#: view:account.budget.post:0
msgid "Lines"
msgstr "Líneas"
#. module: account_budget
#: report:account.budget:0
#: view:crossovered.budget:0
@ -264,10 +233,14 @@ msgid "Budget"
msgstr "Presupuesto"
#. module: account_budget
#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "Error!"
msgstr "¡Error!"
#: view:crossovered.budget:0
msgid "To Approve Budgets"
msgstr "Presupuestos por aprobar"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Duration"
msgstr "Duración"
#. module: account_budget
#: field:account.budget.post,code:0
@ -283,7 +256,6 @@ msgstr "Este asistente es utilizado para imprimir el presupuesto"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
@ -294,18 +266,15 @@ msgid "Budgets"
msgstr "Presupuestos"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid ""
"Error! The currency has to be the same as the currency of the selected "
"company"
#: view:account.budget.crossvered.summary.report:0
msgid "This wizard is used to print summary of budgets"
msgstr ""
"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
"seleccionada"
"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Cancelled"
msgstr "Cancelado"
msgstr "Cancelado/a"
#. module: account_budget
#: view:crossovered.budget:0
@ -313,10 +282,9 @@ msgid "Approve"
msgstr "Aprobar"
#. module: account_budget
#: field:crossovered.budget,date_from:0
#: field:crossovered.budget.lines,date_from:0
msgid "Start Date"
msgstr "Fecha de inicio"
#: view:crossovered.budget:0
msgid "To Approve"
msgstr "Para aprobar"
#. module: account_budget
#: view:account.budget.post:0
@ -345,12 +313,10 @@ msgid "Theoretical Amt"
msgstr "Importe teórico"
#. module: account_budget
#: view:account.budget.analytic:0
#: view:account.budget.crossvered.report:0
#: view:account.budget.crossvered.summary.report:0
#: view:account.budget.report:0
msgid "Select Dates Period"
msgstr "Seleccione fechas del período"
#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "Error!"
msgstr "¡Error!"
#. module: account_budget
#: view:account.budget.analytic:0
@ -361,74 +327,54 @@ msgid "Print"
msgstr "Imprimir"
#. module: account_budget
#: model:ir.module.module,description:account_budget.module_meta_information
msgid ""
"This module allows accountants to manage analytic and crossovered budgets.\n"
"\n"
"Once the Master Budgets and the Budgets are defined (in "
"Accounting/Budgets/),\n"
"the Project Managers can set the planned amount on each Analytic Account.\n"
"\n"
"The accountant has the possibility to see the total of amount planned for "
"each\n"
"Budget and Master Budget in order to ensure the total planned is not\n"
"greater/lower than what he planned for this Budget/Master Budget. Each list "
"of\n"
"record can also be switched to a graphical view of it.\n"
"\n"
"Three reports are available:\n"
" 1. The first is available from a list of Budgets. It gives the "
"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
"\n"
" 2. The second is a summary of the previous one, it only gives the "
"spreading, for the selected Budgets, of the Analytic Accounts.\n"
"\n"
" 3. The last one is available from the Analytic Chart of Accounts. It "
"gives the spreading, for the selected Analytic Accounts, of the Master "
"Budgets per Budgets.\n"
"\n"
msgstr ""
"Este módulo permite a los contables gestionar presupuestos analíticos "
"(costes) y cruzados.\n"
"\n"
"Una vez que se han definido los presupuestos principales y los presupuestos "
"(en Contabilidad/Presupuestos/),\n"
"los gestores de proyectos pueden establecer el importe previsto en cada "
"cuenta analítica.\n"
"\n"
"El contable tiene la posibilidad de ver el total del importe previsto para "
"cada\n"
"presupuesto y presupuesto principal a fin de garantizar el total previsto no "
"es\n"
"mayor/menor que lo que había previsto para este presupuesto / presupuesto "
"principal.\n"
"Cada lista de datos también puede cambiarse a una vista gráfica de la "
"misma.\n"
"\n"
"Están disponibles tres informes:\n"
" 1. El primero está disponible desde una lista de presupuestos. "
"Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
"por presupuestos principales.\n"
"\n"
" 2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
"los presupuestos seleccionados, de las cuentas analíticas.\n"
"\n"
" 3. El último está disponible desde el plan de cuentas analítico. Indica "
"la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
"principales por presupuestos.\n"
"\n"
#: view:account.budget.post:0
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,theoritical_amount:0
msgid "Theoretical Amount"
msgstr "Importe teórico"
#. module: account_budget
#: view:account.budget.analytic:0
#: view:account.budget.crossvered.report:0
#: view:account.budget.crossvered.summary.report:0
#: view:account.budget.report:0
msgid "or"
msgstr "ó"
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0
#: model:ir.model,name:account_budget.model_account_analytic_account
msgid "Analytic Account"
msgstr "Cuenta analítica"
msgstr "Cuenta Analítica"
#. module: account_budget
#: report:account.budget:0
msgid "Budget :"
msgstr "Presupuesto :"
#. module: account_budget
#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
msgid ""
"<p>\n"
" A budget is a forecast of your company's income and/or "
"expenses\n"
" expected for a period in the future. A budget is defined on "
"some\n"
" financial accounts and/or analytic accounts (that may "
"represent\n"
" projects, departments, categories of products, etc.)\n"
" </p><p>\n"
" By keeping track of where your money goes, you may be less\n"
" likely to overspend, and more likely to meet your financial\n"
" goals. Forecast a budget by detailing the expected revenue "
"per\n"
" analytic account and monitor its evolution based on the "
"actuals\n"
" realised during that period.\n"
" </p>\n"
" "
msgstr ""
#. module: account_budget
#: report:account.budget:0
#: report:crossovered.budget.report:0
@ -465,14 +411,10 @@ msgid "Cancel"
msgstr "Cancelar"
#. module: account_budget
#: model:ir.module.module,shortdesc:account_budget.module_meta_information
msgid "Budget Management"
msgstr "Gestión presupuestaria"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr "¡Error! No puede crear cuentas analíticas recursivas."
#: field:crossovered.budget,date_from:0
#: field:crossovered.budget.lines,date_from:0
msgid "Start Date"
msgstr "Fecha inicial"
#. module: account_budget
#: report:account.budget:0
@ -480,163 +422,7 @@ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
msgid "Analysis from"
msgstr "Análisis desde"
#~ msgid "% performance"
#~ msgstr "% rendimiento"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
#~ "especial!"
#~ msgid "Period"
#~ msgstr "Período"
#~ msgid "Printing date:"
#~ msgstr "Fecha impresión:"
#~ msgid "Dotations"
#~ msgstr "Dotaciones"
#~ msgid "Performance"
#~ msgstr "Rendimiento"
#~ msgid "From"
#~ msgstr "Desde"
#~ msgid "Results"
#~ msgstr "Resultados"
#~ msgid "A/c No."
#~ msgstr "Núm. de cuenta"
#~ msgid "Period Budget"
#~ msgstr "Período del presupuesto"
#~ msgid "Budget Analysis"
#~ msgstr "Análisis presupuestario"
#~ msgid "Validate"
#~ msgstr "Validar"
#~ msgid "Select Options"
#~ msgstr "Seleccionar opciones"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "¡XML inválido para la definición de la vista!"
#~ msgid "Print Summary of Budgets"
#~ msgstr "Imprimir resumen de presupuestos"
#~ msgid "Spread amount"
#~ msgstr "Cantidad Extendida"
#~ msgid "Amount"
#~ msgstr "Importe"
#~ msgid "Total Planned Amount"
#~ msgstr "Importe total previsto"
#~ msgid "Item"
#~ msgstr "Item"
#~ msgid "Theoretical Amount"
#~ msgstr "Importe teórico"
#~ msgid "Fiscal Year"
#~ msgstr "Ejercicio fiscal"
#~ msgid "Spread"
#~ msgstr "Extensión"
#~ msgid "Select period"
#~ msgstr "Seleccionar período"
#~ msgid "Analytic Account :"
#~ msgstr "Cuenta analítica:"
#, python-format
#~ msgid "Insufficient Data!"
#~ msgstr "¡Datos Insuficientes!"
#~ msgid "Print Budget"
#~ msgstr "Imprimir presupuestos"
#~ msgid "Spreading"
#~ msgstr "Difusión"
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nombre de modelo no válido en la definición de acción."
#~ msgid "Budget Dotation"
#~ msgstr "Dotación presupuestaria"
#~ msgid "Budget Dotations"
#~ msgstr "Dotaciones presupuestarias"
#~ msgid "Budget Item Detail"
#~ msgstr "Detalle de elemento presupuestario"
#, python-format
#~ msgid "No Dotations or Master Budget Expenses Found on Budget %s!"
#~ msgstr ""
#~ "¡No se han encontrado dotaciones o presupuestos principales de gasto en el "
#~ "presupuesto %s!"
#~ msgid ""
#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
#~ "\n"
#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
#~ "Management/Budgets/), the Project Managers can set the planned amount on "
#~ "each\n"
#~ "Analytic Account.\n"
#~ "\n"
#~ "The accountant has the possibility to see the total of amount planned for "
#~ "each\n"
#~ "Budget and Master Budget in order to ensure the total planned is not\n"
#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
#~ "of\n"
#~ "record can also be switched to a graphical view of it.\n"
#~ "\n"
#~ "Three reports are available:\n"
#~ " 1. The first is available from a list of Budgets. It gives the "
#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
#~ "\n"
#~ " 2. The second is a summary of the previous one, it only gives the "
#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
#~ "\n"
#~ " 3. The last one is available from the Analytic Chart of Accounts. It "
#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
#~ "Budgets per Budgets.\n"
#~ "\n"
#~ msgstr ""
#~ "Este módulo permite a los contables gestionar presupuestos analíticos "
#~ "(costes) y cruzados.\n"
#~ "\n"
#~ "Una vez que se han definido los presupuestos principales y los presupuestos "
#~ "(en Gestión\n"
#~ "financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
#~ "importe previsto en\n"
#~ "cada cuenta analítica.\n"
#~ "\n"
#~ "El contable tiene la posibilidad de ver el total del importe previsto para "
#~ "cada\n"
#~ "presupuesto y presupuesto principal a fin de garantizar el total previsto no "
#~ "es\n"
#~ "mayor/menor que lo que había previsto para este presupuesto / presupuesto "
#~ "principal.\n"
#~ "Cada lista de datos también puede cambiarse a una vista gráfica de la "
#~ "misma.\n"
#~ "\n"
#~ "Están disponibles tres informes:\n"
#~ " 1. El primero está disponible desde una lista de presupuestos. "
#~ "Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
#~ "por presupuestos principales.\n"
#~ "\n"
#~ " 2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
#~ "los presupuestos seleccionados, de las cuentas analíticas.\n"
#~ "\n"
#~ " 3. El último está disponible desde un plan de cuentas analítico. Indica "
#~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
#~ "principales por presupuestos.\n"
#~ "\n"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Draft Budgets"
msgstr "Presupuestos borrador"

12
addons/account_budget/i18n/tr.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-01-10 23:08+0000\n"
"PO-Revision-Date: 2012-11-27 22:05+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_budget
#: view:account.budget.analytic:0
@ -141,7 +141,7 @@ msgstr "Toplam :"
#. module: account_budget
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
msgstr ""
msgstr "Hata! Birbirini çağıran analitik hesaplar oluşturamazsın."
#. module: account_budget
#: field:account.budget.post,company_id:0
@ -239,7 +239,7 @@ msgstr "Bütçeleri Onaylama"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Duration"
msgstr ""
msgstr "Süre"
#. module: account_budget
#: field:account.budget.post,code:0
@ -337,7 +337,7 @@ msgstr "Teorik Tutar"
#: view:account.budget.crossvered.summary.report:0
#: view:account.budget.report:0
msgid "or"
msgstr ""
msgstr "veya"
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0

27
addons/account_chart/i18n/es_MX.po
View File

@ -1,28 +1,29 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_chart
# Spanish (Mexico) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-26 07:52+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
"PO-Revision-Date: 2012-11-26 07:17+0000\n"
"Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
"<anegrinm@gmail.com>\n"
"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:43+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_chart
#: model:ir.module.module,description:account_chart.module_meta_information
msgid "Remove minimal account chart"
msgstr "Elimina plan contable mínimo"
msgstr "Eliminar plan contable mínimo"
#. module: account_chart
#: model:ir.module.module,shortdesc:account_chart.module_meta_information
msgid "Charts of Accounts"
msgstr "Planes contables"
msgstr "Catálogos de cuentas"

41
addons/account_payment/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-10-30 15:45+0000\n"
"PO-Revision-Date: 2012-11-27 10:37+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:07+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_payment
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@ -28,6 +28,12 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 单击创建一个付款单。\n"
" </p><p>\n"
" 付款单是一个支付请求，从你公司付款供应商或者给客户退款.\n"
" </p>\n"
" "
#. module: account_payment
#: field:payment.line,currency:0
@ -125,7 +131,7 @@ msgstr "填充付款声明"
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "Error!"
msgstr ""
msgstr "错误!"
#. module: account_payment
#: report:payment.order:0
@ -207,6 +213,9 @@ msgid ""
" Once the bank is confirmed the status is set to 'Confirmed'.\n"
" Then the order is paid the status is 'Done'."
msgstr ""
"一个付款单的初始状态是'草稿'.\n"
" 一旦银行确认，状态被设置为'确定'.\n"
" 然后付款单被支付后，状态成为'完成'."
#. module: account_payment
#: view:payment.order:0
@ -232,7 +241,7 @@ msgstr "已安排"
#. module: account_payment
#: view:account.bank.statement:0
msgid "Import Payment Lines"
msgstr ""
msgstr "导入付款明细"
#. module: account_payment
#: view:payment.line:0
@ -271,7 +280,7 @@ msgstr "选择付款单选项“固定”由你指定一个指定的日期，“
#. module: account_payment
#: field:payment.order,date_created:0
msgid "Creation Date"
msgstr ""
msgstr "创建日期"
#. module: account_payment
#: view:account.move.line:0
@ -339,7 +348,7 @@ msgstr "业务伙伴"
#. module: account_payment
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
msgstr "科目和会计周期必须属于同一个公司"
#. module: account_payment
#: field:payment.line,bank_statement_line_id:0
@ -395,7 +404,7 @@ msgstr "付款帐户填充声明"
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "There is no partner defined on the entry line."
msgstr ""
msgstr "这个凭证行没有定义合作伙伴"
#. module: account_payment
#: help:payment.mode,name:0
@ -427,7 +436,7 @@ msgstr "草稿"
#: view:payment.order:0
#: field:payment.order,state:0
msgid "Status"
msgstr ""
msgstr "状态"
#. module: account_payment
#: help:payment.line,communication2:0
@ -479,7 +488,7 @@ msgstr "搜索"
#. module: account_payment
#: field:payment.order,user_id:0
msgid "Responsible"
msgstr ""
msgstr "负责人"
#. module: account_payment
#: field:payment.line,date:0
@ -494,7 +503,7 @@ msgstr "合计:"
#. module: account_payment
#: field:payment.order,date_done:0
msgid "Execution Date"
msgstr ""
msgstr "执行日期"
#. module: account_payment
#: view:account.payment.populate.statement:0
@ -617,7 +626,7 @@ msgstr "讯息2"
#. module: account_payment
#: field:payment.order,date_scheduled:0
msgid "Scheduled Date"
msgstr ""
msgstr "预定日期"
#. module: account_payment
#: view:account.payment.make.payment:0
@ -678,7 +687,7 @@ msgstr "名称"
#. module: account_payment
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
msgstr ""
msgstr "你不能在视图类型的科目创建账目项目"
#. module: account_payment
#: report:payment.order:0
@ -715,19 +724,19 @@ msgstr "建立付款"
#. module: account_payment
#: field:payment.order,date_prefered:0
msgid "Preferred Date"
msgstr ""
msgstr "计划时间"
#. module: account_payment
#: view:account.payment.make.payment:0
#: view:account.payment.populate.statement:0
#: view:payment.order.create:0
msgid "or"
msgstr ""
msgstr "or"
#. module: account_payment
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
msgstr ""
msgstr "你不能在关闭的科目创建账目项目"
#. module: account_payment
#: help:payment.mode,bank_id:0

16
addons/account_sequence/i18n/nl_BE.po
View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-07-27 13:19+0000\n"
"PO-Revision-Date: 2012-11-27 13:36+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_sequence
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
msgstr ""
msgstr "U kunt geen boekingen doen op een afgesloten rekening."
#. module: account_sequence
#: view:account.sequence.installer:0
@ -116,7 +116,7 @@ msgstr "Naam"
#. module: account_sequence
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
msgstr ""
msgstr "U kunt geen boekingen doen op een rekening van het type Weergave."
#. module: account_sequence
#: constraint:account.journal:0
@ -124,6 +124,8 @@ msgid ""
"Configuration error!\n"
"The currency chosen should be shared by the default accounts too."
msgstr ""
"Configuratiefout.\n"
"De gekozen munt moet door de standaardrekeningen worden gedeeld."
#. module: account_sequence
#: sql_constraint:account.move.line:0
@ -135,6 +137,8 @@ msgstr "Verkeerde credit– of debetwaarde in de boeking."
msgid ""
"You cannot create more than one move per period on a centralized journal."
msgstr ""
"U kunt niet meer dan één boeking per periode doen in een gecentraliseerd "
"dagboek."
#. module: account_sequence
#: field:account.journal,internal_sequence_id:0
@ -144,7 +148,7 @@ msgstr "Intern volgnummer"
#. module: account_sequence
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
msgstr ""
msgstr "De rekening en de periode moeten tot dezelfde firma behoren."
#. module: account_sequence
#: help:account.sequence.installer,prefix:0

2
addons/account_voucher/account_voucher_view.xml
View File

@ -174,7 +174,7 @@
<field name="view_id" ref="view_voucher_form"/>
<field name="act_window_id" ref="action_voucher_list"/>
</record>
<menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
<menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6" groups="base.group_no_one"/>
<act_window
id="act_journal_voucher_open"

22
addons/account_voucher/i18n/nl_BE.po
View File

@ -7,51 +7,51 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
"PO-Revision-Date: 2009-04-10 09:54+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2012-11-27 13:39+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:15+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
msgid "Reconciliation"
msgstr ""
msgstr "Afpunting"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_config_settings
msgid "account.config.settings"
msgstr ""
msgstr "account.config.settings"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:348
#, python-format
msgid "Write-Off"
msgstr ""
msgstr "Afschrijving"
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Ref"
msgstr ""
msgstr "Betalingsreferentie"
#. module: account_voucher
#: view:account.voucher:0
msgid "Total Amount"
msgstr ""
msgstr "Totaalbedrag"
#. module: account_voucher
#: view:account.voucher:0
msgid "Open Customer Journal Entries"
msgstr ""
msgstr "Openstaande boekingen klanten"
#. module: account_voucher
#: view:account.voucher:0
#: view:sale.receipt.report:0
msgid "Group By..."
msgstr ""
msgstr "Groeperen op..."
#. module: account_voucher
#: help:account.voucher,writeoff_amount:0

4
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -101,7 +101,7 @@
<field name="tax_id"
on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
widget="selection" nolabel="1"
placeholder="Select tax..."
placeholder="Tax"
domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
<field name="tax_amount" nolabel="1"/>
<div class="oe_subtotal_footer_separator">
@ -264,7 +264,7 @@
<field name="tax_id"
on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
widget="selection" nolabel="1"
placeholder="Select tax..."
placeholder="Tax"
domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
/>

1
addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
View File

@ -136,6 +136,7 @@ class account_analytic_account(osv.osv):
'name': name,
'view_type': 'form',
'view_mode': 'tree,form',
'context':{'analytic_account':ids[0]},
'domain' : domain,
'res_model': 'hr.expense.expense',
'nodestroy': True,

30
addons/auth_anonymous/i18n/nl_BE.po Normal file
View File

@ -0,0 +1,30 @@
# Dutch (Belgium) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-27 13:37+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: auth_anonymous
#. openerp-web
#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
#, python-format
msgid "Login"
msgstr "Aanmelden"
#. module: auth_anonymous
#: model:res.groups,name:auth_anonymous.group_anonymous
msgid "Anonymous Group"
msgstr "Anonieme groep"

30
addons/auth_anonymous/i18n/zh_CN.po Normal file
View File

@ -0,0 +1,30 @@
# Chinese (Simplified) translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-27 16:43+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: auth_anonymous
#. openerp-web
#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
#, python-format
msgid "Login"
msgstr "登录"
#. module: auth_anonymous
#: model:res.groups,name:auth_anonymous.group_anonymous
msgid "Anonymous Group"
msgstr "匿名组"

17
addons/auth_oauth/auth_oauth_data.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<record id="provider_openerp" model="auth.oauth.provider">
<field name="name">OpenERP Accounts</field>
<field name="name">OpenERP.com Accounts</field>
<field name="auth_endpoint">https://accounts.openerp.com/oauth2/auth</field>
<field name="scope">userinfo</field>
<field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
<field name="data_endpoint"></field>
<field name="css_class">zocial openerp</field>
<field name="body">Sign in with OpenERP account</field>
<field name="body">Log in with OpenERP.com</field>
<field name="enabled" eval="True"/>
</record>
<record id="provider_facebook" model="auth.oauth.provider">
<field name="name">Facebook Graph</field>
@ -18,7 +18,7 @@
<field name="validation_endpoint">https://graph.facebook.com/me/permissions</field>
<field name="data_endpoint"></field>
<field name="css_class">zocial facebook</field>
<field name="body">Sign in with facebook</field>
<field name="body">Log in with facebook</field>
</record>
<record id="provider_google" model="auth.oauth.provider">
<field name="name">Google OAuth2</field>
@ -27,9 +27,10 @@
<field name="validation_endpoint">https://www.googleapis.com/oauth2/v1/tokeninfo</field>
<field name="data_endpoint">https://www.googleapis.com/oauth2/v1/userinfo</field>
<field name="css_class">zocial google</field>
<field name="body">Sign in with google</field>
<field name="body">Log in with google</field>
</record>
<!-- <record id="provider_twitter" model="auth.oauth.provider">
<!--
<record id="provider_twitter" model="auth.oauth.provider">
<field name="name">Twitter OAuth</field>
<field name="auth_endpoint">https://api.twitter.com/oauth/request_token</field>
<field name="scope"></field>
@ -37,7 +38,7 @@
<field name="data_endpoint"></field>
<field name="css_class">zocial twitter</field>
<field name="body">Sign in with twitter</field>
</record> -->
</record>
-->
</data>
</openerp>

59
addons/auth_oauth/res_users.py
View File

@ -45,6 +45,25 @@ class res_users(osv.Model):
validation.update(data)
return validation
def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
""" retrieve and sign in the user corresponding to provider and validated access token
:param provider: oauth provider id (int)
:param validation: result of validation of access token (dict)
:param params: oauth parameters (dict)
:return: user login (str)
:raise: openerp.exceptions.AccessDenied if signin failed
This method can be overridden to add alternative signin methods.
"""
oauth_uid = validation['user_id']
user_ids = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
if not user_ids:
raise openerp.exceptions.AccessDenied()
assert len(user_ids) == 1
user = self.browse(cr, uid, user_ids[0], context=context)
user.write({'oauth_access_token': params['access_token']})
return user.login
def auth_oauth(self, cr, uid, provider, params, context=None):
# Advice by Google (to avoid Confused Deputy Problem)
# if validation.audience != OUR_CLIENT_ID:
@ -53,39 +72,15 @@ class res_users(osv.Model):
# continue with the process
access_token = params.get('access_token')
validation = self._auth_oauth_validate(cr, uid, provider, access_token)
# required
oauth_uid = validation['user_id']
if not oauth_uid:
# required check
if not validation.get('user_id'):
raise openerp.exceptions.AccessDenied()
email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
login = email
# optional
name = validation.get('name', email)
res = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
if res:
assert len(res) == 1
user = self.browse(cr, uid, res[0], context=context)
login = user.login
user.write({'oauth_access_token': access_token})
else:
# New user if signup module available
if not hasattr(self, '_signup_create_user'):
raise openerp.exceptions.AccessDenied()
new_user = {
'name': name,
'login': login,
'user_email': email,
'oauth_provider_id': provider,
'oauth_uid': oauth_uid,
'oauth_access_token': access_token,
'active': True,
}
# TODO pass signup token to allow attach new user to right partner
self._signup_create_user(cr, uid, new_user)
credentials = (cr.dbname, login, access_token)
return credentials
# retrieve and sign in user
login = self._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
if not login:
raise openerp.exceptions.AccessDenied()
# return user credentials
return (cr.dbname, login, access_token)
def check_credentials(self, cr, uid, password):
try:

1
addons/auth_oauth/static/src/css/auth_oauth.css
View File

@ -9,7 +9,6 @@
}
.openerp a.zocial.openerp {
float: right;
border: 1px solid #222222;
color: white;
margin: 0;

31
addons/auth_oauth/static/src/js/auth_oauth.js
View File

@ -35,27 +35,30 @@ openerp.auth_oauth = function(instance) {
on_oauth_sign_in: function(ev) {
ev.preventDefault();
var index = $(ev.target).data('index');
var p = this.oauth_providers[index];
var ret = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
var provider = this.oauth_providers[index];
var return_url = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
if (instance.session.debug) {
ret += '?debug';
return_url += '?debug';
}
var dbname = self.$("form [name=db]").val();
var state_object = {
d: dbname,
p: p.id
};
var state = JSON.stringify(state_object);
var state = this._oauth_state(provider);
var params = {
response_type: 'token',
client_id: p.client_id,
redirect_uri: ret,
scope: p.scope,
state: state,
client_id: provider.client_id,
redirect_uri: return_url,
scope: provider.scope,
state: JSON.stringify(state),
};
var url = p.auth_endpoint + '?' + $.param(params);
var url = provider.auth_endpoint + '?' + $.param(params);
window.location = url;
},
_oauth_state: function(provider) {
// return the state object sent back with the redirected uri
var dbname = this.$("form [name=db]").val();
return {
d: dbname,
p: provider.id,
};
},
});
};

22
addons/auth_oauth_signup/__init__.py Normal file
View File

@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# 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/>
#
##############################################################################
import res_users

39
addons/auth_oauth_signup/__openerp__.py Normal file
View File

@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# 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/>.
#
##############################################################################
{
'name': 'Signup with OAuth2 Authentication',
'version': '1.0',
'category': 'Hidden',
'description': """
Allow users to sign up through OAuth2 Provider.
===============================================
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['auth_oauth', 'auth_signup'],
'data': [],
'js': ['static/src/js/auth_oauth_signup.js'],
'css': [],
'qweb': [],
'installable': True,
'auto_install': True,
}

55
addons/auth_oauth_signup/res_users.py Normal file
View File

@ -0,0 +1,55 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# 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/>.
#
##############################################################################
import logging
import simplejson
import openerp
from openerp.osv import osv, fields
_logger = logging.getLogger(__name__)
class res_users(osv.Model):
_inherit = 'res.users'
def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
# overridden to use signup method if regular oauth signin fails
try:
login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
except openerp.exceptions.AccessDenied:
state = simplejson.loads(params['state'])
token = state.get('t')
oauth_uid = validation['user_id']
email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
name = validation.get('name', email)
values = {
'name': name,
'login': email,
'email': email,
'oauth_provider_id': provider,
'oauth_uid': oauth_uid,
'oauth_access_token': params['access_token'],
'active': True,
}
_, login, _ = self.signup(cr, uid, values, token, context=context)
return login

14
addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js Normal file
View File

@ -0,0 +1,14 @@
openerp.auth_oauth_signup = function(instance) {
// override Login._oauth_state to add the signup token in the state
instance.web.Login.include({
_oauth_state: function(provider) {
var state = this._super.apply(this, arguments);
if (this.params.token) {
state.t = this.params.token;
}
return state;
},
});
};

12
addons/auth_openid/i18n/tr.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-02-09 22:49+0000\n"
"PO-Revision-Date: 2012-11-27 22:07+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: auth_openid
#. openerp-web
@ -69,7 +69,7 @@ msgstr ""
#. module: auth_openid
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
msgstr ""
msgstr "OAuth UID her sağlayıcı için tekil olmalı"
#. module: auth_openid
#: field:res.users,openid_key:0
@ -79,7 +79,7 @@ msgstr "OpenID Anahtarı"
#. module: auth_openid
#: constraint:res.users:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "Hata: Geçersiz EAN barkodu"
#. module: auth_openid
#: constraint:res.users:0
@ -94,7 +94,7 @@ msgstr "OpenID E-posta"
#. module: auth_openid
#: model:ir.model,name:auth_openid.model_res_users
msgid "Users"
msgstr ""
msgstr "Kullanıcılar"
#. module: auth_openid
#. openerp-web

83
addons/auth_reset_password/i18n/tr.po Normal file
View File

@ -0,0 +1,83 @@
# Turkish translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-27 22:15+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: auth_reset_password
#: model:email.template,body_html:auth_reset_password.reset_password_email
msgid ""
"\n"
"<p>A password reset was requested for the OpenERP account linked to this "
"email.</p>\n"
"\n"
"<p>You may change your password following <a "
"href=\"${object.signup_url}\">this link</a>.</p>\n"
"\n"
"<p>Note: If you did not ask for a password reset, you can safely ignore this "
"email.</p>"
msgstr ""
"\n"
"<p>Bu epostayla ilişkili OpenERP hesabı için bir parola sıfırlama isteği "
"istendi.</p>\n"
"\n"
"<p>Şifrenizi şu adresten değiştirebilirsiniz. <a "
"href=\"${object.signup_url}\">this link</a>.</p>\n"
"\n"
"<p>Not: Eğer bu parola değiştirme isteğini siz yapmadıysanız bu mesajı "
"görmezden gelebilirsiniz. </p>"
#. module: auth_reset_password
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
#. module: auth_reset_password
#: model:ir.model,name:auth_reset_password.model_res_users
msgid "Users"
msgstr "Kullanıcılar"
#. module: auth_reset_password
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
msgstr "OAuth UID her sağlayıcı için tekil olmalı"
#. module: auth_reset_password
#: view:res.users:0
msgid "Reset Password"
msgstr "Parolayı Sıfırla"
#. module: auth_reset_password
#: model:email.template,subject:auth_reset_password.reset_password_email
msgid "Password reset"
msgstr "Parola sıfırlandı"
#. module: auth_reset_password
#: constraint:res.users:0
msgid "Error: Invalid ean code"
msgstr "Hata: Geçersiz EAN barkodu"
#. module: auth_reset_password
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr "Seçilen şirket bu kullanıcı için izin verilen şirketler arasında yok"
#. module: auth_reset_password
#. openerp-web
#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
#, python-format
msgid "Reset password"
msgstr "Parolayı sıfırla"

1
addons/auth_signup/__openerp__.py
View File

@ -37,6 +37,5 @@ Allow users to sign up.
'res_users_view.xml',
],
'js': ['static/src/js/auth_signup.js'],
'css' : ['static/src/css/base.css'],
'qweb': ['static/src/xml/auth_signup.xml'],
}

3
addons/auth_signup/static/src/css/Makefile
View File

@ -1,3 +0,0 @@
base.css: base.sass
sass --trace -t expanded base.sass base.css

10
addons/auth_signup/static/src/css/base.css
View File

@ -1,10 +0,0 @@
@charset "utf-8";
.openerp .oe_login .oe_signup_show {
display: none;
}
.openerp .oe_login_signup .oe_signup_show {
display: block !important;
}
.openerp .oe_login_signup .oe_signup_hide {
display: none;
}

13
addons/auth_signup/static/src/css/base.sass
View File

@ -1,13 +0,0 @@
@charset "utf-8"
.openerp
// Regular login form
.oe_login
.oe_signup_show
display: none
// Signup form
.oe_login_signup
.oe_signup_show
display: block !important
.oe_signup_hide
display: none

5
addons/auth_signup/static/src/js/auth_signup.js
View File

@ -7,12 +7,15 @@ openerp.auth_signup = function(instance) {
var self = this;
var d = this._super();
self.$(".oe_signup_show").hide();
// to switch between the signup and regular login form
this.$('a.oe_signup_signup').click(function(ev) {
if (ev) {
ev.preventDefault();
}
self.$el.addClass("oe_login_signup");
self.$(".oe_signup_show").show();
self.$(".oe_signup_hide").hide();
return false;
});
this.$('a.oe_signup_back').click(function(ev) {
@ -20,6 +23,8 @@ openerp.auth_signup = function(instance) {
ev.preventDefault();
}
self.$el.removeClass("oe_login_signup");
self.$(".oe_signup_show").hide();
self.$(".oe_signup_hide").show();
delete self.params.token;
return false;
});

15
addons/auth_signup/static/src/xml/auth_signup.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- vim:fdl=1: -->
<!-- vim:fdl=1:
-->
<templates id="template" xml:space="preserve">
<t t-extend="Login">
@ -16,12 +17,12 @@
<li class="oe_signup_show"><input name="confirm_password" type="password"/></li>
</t>
<t t-jquery="form ul:first li:has(button[name=submit])" t-operation="replace">
<li class="oe_signup_hide"><button name="submit">Log in</button></li>
<li class="oe_signup_show"><button name="submit">Sign in</button></li>
</t>
<t t-jquery="form ul:first li:last" t-operation="after">
<li><a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a></li>
<li><a class="oe_signup_show oe_signup_back" href="#">Back to Login</a></li>
<li>
<button class="oe_signup_hide" name="submit">Log in</button>
<button class="oe_signup_show" name="submit">Sign up</button>
<a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a>
<a class="oe_signup_show oe_signup_back" href="#">Back to Login</a>
</li>
</t>
</t>

14
addons/base_crypt/i18n/tr.po
View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2011-02-15 15:37+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-11-27 21:53+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: base_crypt
#: constraint:res.users:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "Hata: Geçersiz EAN barkodu"
#. module: base_crypt
#: constraint:res.users:0
@ -30,12 +30,12 @@ msgstr "Seçilen firma bu kullanıcı için izin verilen firmalar arasında yok"
#. module: base_crypt
#: model:ir.model,name:base_crypt.model_res_users
msgid "Users"
msgstr ""
msgstr "Kullanıcılar"
#. module: base_crypt
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
msgstr ""
msgstr "OAuth UID her sağlayıcı için tekil olmalı"
#. module: base_crypt
#: sql_constraint:res.users:0

10
addons/base_report_designer/i18n/tr.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-05-10 18:06+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-11-27 20:20+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_base_report_sxw
@ -180,7 +180,7 @@ msgstr "İptal"
#. module: base_report_designer
#: view:base.report.sxw:0
msgid "or"
msgstr ""
msgstr "veya"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml

10
addons/base_report_designer/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-05-10 17:33+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"PO-Revision-Date: 2012-11-27 02:28+0000\n"
"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_base_report_sxw
@ -175,7 +175,7 @@ msgstr "取消"
#. module: base_report_designer
#: view:base.report.sxw:0
msgid "or"
msgstr ""
msgstr "or"
#. module: base_report_designer
#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml

23
addons/base_status/base_stage.py
View File

@ -202,9 +202,7 @@ class base_stage(object):
def case_escalate(self, cr, uid, ids, context=None):
""" Escalates case to parent level """
cases = self.browse(cr, uid, ids, context=context)
cases[0].state # fill browse record cache, for _action having old and new values
for case in cases:
for case in self.browse(cr, uid, ids, context=context):
data = {'active': True}
if case.section_id.parent_id:
data['section_id'] = case.section_id.parent_id.id
@ -215,8 +213,6 @@ class base_stage(object):
raise osv.except_osv(_('Error!'), _("You are already at the top level of your sales-team category.\nTherefore you cannot escalate furthermore."))
self.write(cr, uid, [case.id], data, context=context)
case.case_escalate_send_note(case.section_id.parent_id, context=context)
cases = self.browse(cr, uid, ids, context=context)
self._action(cr, uid, cases, 'escalate', context=context)
return True
def case_open(self, cr, uid, ids, context=None):
@ -256,8 +252,7 @@ class base_stage(object):
def case_set(self, cr, uid, ids, new_state_name=None, values_to_update=None, new_stage_id=None, context=None):
""" Generic method for setting case. This methods wraps the update
of the record, as well as call to _action and browse_record
case setting to fill the cache.
of the record.
:params new_state_name: the new state of the record; this method
will call ``stage_set_with_state_name``
@ -271,7 +266,6 @@ class base_stage(object):
update when writing values to the record.
"""
cases = self.browse(cr, uid, ids, context=context)
cases[0].state # fill browse record cache, for _action having old and new values
# 1. update the stage
if new_state_name:
self.stage_set_with_state_name(cr, uid, cases, new_state_name, context=context)
@ -280,13 +274,14 @@ class base_stage(object):
# 2. update values
if values_to_update:
self.write(cr, uid, ids, values_to_update, context=context)
# 3. call _action for base action rule
if new_state_name:
self._action(cr, uid, cases, new_state_name, context=context)
elif not (new_stage_id is None):
new_state_name = self.read(cr, uid, ids, ['state'], context=context)[0]['state']
self._action(cr, uid, cases, new_state_name, context=context)
return True
def write(self, cr, uid, ids, vals, context=None):
res = super(base_stage,self).write(cr, uid, ids, vals, context)
if vals.get('stage_id'):
for case in self.browse(cr, uid, ids, context=context):
self._action(cr, uid, case, case.stage_id.state, context=context)
return res
def _action(self, cr, uid, cases, state_to, scrit=None, context=None):
if context is None:

12
addons/base_vat/i18n/tr.po
View File

@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-01-23 22:01+0000\n"
"PO-Revision-Date: 2012-11-27 21:48+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: base_vat
#: view:res.partner:0
msgid "Check Validity"
msgstr ""
msgstr "Geçerliliğini Kontrol et"
#. module: base_vat
#: code:addons/base_vat/base_vat.py:147
@ -60,12 +60,12 @@ msgstr "Hata! Özyinelemeli firmalar oluşturamazsınız."
#: code:addons/base_vat/base_vat.py:111
#, python-format
msgid "Error!"
msgstr ""
msgstr "Hata!"
#. module: base_vat
#: constraint:res.partner:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "Hata: Geçersiz EAN barkodu"
#. module: base_vat
#: help:res.partner,vat_subjected:0

37
addons/contacts/i18n/es.po Normal file
View File

@ -0,0 +1,37 @@
# Spanish translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-27 01:35+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: contacts
#: model:ir.actions.act_window,help:contacts.action_contacts
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to add a contact in your address book.\n"
" </p><p>\n"
" OpenERP helps you easily track all activities related to\n"
" a customer; discussions, history of business opportunities,\n"
" documents, etc.\n"
" </p>\n"
" "
msgstr ""
#. module: contacts
#: model:ir.actions.act_window,name:contacts.action_contacts
#: model:ir.ui.menu,name:contacts.menu_contacts
msgid "Contacts"
msgstr ""

37
addons/contacts/i18n/hu.po Normal file
View File

@ -0,0 +1,37 @@
# Hungarian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-27 23:56+0000\n"
"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
"Language-Team: Hungarian <hu@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: contacts
#: model:ir.actions.act_window,help:contacts.action_contacts
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to add a contact in your address book.\n"
" </p><p>\n"
" OpenERP helps you easily track all activities related to\n"
" a customer; discussions, history of business opportunities,\n"
" documents, etc.\n"
" </p>\n"
" "
msgstr ""
#. module: contacts
#: model:ir.actions.act_window,name:contacts.action_contacts
#: model:ir.ui.menu,name:contacts.menu_contacts
msgid "Contacts"
msgstr "Kapcsolatok"

44
addons/contacts/i18n/tr.po Normal file
View File

@ -0,0 +1,44 @@
# Turkish translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-27 21:52+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: contacts
#: model:ir.actions.act_window,help:contacts.action_contacts
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
" Click to add a contact in your address book.\n"
" </p><p>\n"
" OpenERP helps you easily track all activities related to\n"
" a customer; discussions, history of business opportunities,\n"
" documents, etc.\n"
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" Adres defterinizden bir carinin üzerine tıklayın.\n"
" </p><p>\n"
" OpenERP bir müşteriye ait bütün aktiviteleri takip etmenize\n"
" yardım eder; mesela iş fırsatlarını, dökümanları, vs.\n"
" </p>\n"
" "
#. module: contacts
#: model:ir.actions.act_window,name:contacts.action_contacts
#: model:ir.ui.menu,name:contacts.menu_contacts
msgid "Contacts"
msgstr "Cariler"

4
addons/crm/crm_action_rule_demo.xml
View File

@ -43,7 +43,7 @@ Thanks,
</record>
<record id="filter_draft_lead" model="ir.filters">
<field name="name">Filter on leads which are draft.</field>
<field name="name">Draft Leads</field>
<field name="model_id">crm.lead</field>
<field name="domain">[('state','=','draft')]</field>
<field name="user_id" eval="False"/>
@ -62,7 +62,7 @@ Thanks,
</record>
<record id="filter_usa_lead" model="ir.filters">
<field name="name">Filter on leads which come from USA.</field>
<field name="name">Leads from USA</field>
<field name="model_id">crm.lead</field>
<field name="domain">[('country_id','=','United States')]</field>
<field name="user_id" eval="False"/>

4
addons/crm/crm_lead_view.xml
View File

@ -210,7 +210,7 @@
<field name="company_id"
groups="base.group_multi_company"
widget="selection" colspan="2"/>
<field name="type_id" widget="selection"/>
<field name="type_id"/>
<field name="channel_id" widget="selection"/>
<field name="referred"/>
<field name="state" groups="base.group_no_one"/>
@ -498,7 +498,7 @@
</group>
<group string="Categorization">
<field name="type_id" widget="selection"/>
<field name="type_id" />
<field name="channel_id" widget="selection"/>
</group>
<group string="Mailings">

2
addons/crm/crm_phonecall.py
View File

@ -127,6 +127,8 @@ class crm_phonecall(base_state, osv.osv):
section_id = call.section_id and call.section_id.id or False
if not user_id:
user_id = call.user_id and call.user_id.id or False
if not schedule_time:
schedule_time = call.date
vals = {
'name' : call_summary,
'user_id' : user_id or False,

4
addons/crm/i18n/zh_CN.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-26 04:41+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: crm
#: view:crm.lead.report:0

14
addons/crm/res_partner_view.xml
View File

@ -15,20 +15,6 @@
</field>
</record>
<record id="view_partners_form_crm3" model="ir.ui.view">
<field name="name">view.res.partner.search.crm.inherited3</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_res_partner_filter"/>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<xpath expr="//group[@string='Group By...']" position="after">
<group string="Display">
<filter string="Show Sales Team" context="{'invisible_section': False}"/>
</group>
</xpath>
</field>
</record>
<!-- open meetings related to given partner -->
<record id="crm_meeting_partner" model="ir.actions.act_window">
<field name="name">Meetings</field>

8
addons/crm_claim/crm_claim_menu.xml
View File

@ -2,12 +2,6 @@
<openerp>
<data>
<!-- Top menu item -->
<menuitem name="Project"
id="base.menu_main_pm"
groups="base.group_sale_salesman"
sequence="40"/>
<menuitem id="base.menu_aftersale" name="After-Sale Services"
groups="base.group_sale_salesman"
parent="base.menu_base_partner" sequence="2" />
@ -50,8 +44,6 @@
parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
<!-- Claim Stages -->
<menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
<menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
<menuitem id="menu_claim_stage_view" name="Stages" action="crm_claim_stage_act" parent="menu_config_claim" sequence="20"/>
</data>

12
addons/crm_todo/i18n/zh_CN.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-02-17 03:58+0000\n"
"Last-Translator: 开阖软件 Jeff Wang <jeff@osbzr.com>\n"
"PO-Revision-Date: 2012-11-27 02:01+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: crm_todo
#: model:ir.model,name:crm_todo.model_project_task
@ -30,7 +30,7 @@ msgstr "时间箱"
#. module: crm_todo
#: view:crm.lead:0
msgid "Lead"
msgstr ""
msgstr "线索"
#. module: crm_todo
#: view:crm.lead:0
@ -77,7 +77,7 @@ msgstr "取消"
#. module: crm_todo
#: model:ir.model,name:crm_todo.model_crm_lead
msgid "Lead/Opportunity"
msgstr ""
msgstr "线索/商机"
#. module: crm_todo
#: field:project.task,lead_id:0

10
addons/decimal_precision/i18n/nl_BE.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-03-01 17:22+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-11-27 13:41+0000\n"
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: decimal_precision
#: field:decimal.precision,digits:0
@ -28,6 +28,8 @@ msgid ""
"Error! You cannot define the decimal precision of 'Account' as greater than "
"the rounding factor of the company's main currency"
msgstr ""
"U kunt de decimale precisie voor Rekening niet groter zetten dan de "
"afrondingsfactor van de standaardmunt van uw bedrijf."
#. module: decimal_precision
#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form

54
addons/delivery/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-02 01:52+0000\n"
"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
"PO-Revision-Date: 2012-11-27 03:04+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: delivery
#: report:sale.shipping:0
@ -29,7 +29,7 @@ msgstr "由post送货"
#. module: delivery
#: view:delivery.grid.line:0
msgid " in Function of "
msgstr ""
msgstr " 在功能 "
#. module: delivery
#: view:delivery.carrier:0
@ -64,7 +64,7 @@ msgstr "体积"
#. module: delivery
#: view:delivery.carrier:0
msgid "Zip"
msgstr ""
msgstr "邮政编码"
#. module: delivery
#: field:delivery.grid,line_ids:0
@ -100,12 +100,23 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 单击 定义一个新的运输方法 \n"
" </p><p>\n"
" 每个承运商人 (比如：UPS，顺风)可以几种运输方法 \n"
" (例如：UPS Express, UPS Standard ) ，每种方法可\n"
" 以有一个定价规则.\n"
" </p><p>\n"
" 在销售订单（基于报价单）或者发票（基于发运单），\n"
" 这些方法可以根据你的设置自动计算运输价格；\n"
" </p>\n"
" "
#. module: delivery
#: code:addons/delivery/delivery.py:221
#, python-format
msgid "No line matched this product or order in the chosen delivery grid."
msgstr ""
msgstr "在选择运输网络里，没有一行匹配这个产品或者订单。"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_picking_tree4
@ -145,6 +156,13 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 单击 为指定区域创建运输价格表.\n"
" </p><p>\n"
" 运输价格表允许 根据产品的重量和其他条件，计算运输的成本和销售价格.\n"
" 你能为每种运输方法定义几种价格表:为每个国家，或者在特定国家根据邮政编码的定义的一个区域.\n"
" </p>\n"
" "
#. module: delivery
#: report:sale.shipping:0
@ -164,7 +182,7 @@ msgstr "金额"
#. module: delivery
#: view:sale.order:0
msgid "Add in Quote"
msgstr ""
msgstr "添加引用"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@ -217,7 +235,7 @@ msgstr "网络定义"
#: code:addons/delivery/stock.py:89
#, python-format
msgid "Warning!"
msgstr ""
msgstr "警告！"
#. module: delivery
#: field:delivery.grid.line,operator:0
@ -237,14 +255,14 @@ msgstr "销售订单"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_picking_out
msgid "Delivery Orders"
msgstr ""
msgstr "送货单"
#. module: delivery
#: view:sale.order:0
msgid ""
"If you don't 'Add in Quote', the exact price will be computed when invoicing "
"based on delivery order(s)."
msgstr ""
msgstr "如果你没有“添加引用”，当基于送货单开票时，将计算精确的价格。"
#. module: delivery
#: field:delivery.carrier,partner_id:0
@ -293,7 +311,7 @@ msgstr "免费送货的订单金额，以公司本位币显示"
#. module: delivery
#: field:delivery.carrier,free_if_more_than:0
msgid "Free If Order Total Amount Is More Than"
msgstr ""
msgstr "当订单总额多于 时，免费"
#. module: delivery
#: field:delivery.grid.line,grid_id:0
@ -409,7 +427,7 @@ msgstr "条件"
#. module: delivery
#: constraint:stock.move:0
msgid "You must assign a serial number for this product."
msgstr ""
msgstr "你必须为这个产品指定序列号"
#. module: delivery
#: field:delivery.grid.line,standard_price:0
@ -419,7 +437,7 @@ msgstr "成本价"
#. module: delivery
#: constraint:stock.move:0
msgid "You cannot move products from or to a location of the type view."
msgstr ""
msgstr "你不能从视图类型的库位移动"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
@ -474,7 +492,7 @@ msgstr "订单号必须在一个公司范围内唯一"
#. module: delivery
#: model:ir.model,name:delivery.model_stock_picking_in
msgid "Incoming Shipments"
msgstr ""
msgstr "入库"
#. module: delivery
#: selection:delivery.grid.line,operator:0
@ -484,7 +502,7 @@ msgstr "<="
#. module: delivery
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product."
msgstr ""
msgstr "您企图为不一样的产品创建批号"
#. module: delivery
#: report:sale.shipping:0
@ -558,7 +576,7 @@ msgstr "承运方"
#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
msgid "Delivery Methods"
msgstr ""
msgstr "运输方法"
#. module: delivery
#: field:sale.order,id:0
@ -589,7 +607,7 @@ msgstr "销售价格"
#. module: delivery
#: view:stock.picking.out:0
msgid "Print Delivery Order"
msgstr ""
msgstr "打印送货单"
#. module: delivery
#: view:delivery.grid:0

6
addons/delivery/sale.py
View File

@ -31,10 +31,10 @@ class sale_order(osv.osv):
'id': fields.integer('ID', readonly=True,invisible=True),
}
def onchange_partner_id(self, cr, uid, ids, part):
result = super(sale_order, self).onchange_partner_id(cr, uid, ids, part)
def onchange_partner_id(self, cr, uid, ids, part, context=None):
result = super(sale_order, self).onchange_partner_id(cr, uid, ids, part, context=context)
if part:
dtype = self.pool.get('res.partner').browse(cr, uid, part).property_delivery_carrier.id
dtype = self.pool.get('res.partner').browse(cr, uid, part, context=context).property_delivery_carrier.id
result['value']['carrier_id'] = dtype
return result

69
addons/document/i18n/nb.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-20 17:33+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-11-26 14:59+0000\n"
"Last-Translator: Kaare Pettersen <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: document
#: field:document.directory,parent_id:0
@ -41,7 +41,7 @@ msgstr ""
#. module: document
#: sql_constraint:document.directory:0
msgid "Directory must have a parent or a storage."
msgstr ""
msgstr "Katalog må ha en overordnede eller en lagringsplass."
#. module: document
#: view:document.directory:0
@ -54,6 +54,8 @@ msgid ""
"Field to be used as name on resource directories. If empty, the \"name\" "
"will be used."
msgstr ""
"Feltet for å bli brukt som navn på ressurs kataloger. Hvis tomt, vil "
"\"navn\" benyttes."
#. module: document
#: view:document.directory:0
@ -64,7 +66,7 @@ msgstr "Grupper etter ..."
#. module: document
#: model:ir.model,name:document.model_document_directory_content_type
msgid "Directory Content Type"
msgstr ""
msgstr "Katalog Innholdstype."
#. module: document
#: view:document.directory:0
@ -142,7 +144,7 @@ msgstr "Filtrere på mine dokumenter."
#: view:ir.attachment:0
#: field:ir.attachment,index_content:0
msgid "Indexed Content"
msgstr ""
msgstr "Indeksert innhold."
#. module: document
#: help:document.directory,resource_find_all:0
@ -150,6 +152,8 @@ msgid ""
"If true, all attachments that match this resource will be located. If "
"false, only ones that have this as parent."
msgstr ""
"Hvis sant, vil alle vedlegg som samsvarer denne ressursen bli plassert. Hvis "
"falsk, eneste som har dette som overordnede."
#. module: document
#: view:document.directory:0
@ -273,7 +277,7 @@ msgstr "Innholdstype"
#. module: document
#: view:ir.attachment:0
msgid "Modification"
msgstr ""
msgstr "Endring."
#. module: document
#: view:document.directory:0
@ -288,7 +292,7 @@ msgstr "Type"
#: code:addons/document/document_directory.py:234
#, python-format
msgid "%s (copy)"
msgstr ""
msgstr "%s (kopi)"
#. module: document
#: help:document.directory,ressource_type_id:0
@ -306,7 +310,7 @@ msgstr ""
#. module: document
#: constraint:document.directory:0
msgid "Error! You cannot create recursive directories."
msgstr ""
msgstr "Feil! Du kan ikke opprette rekursive kataloger."
#. module: document
#: field:document.directory,resource_field:0
@ -316,7 +320,7 @@ msgstr "Felt navn."
#. module: document
#: field:document.directory,dctx_ids:0
msgid "Context fields"
msgstr ""
msgstr "Kontekst felt."
#. module: document
#: field:ir.attachment,store_fname:0
@ -347,13 +351,13 @@ msgstr "Utvidelse"
#. module: document
#: field:document.directory,content_ids:0
msgid "Virtual Files"
msgstr ""
msgstr "Virtuelle filer."
#. module: document
#: code:addons/document/document_storage.py:635
#, python-format
msgid "Error at doc write!"
msgstr ""
msgstr "Feil på doc skrive!"
#. module: document
#: view:document.directory:0
@ -394,12 +398,12 @@ msgstr "Siste endring bruker."
#: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
#: view:report.document.user:0
msgid "Files by User"
msgstr ""
msgstr "Filene etter bruker."
#. module: document
#: view:ir.attachment:0
msgid "on"
msgstr ""
msgstr "på."
#. module: document
#: field:document.directory,domain:0
@ -455,11 +459,12 @@ msgstr "Definere ord i sammenheng, for alle underordnede kataloger og filer."
msgid ""
"If not checked, media is currently offline and its contents not available"
msgstr ""
"Hvis det ikke er merket, er media offline og dens innhold ikke tilgjengelig."
#. module: document
#: field:report.document.user,user:0
msgid "unknown"
msgstr ""
msgstr "Ukjent."
#. module: document
#: view:document.directory:0
@ -505,12 +510,12 @@ msgstr ""
#: model:ir.actions.act_window,name:document.open_board_document_manager
#: model:ir.ui.menu,name:document.menu_reports_document
msgid "Knowledge"
msgstr ""
msgstr "Kunnskap."
#. module: document
#: view:document.storage:0
msgid "Document Storage"
msgstr ""
msgstr "Dokument lager."
#. module: document
#: view:document.configuration:0
@ -552,7 +557,7 @@ msgstr ""
#: code:addons/document/static/src/js/document.js:6
#, python-format
msgid "Attachment(s)"
msgstr ""
msgstr "Vedlegg(s)"
#. module: document
#: selection:report.document.user,month:0
@ -562,7 +567,7 @@ msgstr "August"
#. module: document
#: view:ir.attachment:0
msgid "My Document(s)"
msgstr ""
msgstr "Mine dokumenter."
#. module: document
#: sql_constraint:document.directory:0
@ -648,7 +653,7 @@ msgstr "Katalogen Navnet må være unikt!"
#. module: document
#: view:ir.attachment:0
msgid "Attachments"
msgstr ""
msgstr "Vedlegg."
#. module: document
#: field:document.directory,create_uid:0
@ -690,17 +695,17 @@ msgstr "Underordnede"
#. module: document
#: view:board.board:0
msgid "Files by user"
msgstr ""
msgstr "Filer av bruker."
#. module: document
#: selection:document.storage,type:0
msgid "External file storage"
msgstr ""
msgstr "Ekstern fillagring."
#. module: document
#: help:document.storage,path:0
msgid "For file storage, the root path of the storage"
msgstr ""
msgstr "For fil lagring, rotbanen Av lagring."
#. module: document
#: field:document.directory.dctx,field:0
@ -752,7 +757,7 @@ msgstr "ir.vedlegg"
#. module: document
#: view:report.document.user:0
msgid "Users File"
msgstr ""
msgstr "Brukerens fil."
#. module: document
#: view:document.directory:0
@ -795,7 +800,7 @@ msgstr "Navn"
#. module: document
#: sql_constraint:document.storage:0
msgid "The storage path must be unique!"
msgstr ""
msgstr "Lagrings stien må være unik!"
#. module: document
#: view:document.directory:0
@ -805,7 +810,7 @@ msgstr "Felter"
#. module: document
#: help:document.storage,readonly:0
msgid "If set, media is for reading only"
msgstr ""
msgstr "Hvis innstilt, er media for lesing bare."
#. module: document
#: selection:report.document.user,month:0
@ -821,7 +826,7 @@ msgstr "# av filer."
#. module: document
#: view:document.storage:0
msgid "Search Document Storage"
msgstr ""
msgstr "Søk dokument lagring."
#. module: document
#: view:document.directory:0
@ -837,7 +842,7 @@ msgstr ""
#: code:addons/document/static/src/js/document.js:17
#, python-format
msgid "%s (%s)"
msgstr ""
msgstr "%s (%s)"
#. module: document
#: field:document.directory.content,sequence:0
@ -847,7 +852,7 @@ msgstr "Sekvens"
#. module: document
#: field:document.directory.content,name:0
msgid "Content Name"
msgstr ""
msgstr "Innhold navn."
#. module: document
#: field:report.document.user,datas_fname:0
@ -857,7 +862,7 @@ msgstr "Filnavn"
#. module: document
#: selection:document.storage,type:0
msgid "Internal File storage"
msgstr ""
msgstr "Intern Fillagring."
#. module: document
#: view:document.configuration:0
@ -886,7 +891,7 @@ msgstr "Lagringsmedium"
#. module: document
#: field:document.directory.content,extension:0
msgid "Document Type"
msgstr ""
msgstr "Dokumenttype."
#~ msgid "Files per Month"
#~ msgstr "Filer per måned."

7
addons/document/wizard/document_configuration_view.xml
View File

@ -11,10 +11,9 @@
<attribute name="string">Knowledge Application Configuration</attribute>
</form>
<group string="res_config_contents" position="replace">
<group string="Configure Directories">
<label string="OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed."/>
<label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/>
</group>
<separator string="Configure Directories"/>
<p>OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</p>
<p>When executing this wizard, it will configure your directories automatically according to modules installed.</p>
</group>
</data>
</field>

16
addons/document_webdav/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-02-10 07:02+0000\n"
"Last-Translator: 开阖软件 Jeff Wang <jeff@osbzr.com>\n"
"PO-Revision-Date: 2012-11-27 16:44+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: document_webdav
#: field:document.webdav.dir.property,create_date:0
@ -30,7 +30,7 @@ msgstr "文档"
#. module: document_webdav
#: view:document.webdav.dir.property:0
msgid "Document property"
msgstr ""
msgstr "单据属性"
#. module: document_webdav
#: view:document.webdav.dir.property:0
@ -41,7 +41,7 @@ msgstr "文档属性列表"
#. module: document_webdav
#: sql_constraint:document.directory:0
msgid "Directory must have a parent or a storage."
msgstr ""
msgstr "目录必须有个上级或者是存储"
#. module: document_webdav
#: view:document.webdav.dir.property:0
@ -182,7 +182,7 @@ msgstr "创建人"
#. module: document_webdav
#: view:document.webdav.file.property:0
msgid "Document Property"
msgstr ""
msgstr "单据属性"
#. module: document_webdav
#: model:ir.ui.menu,name:document_webdav.menu_properties
@ -192,7 +192,7 @@ msgstr "DAV属性"
#. module: document_webdav
#: constraint:document.directory:0
msgid "Error! You cannot create recursive directories."
msgstr ""
msgstr "错误！你不能创建循环目录"
#. module: document_webdav
#: field:document.webdav.dir.property,do_subst:0

22
addons/edi/i18n/tr.po
View File

@ -8,28 +8,28 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-02-09 22:33+0000\n"
"PO-Revision-Date: 2012-11-27 22:29+0000\n"
"Last-Translator: Ahmet Altınışık <Unknown>\n"
"Language-Team: Turkish <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: edi
#. openerp-web
#: code:addons/edi/static/src/js/edi.js:67
#, python-format
msgid "Reason:"
msgstr ""
msgstr "Neden:"
#. module: edi
#. openerp-web
#: code:addons/edi/static/src/js/edi.js:60
#, python-format
msgid "The document has been successfully imported!"
msgstr ""
msgstr "öküman başarılı bir şekilde içeri alındı!"
#. module: edi
#: sql_constraint:res.company:0
@ -46,7 +46,7 @@ msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
#: code:addons/edi/static/src/js/edi.js:65
#, python-format
msgid "Sorry, the document could not be imported."
msgstr ""
msgstr "Üzgünüm, Döküman içeri alınamadı."
#. module: edi
#: constraint:res.company:0
@ -61,7 +61,7 @@ msgstr "Şirketler"
#. module: edi
#: constraint:res.partner:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "Hata: Geçersiz EAN barkodu"
#. module: edi
#: sql_constraint:res.currency:0
@ -78,13 +78,13 @@ msgstr "Döviz"
#: code:addons/edi/static/src/js/edi.js:71
#, python-format
msgid "Document Import Notification"
msgstr ""
msgstr "Döküman içeri alma Uyarısı"
#. module: edi
#: code:addons/edi/models/edi.py:130
#, python-format
msgid "Missing application."
msgstr ""
msgstr "Kayıp Uygulama"
#. module: edi
#: code:addons/edi/models/edi.py:131
@ -114,11 +114,13 @@ msgid ""
"Error! You cannot define a rounding factor for the company's main currency "
"that is smaller than the decimal precision of 'Account'."
msgstr ""
"Hata! Şirketin ana hesap dövizi için Muhasebe ondalık hassasiyetinden daha "
"küçük bir yuvarlama çarpanı seçemezsiniz."
#. module: edi
#: model:ir.model,name:edi.model_edi_edi
msgid "EDI Subsystem"
msgstr ""
msgstr "EDI altsistemi"
#~ msgid "Partner Addresses"
#~ msgstr "Cari Adresleri"

50
addons/event/i18n/nl.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-24 21:29+0000\n"
"PO-Revision-Date: 2012-11-26 20:16+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 05:44+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: event
#: view:event.event:0
@ -61,7 +61,7 @@ msgstr ""
#: code:addons/event/event.py:305
#, python-format
msgid "Event has been <b>cancelled</b>."
msgstr ""
msgstr "Evenement is <b>geannuleerd</b>"
#. module: event
#: field:event.registration,date_open:0
@ -112,12 +112,12 @@ msgstr "Bedrijf"
#: field:event.event,email_confirmation_id:0
#: field:event.type,default_email_event:0
msgid "Event Confirmation Email"
msgstr ""
msgstr "Evenement bevestign e-mail"
#. module: event
#: field:event.type,default_registration_max:0
msgid "Default Maximum Registration"
msgstr ""
msgstr "Standaard maximum registraties"
#. module: event
#: help:event.event,message_unread:0
@ -139,7 +139,7 @@ msgstr "Evenementregistratie"
#. module: event
#: model:ir.module.category,description:event.module_category_event_management
msgid "Helps you manage your Events."
msgstr ""
msgstr "Helpt u ik het beheersen van evenementen."
#. module: event
#: view:report.event.registration:0
@ -349,7 +349,7 @@ msgstr "Georganiseerd door"
#. module: event
#: view:event.event:0
msgid "Register with this event"
msgstr ""
msgstr "Registreer voor dit benemend."
#. module: event
#: help:event.type,default_email_registration:0
@ -424,7 +424,7 @@ msgstr "Aanmaakdatum"
#: view:report.event.registration:0
#: field:report.event.registration,user_id:0
msgid "Event Responsible"
msgstr ""
msgstr "Evenement verantwoordelijke."
#. module: event
#: view:event.event:0
@ -477,7 +477,7 @@ msgstr "Spreker welke een speech zal geven tijdens het evenement"
#: code:addons/event/event.py:457
#, python-format
msgid "Registration has been <b>created</b>."
msgstr ""
msgstr "Registratie is <b>aangemaakt</b>."
#. module: event
#: view:event.event:0
@ -488,7 +488,7 @@ msgstr "Annuleer evenement"
#: code:addons/event/event.py:398
#, python-format
msgid "State set to Done"
msgstr ""
msgstr "Status ingesteld op 'Gereed'"
#. module: event
#: model:ir.actions.act_window,name:event.act_event_reg
@ -509,7 +509,7 @@ msgstr "Onbevestigde inschrijvingen"
#. module: event
#: model:ir.actions.client,name:event.action_client_event_menu
msgid "Open Event Menu"
msgstr ""
msgstr "Open menu Evenementen"
#. module: event
#: view:report.event.registration:0
@ -546,7 +546,7 @@ msgstr " # aantal voorlopige inschrijvingen"
#: field:event.event,email_registration_id:0
#: field:event.type,default_email_registration:0
msgid "Registration Confirmation Email"
msgstr ""
msgstr "Registratie bevestiging e-mail"
#. module: event
#: view:report.event.registration:0
@ -557,12 +557,12 @@ msgstr "Maand"
#. module: event
#: field:event.registration,date_closed:0
msgid "Attended Date"
msgstr ""
msgstr "Datum deelname"
#. module: event
#: view:event.event:0
msgid "Finish Event"
msgstr ""
msgstr "Evenement einde"
#. module: event
#: model:ir.actions.server,name:event.actions_server_event_event_unread
@ -599,13 +599,13 @@ msgstr ""
#. module: event
#: help:res.partner,speaker:0
msgid "Check this box if this contact is a speaker."
msgstr ""
msgstr "Vink dit aan als het contactpersoon een spreker is."
#. module: event
#: code:addons/event/event.py:116
#, python-format
msgid "No Tickets Available!"
msgstr ""
msgstr "Geen tickets beschikbaar."
#. module: event
#: help:event.event,state:0
@ -686,7 +686,7 @@ msgstr "Evenementen in de 'Nieuw' status"
#: code:addons/event/event.py:404
#, python-format
msgid "State set to Cancel"
msgstr ""
msgstr "Status ingesteld op 'Geannuleerd'"
#. module: event
#: view:event.event:0
@ -797,7 +797,7 @@ msgstr ""
#. module: event
#: view:event.event:0
msgid "(confirmed:"
msgstr ""
msgstr "(bevestigd:"
#. module: event
#: view:event.registration:0
@ -865,13 +865,13 @@ msgstr "Email instellingen"
#. module: event
#: field:event.type,default_registration_min:0
msgid "Default Minimum Registration"
msgstr ""
msgstr "Standaard minimaal aantal registraties."
#. module: event
#: code:addons/event/event.py:368
#, python-format
msgid "Registration confirmed."
msgstr ""
msgstr "Registratie bevestigd."
#. module: event
#: field:event.event,address_id:0
@ -894,7 +894,7 @@ msgstr ""
#. module: event
#: view:event.event:0
msgid "Attended the Event"
msgstr ""
msgstr "Was aanwezig bij dit evenement."
#. module: event
#: constraint:event.event:0
@ -921,7 +921,7 @@ msgstr "Afgerond"
#. module: event
#: view:report.event.registration:0
msgid "Show Confirmed Registrations"
msgstr ""
msgstr "Toon bevestigde registraties."
#. module: event
#: view:event.confirm:0
@ -931,7 +931,7 @@ msgstr "Annuleren"
#. module: event
#: field:event.registration,reply_to:0
msgid "Reply-to Email"
msgstr ""
msgstr "Antwoord aan e-mail."
#. module: event
#: code:addons/event/event.py:114
@ -948,7 +948,7 @@ msgstr ""
#. module: event
#: view:event.registration:0
msgid "Set To Unconfirmed"
msgstr ""
msgstr "Stel in op 'Onbevestigd'"
#. module: event
#: view:event.event:0

2
addons/fetchmail/__openerp__.py
View File

@ -23,7 +23,7 @@
{
'name' : 'Email Gateway',
'version' : '1.0',
'depends' : ['base', 'mail'],
'depends' : ['mail'],
'author' : 'OpenERP SA',
'category': 'Tools',
'description': """

41
addons/fetchmail/i18n/hu.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2011-01-19 14:10+0000\n"
"PO-Revision-Date: 2012-11-28 00:07+0000\n"
"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: fetchmail
#: selection:fetchmail.server,state:0
@ -24,17 +24,18 @@ msgstr "Megerősítve"
#. module: fetchmail
#: field:fetchmail.server,server:0
msgid "Server Name"
msgstr ""
msgstr "Kiszolgálónév"
#. module: fetchmail
#: field:fetchmail.server,script:0
msgid "Script"
msgstr ""
msgstr "Szkript"
#. module: fetchmail
#: help:fetchmail.server,priority:0
msgid "Defines the order of processing, lower values mean higher priority"
msgstr ""
"Feldolgozás sorrendjének meghatározása, alacsonyabb érték magasabb prioritás"
#. module: fetchmail
#: help:fetchmail.server,is_ssl:0
@ -51,7 +52,7 @@ msgstr ""
#. module: fetchmail
#: field:fetchmail.server,is_ssl:0
msgid "SSL/TLS"
msgstr ""
msgstr "SSL/TLS"
#. module: fetchmail
#: help:fetchmail.server,original:0
@ -69,7 +70,7 @@ msgstr "POP"
#. module: fetchmail
#: view:fetchmail.server:0
msgid "Fetch Now"
msgstr ""
msgstr "Letöltés most"
#. module: fetchmail
#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@ -95,7 +96,7 @@ msgstr ""
#. module: fetchmail
#: field:fetchmail.server,state:0
msgid "Status"
msgstr ""
msgstr "Státusz"
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_fetchmail_server
@ -120,7 +121,7 @@ msgstr ""
#. module: fetchmail
#: field:fetchmail.server,date:0
msgid "Last Fetch Date"
msgstr ""
msgstr "Utolsó letöltés időpontja"
#. module: fetchmail
#: help:fetchmail.server,action_id:0
@ -137,39 +138,39 @@ msgstr "E-mailek száma"
#. module: fetchmail
#: field:fetchmail.server,original:0
msgid "Keep Original"
msgstr ""
msgstr "Eredeti megtartása"
#. module: fetchmail
#: view:fetchmail.server:0
msgid "Advanced Options"
msgstr ""
msgstr "Haladó beállítások"
#. module: fetchmail
#: view:fetchmail.server:0
#: field:fetchmail.server,configuration:0
msgid "Configuration"
msgstr ""
msgstr "Beállítás"
#. module: fetchmail
#: view:fetchmail.server:0
msgid "Incoming Mail Server"
msgstr ""
msgstr "Bejövő levelek kiszolgálója"
#. module: fetchmail
#: code:addons/fetchmail/fetchmail.py:155
#, python-format
msgid "Connection test failed!"
msgstr ""
msgstr "Csatlakozás teszt nem sikerült!"
#. module: fetchmail
#: field:fetchmail.server,user:0
msgid "Username"
msgstr ""
msgstr "Felhasználónév"
#. module: fetchmail
#: help:fetchmail.server,server:0
msgid "Hostname or IP of the mail server"
msgstr ""
msgstr "Levelező szerver hostneve vagy IP címe"
#. module: fetchmail
#: field:fetchmail.server,name:0
@ -192,7 +193,7 @@ msgstr ""
#. module: fetchmail
#: field:fetchmail.server,action_id:0
msgid "Server Action"
msgstr ""
msgstr "Szerverművelet"
#. module: fetchmail
#: field:mail.mail,fetchmail_server_id:0
@ -225,7 +226,7 @@ msgstr ""
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_mail_mail
msgid "Outgoing Mails"
msgstr ""
msgstr "Elküldött levelek"
#. module: fetchmail
#: field:fetchmail.server,priority:0
@ -245,7 +246,7 @@ msgstr "IMAP"
#. module: fetchmail
#: view:fetchmail.server:0
msgid "Server type POP."
msgstr ""
msgstr "Szerver típusa: POP3"
#. module: fetchmail
#: field:fetchmail.server,password:0
@ -280,7 +281,7 @@ msgstr ""
#. module: fetchmail
#: view:fetchmail.server:0
msgid "Advanced"
msgstr ""
msgstr "Speciális"
#. module: fetchmail
#: view:fetchmail.server:0

14
addons/fetchmail/i18n/zh_CN.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
"PO-Revision-Date: 2012-11-23 16:03+0000\n"
"PO-Revision-Date: 2012-11-27 03:49+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: fetchmail
#: selection:fetchmail.server,state:0
@ -96,7 +96,7 @@ msgstr "本地服务器"
#. module: fetchmail
#: field:fetchmail.server,state:0
msgid "Status"
msgstr ""
msgstr "状态"
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_fetchmail_server
@ -116,7 +116,7 @@ msgstr "SSL"
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_fetchmail_config_settings
msgid "fetchmail.config.settings"
msgstr ""
msgstr "fetchmail.config.settings"
#. module: fetchmail
#: field:fetchmail.server,date:0
@ -184,6 +184,8 @@ msgid ""
"Here is what we got instead:\n"
" %s."
msgstr ""
"这里被替换为:\n"
" %s."
#. module: fetchmail
#: view:fetchmail.server:0
@ -226,7 +228,7 @@ msgstr "是否应该下载附件。如果不勾这里，收到的邮件会在被
#. module: fetchmail
#: model:ir.model,name:fetchmail.model_mail_mail
msgid "Outgoing Mails"
msgstr ""
msgstr "发出邮件"
#. module: fetchmail
#: field:fetchmail.server,priority:0

15
addons/hr/hr_view.xml
View File

@ -9,7 +9,6 @@
sequence="90"/>
<menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="base.group_no_one" sequence="25"/>
<menuitem id="menu_hr_reporting_timesheet" name="Reports"
parent="menu_hr_reporting" sequence="6"/>
@ -228,6 +227,7 @@
<field name="department_id"/>
<field name="job_id"/>
<field name="coach_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
</tree>
</field>
</record>
@ -288,7 +288,7 @@
</record>
<record id="open_view_categ_form" model="ir.actions.act_window">
<field name="name">Categories of Employees</field>
<field name="name">Employee Tags</field>
<field name="res_model">hr.employee.category</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -297,14 +297,6 @@
<menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/>
<record id="open_view_categ_tree" model="ir.actions.act_window">
<field name="name">Categories Structure</field>
<field name="res_model">hr.employee.category</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_employee_category_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<record id="hr_employee_normal_action_tree" model="ir.actions.act_window">
<field name="name">Employees</field>
<field name="type">ir.actions.act_window</field>
@ -321,9 +313,6 @@
<field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
</record>
<menuitem action="open_view_categ_tree"
id="menu_view_employee_category_tree" parent="menu_hr_management" groups="base.group_no_one" sequence="2"/>
<record id="view_hr_job_form" model="ir.ui.view">
<field name="name">hr.job.form</field>
<field name="model">hr.job</field>

194
addons/hr/i18n/hr.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
"PO-Revision-Date: 2012-11-25 19:55+0000\n"
"PO-Revision-Date: 2012-11-27 21:53+0000\n"
"Last-Translator: Lovro Lazarin <lovro.lazarin@slobodni-programi.hr>\n"
"Language-Team: <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
"Language: hr\n"
#. module: hr
@ -258,7 +258,7 @@ msgstr "Žensko"
#: model:ir.actions.act_window,name:hr.open_view_categ_form
#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
msgid "Categories of Employees"
msgstr ""
msgstr "Kategorije radnika"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@ -289,7 +289,7 @@ msgstr "Lokacija ureda"
#. module: hr
#: field:hr.job,message_follower_ids:0
msgid "Followers"
msgstr ""
msgstr "Pratitelji"
#. module: hr
#: view:hr.employee:0
@ -310,6 +310,9 @@ msgid ""
"image, with aspect ratio preserved. Use this field anywhere a small image is "
"required."
msgstr ""
"Mala fotografija radnika. Fotografija je automatski prilagođena na dimenzije "
"64x64px, omjer dimenzija je pritom očuvan. Koristite ovo polje gdje je "
"potrebna mala slika."
#. module: hr
#: field:hr.employee,birthday:0
@ -319,12 +322,12 @@ msgstr "Datum rođenja"
#. module: hr
#: help:hr.job,no_of_recruitment:0
msgid "Number of new employees you expect to recruit."
msgstr ""
msgstr "Broj novih radnika koje planirate zaposliti."
#. module: hr
#: model:ir.actions.client,name:hr.action_client_hr_menu
msgid "Open HR Menu"
msgstr ""
msgstr "Otvori HR meni"
#. module: hr
#: help:hr.job,message_summary:0
@ -332,6 +335,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
"Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu "
"da bi mogao biti ubačen u kanban pogled."
#. module: hr
#: help:hr.config.settings,module_account_analytic_analysis:0
@ -339,6 +344,8 @@ msgid ""
"This installs the module account_analytic_analysis, which will install sales "
"management too."
msgstr ""
"Ovo instalira modul account_analytic_analysis, koji će također instalirati "
"upravljanje prodajom."
#. module: hr
#: view:board.board:0
@ -355,7 +362,7 @@ msgstr "Posao"
#. module: hr
#: field:hr.job,no_of_employee:0
msgid "Current Number of Employees"
msgstr ""
msgstr "Trenutni broj radnika"
#. module: hr
#: field:hr.department,member_ids:0
@ -370,18 +377,19 @@ msgstr "Konfiguracija"
#. module: hr
#: field:hr.config.settings,module_hr_expense:0
msgid "Manage employees expenses"
msgstr ""
msgstr "Upravljaj troškovima radnika"
#. module: hr
#: help:hr.job,expected_employees:0
msgid ""
"Expected number of employees for this job position after new recruitment."
msgstr ""
"Očekivani broj radnika za ovo radno mjesto nakon novog procesa zapošljavanja."
#. module: hr
#: view:hr.employee:0
msgid "Tel:"
msgstr ""
msgstr "Tel:"
#. module: hr
#: selection:hr.employee,marital:0
@ -396,7 +404,7 @@ msgstr "Nadređena kategorija"
#. module: hr
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
msgstr ""
msgstr "OAuth UID po dobavljaču mora biti jedinstven"
#. module: hr
#: view:hr.department:0
@ -432,6 +440,23 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" "
"Kliknite da bi definirali novo radno mjesto.\n"
" </p><p>\n"
" "
"Radna mjesta se koriste da bi definirali funkciju i zahtjeve za taj posao.\n"
" "
"Možete voditi evidenciju broja radnika po radnom mjestu i pratit planirani \n"
" "
"razvoj.\n"
" </p><p>\n"
" "
"Možete dodati anketu za radno mjesto, koja će se koristiti za ispitivanje \n"
" "
"kandidata u procesu zapošljavanja.\n"
" </p>\n"
" "
#. module: hr
#: selection:hr.employee,gender:0
@ -448,22 +473,22 @@ msgstr ""
#. module: hr
#: help:hr.config.settings,module_hr_evaluation:0
msgid "This installs the module hr_evaluation."
msgstr ""
msgstr "Ovo instalira modul hr_evaluation."
#. module: hr
#: constraint:hr.employee:0
msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
msgstr "Greška! Ne možete kreirati rekurzivnu hijerarhiju radnika."
#. module: hr
#: help:hr.config.settings,module_hr_attendance:0
msgid "This installs the module hr_attendance."
msgstr ""
msgstr "Ovo instalira modul hr_attendance."
#. module: hr
#: field:hr.employee,image_small:0
msgid "Smal-sized photo"
msgstr ""
msgstr "Fotografija malih dimenzija"
#. module: hr
#: view:hr.employee.category:0
@ -474,12 +499,12 @@ msgstr "Kategorija djelatnika"
#. module: hr
#: field:hr.employee,category_ids:0
msgid "Tags"
msgstr ""
msgstr "Oznake"
#. module: hr
#: help:hr.config.settings,module_hr_contract:0
msgid "This installs the module hr_contract."
msgstr ""
msgstr "Ovo instalira modul hr_contract."
#. module: hr
#: view:hr.employee:0
@ -489,7 +514,7 @@ msgstr "Povezani Korisnik"
#. module: hr
#: view:hr.config.settings:0
msgid "or"
msgstr ""
msgstr "ili"
#. module: hr
#: field:hr.employee.category,name:0
@ -499,12 +524,12 @@ msgstr "Kategorija"
#. module: hr
#: view:hr.job:0
msgid "Stop Recruitment"
msgstr ""
msgstr "Zaustavi proces zapošljavanja"
#. module: hr
#: field:hr.config.settings,module_hr_attendance:0
msgid "Install attendances feature"
msgstr ""
msgstr "Instaliraj modul za praćenje prisustva"
#. module: hr
#: help:hr.employee,bank_account_id:0
@ -534,7 +559,7 @@ msgstr "Kontakt podaci"
#. module: hr
#: field:hr.config.settings,module_hr_holidays:0
msgid "Manage holidays, leaves and allocation requests"
msgstr ""
msgstr "Upravljaj godišnjima, izostancima i zahtjevima za slobodne dane"
#. module: hr
#: field:hr.department,child_ids:0
@ -561,12 +586,12 @@ msgstr "Ugovor djelatnika"
#. module: hr
#: view:hr.config.settings:0
msgid "Contracts"
msgstr ""
msgstr "Ugovori"
#. module: hr
#: help:hr.job,message_ids:0
msgid "Messages and communication history"
msgstr ""
msgstr "Poruke i povijest komuniciranja"
#. module: hr
#: field:hr.employee,ssnid:0
@ -576,12 +601,12 @@ msgstr "JMBG"
#. module: hr
#: field:hr.job,message_is_follower:0
msgid "Is a Follower"
msgstr ""
msgstr "Sljedbenik"
#. module: hr
#: field:hr.config.settings,module_hr_recruitment:0
msgid "Manage the recruitment process"
msgstr ""
msgstr "Upravljaj procesom zapošljavanja"
#. module: hr
#: view:hr.employee:0
@ -591,12 +616,12 @@ msgstr "Aktivan"
#. module: hr
#: view:hr.config.settings:0
msgid "Human Resources Management"
msgstr ""
msgstr "Upravljanje ljudskim resursima"
#. module: hr
#: view:hr.config.settings:0
msgid "Install your country's payroll"
msgstr ""
msgstr "Instaliraj plaće za Vašu državu"
#. module: hr
#: field:hr.employee,bank_account_id:0
@ -611,7 +636,7 @@ msgstr "Tvrtke"
#. module: hr
#: field:hr.job,message_summary:0
msgid "Summary"
msgstr ""
msgstr "Sažetak"
#. module: hr
#: model:process.transition,note:hr.process_transition_contactofemployee0
@ -636,21 +661,33 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" "
"Kliknite da bi dodali novog radnika.\n"
" </p><p>\n"
" "
"Sa samo brzim pogledom na OpenERP karticu s radnikom, možete\n"
" "
"lako sazanti sve potrebne informacije za svaku osobu;\n"
" "
"kontakt podaci, radno mjesto, dostupnost, itd.\n"
" </p>\n"
" "
#. module: hr
#: view:hr.employee:0
msgid "HR Settings"
msgstr ""
msgstr "HR postavke (Ljudski resursi)"
#. module: hr
#: view:hr.employee:0
msgid "Citizenship & Other Info"
msgstr ""
msgstr "Državljanstvo i ostale informacije"
#. module: hr
#: constraint:hr.department:0
msgid "Error! You cannot create recursive departments."
msgstr ""
msgstr "Greška! Ne možete kreirati rekurzivne odjele."
#. module: hr
#: sql_constraint:res.users:0
@ -665,7 +702,7 @@ msgstr "Poslovna adresa"
#. module: hr
#: view:hr.employee:0
msgid "Public Information"
msgstr ""
msgstr "Javne informacije"
#. module: hr
#: field:hr.employee,marital:0
@ -690,7 +727,7 @@ msgstr "Fotografija"
#. module: hr
#: view:hr.config.settings:0
msgid "Cancel"
msgstr ""
msgstr "Otkaži"
#. module: hr
#: model:ir.actions.act_window,help:hr.open_module_tree_department
@ -705,17 +742,30 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" "
"Kliknite da bi kreirali odjel.\n"
" "
"</p><p>\n"
" "
"OpenERP odjelska struktura se koristi za upravljanje svim dokumentima \n"
" "
"vezanih za radnika prema odjelima: troškovi, kontrolne kartice, \n"
" "
"godišnji i odsustva, zapošljavanja, itd.\n"
" </p>\n"
" "
#. module: hr
#: help:hr.config.settings,module_hr_timesheet:0
msgid "This installs the module hr_timesheet."
msgstr ""
msgstr "Ovo instalira modul hr_timesheet."
#. module: hr
#: field:hr.job,message_comment_ids:0
#: help:hr.job,message_comment_ids:0
msgid "Comments and emails"
msgstr ""
msgstr "Komentari i e-pošta."
#. module: hr
#: model:ir.actions.act_window,help:hr.view_department_form_installer
@ -730,6 +780,19 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" "
"Kliknite da bi definirali novi odjel.\n"
" </p><p>\n"
" "
"Vaša odjelska struktura se koristi kako bi upravljali svim dokumentima\n"
" "
"vezanim za radnike po odjelima: troškovi i kontrolne kartice, odsustva i "
"godišnji,\n"
" "
"zapošljavanje, itd.\n"
" </p>\n"
" "
#. module: hr
#: view:hr.employee:0
@ -754,13 +817,15 @@ msgstr "Poslovni mobitel"
#. module: hr
#: selection:hr.job,state:0
msgid "Recruitement in Progress"
msgstr ""
msgstr "Zapošljavanje u tijeku"
#. module: hr
#: field:hr.config.settings,module_account_analytic_analysis:0
msgid ""
"Allow invoicing based on timesheets (the sale application will be installed)"
msgstr ""
"Dopusti fakturiranje na osnovu kontrolnih kartica (aplikacija za prodaju će "
"biti instalirana)"
#. module: hr
#: view:hr.employee.category:0
@ -780,7 +845,7 @@ msgstr "Kućna adresa"
#. module: hr
#: field:hr.config.settings,module_hr_timesheet:0
msgid "Manage timesheets"
msgstr ""
msgstr "Upravljaj kontrolnim karticama"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_view_categ_tree
@ -811,12 +876,12 @@ msgstr "Na poziciji"
#. module: hr
#: help:hr.config.settings,module_hr_payroll:0
msgid "This installs the module hr_payroll."
msgstr ""
msgstr "Ovo instalira modul hr_payroll."
#. module: hr
#: field:hr.config.settings,module_hr_contract:0
msgid "Record contracts per employee"
msgstr ""
msgstr "Zabilježi ugovore po radniku"
#. module: hr
#: view:hr.department:0
@ -831,7 +896,7 @@ msgstr "Nacionalnost"
#. module: hr
#: view:hr.config.settings:0
msgid "Additional Features"
msgstr ""
msgstr "Dodatne opcije"
#. module: hr
#: field:hr.employee,notes:0
@ -884,23 +949,23 @@ msgstr "Naziv odjela"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
msgid "Reports"
msgstr ""
msgstr "Izvještaji"
#. module: hr
#: field:hr.config.settings,module_hr_payroll:0
msgid "Manage payroll"
msgstr ""
msgstr "Upravljaj plaćama"
#. module: hr
#: view:hr.config.settings:0
#: model:ir.actions.act_window,name:hr.action_human_resources_configuration
msgid "Configure Human Resources"
msgstr ""
msgstr "Konfiguriraj ljudske resurse"
#. module: hr
#: selection:hr.job,state:0
msgid "No Recruitment"
msgstr ""
msgstr "Nema zapošljavanja"
#. module: hr
#: help:hr.employee,ssnid:0
@ -915,12 +980,12 @@ msgstr "Kreiranje OpenERP korisnika"
#. module: hr
#: field:hr.employee,login:0
msgid "Login"
msgstr ""
msgstr "Prijava"
#. module: hr
#: field:hr.job,expected_employees:0
msgid "Total Forecasted Employees"
msgstr ""
msgstr "Sveukupno predviđeni radnici"
#. module: hr
#: help:hr.job,state:0
@ -928,11 +993,13 @@ msgid ""
"By default 'In position', set it to 'In Recruitment' if recruitment process "
"is going on for this job position."
msgstr ""
"Zadane postavke 'U poziciji', postavite 'U procesu zapošljavanja' ako je "
"zapošljavanje u tijeku za to radno mjesto."
#. module: hr
#: model:ir.model,name:hr.model_res_users
msgid "Users"
msgstr ""
msgstr "Korisnici"
#. module: hr
#: model:ir.actions.act_window,name:hr.action_hr_job
@ -958,6 +1025,33 @@ msgid ""
" </div>\n"
" "
msgstr ""
"<div class=\"oe_empty_custom_dashboard\">\n"
" "
" <p>\n"
" "
" <b>Ploča ljudskih resursa je prazna.</b>\n"
" "
" </p><p>\n"
" "
" Da bi dodali Vaš prvi izvještaj na ploču, idite na bilo "
"koji meni, promijenite\n"
" "
" pogled na listu ili graf, i kliknite <i>'Dodaj na "
"ploču'</i> u proširenim\n"
" "
" opcijama pretraživanja.\n"
" "
" </p><p>\n"
" "
" Možete filtrirati i grupirati podatke prije nego ih "
"ubacite u ploču koristeći\n"
" "
" opcije za pretraživanje.\n"
" "
" </p>\n"
" "
"</div>\n"
" "
#. module: hr
#: view:hr.employee:0
@ -973,7 +1067,7 @@ msgstr "Naziv radnog mjesta mora biti jedinstven po tvrtki"
#. module: hr
#: help:hr.config.settings,module_hr_expense:0
msgid "This installs the module hr_expense."
msgstr ""
msgstr "Ovo instalira modul hr_expense."
#. module: hr
#: model:ir.model,name:hr.model_hr_config_settings
@ -990,7 +1084,7 @@ msgstr "Voditelj"
#. module: hr
#: constraint:res.users:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "Greška: Neispravan barkod!"
#. module: hr
#: selection:hr.employee,marital:0
@ -1005,7 +1099,7 @@ msgstr "Podređeni djelatnici"
#. module: hr
#: view:hr.config.settings:0
msgid "Apply"
msgstr ""
msgstr "Primjeni"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"

199
addons/hr/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
"PO-Revision-Date: 2012-10-25 16:29+0000\n"
"Last-Translator: fenshuajiang <openerp@126.com>\n"
"PO-Revision-Date: 2012-11-27 15:32+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:13+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: hr
#: model:process.node,name:hr.process_node_openerpuser0
@ -24,7 +24,7 @@ msgstr "系统用户"
#. module: hr
#: field:hr.config.settings,module_hr_timesheet_sheet:0
msgid "Allow timesheets validation by managers"
msgstr ""
msgstr "允许管理人员核准工时单"
#. module: hr
#: field:hr.job,requirements:0
@ -39,7 +39,7 @@ msgstr "员工信息链接"
#. module: hr
#: field:hr.employee,sinid:0
msgid "SIN No"
msgstr "社保号"
msgstr "社会保险号SIN"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_board_hr
@ -58,12 +58,12 @@ msgid ""
"Medium-sized photo of the employee. It is automatically resized as a "
"128x128px image, with aspect ratio preserved. Use this field in form views "
"or some kanban views."
msgstr ""
msgstr "员工的中等尺寸照片。保留纵横比例，自动缩放为128x128px的图片。这个字段用在表单视图和某些看板视图。"
#. module: hr
#: view:hr.config.settings:0
msgid "Time Tracking"
msgstr ""
msgstr "考勤跟踪"
#. module: hr
#: view:hr.employee:0
@ -84,7 +84,7 @@ msgstr "这个工作岗位上现有的员工人数"
#. module: hr
#: field:hr.config.settings,module_hr_evaluation:0
msgid "Organize employees periodic evaluation"
msgstr ""
msgstr "组织员工定期评估"
#. module: hr
#: view:hr.department:0
@ -105,12 +105,12 @@ msgstr "工作Email"
msgid ""
"This field holds the image used as photo for the employee, limited to "
"1024x1024px."
msgstr ""
msgstr "这个字段保存员工的照片，限制为 1024x1024px"
#. module: hr
#: help:hr.config.settings,module_hr_holidays:0
msgid "This installs the module hr_holidays."
msgstr ""
msgstr "为此要安装模块 hr_holidays."
#. module: hr
#: view:hr.job:0
@ -125,7 +125,7 @@ msgstr "正在招聘"
#. module: hr
#: field:hr.job,message_unread:0
msgid "Unread Messages"
msgstr ""
msgstr "未读信息"
#. module: hr
#: field:hr.department,company_id:0
@ -143,32 +143,32 @@ msgstr "招聘人数"
#. module: hr
#: field:res.users,employee_ids:0
msgid "Related employees"
msgstr ""
msgstr "相关的员工"
#. module: hr
#: constraint:hr.employee.category:0
msgid "Error! You cannot create recursive Categories."
msgstr ""
msgstr "错误！你不能创建递归的分类。"
#. module: hr
#: help:hr.config.settings,module_hr_recruitment:0
msgid "This installs the module hr_recruitment."
msgstr ""
msgstr "为此要安装模块hr_recruitment."
#. module: hr
#: view:hr.employee:0
msgid "Birth"
msgstr ""
msgstr "生日"
#. module: hr
#: field:hr.employee,last_login:0
msgid "Latest Connection"
msgstr ""
msgstr "最近连接时间"
#. module: hr
#: view:hr.job:0
msgid "Launch Recruitement"
msgstr ""
msgstr "开始招聘"
#. module: hr
#: model:process.transition,name:hr.process_transition_employeeuser0
@ -193,22 +193,22 @@ msgstr "已婚"
#. module: hr
#: field:hr.job,message_ids:0
msgid "Messages"
msgstr ""
msgstr "消息"
#. module: hr
#: view:hr.config.settings:0
msgid "Talent Management"
msgstr ""
msgstr "人才管理"
#. module: hr
#: help:hr.config.settings,module_hr_timesheet_sheet:0
msgid "This installs the module hr_timesheet_sheet."
msgstr ""
msgstr "为此要安装模块hr_timesheet_sheet."
#. module: hr
#: view:hr.employee:0
msgid "Mobile:"
msgstr ""
msgstr "手机："
#. module: hr
#: view:hr.employee:0
@ -218,7 +218,7 @@ msgstr "职位"
#. module: hr
#: help:hr.job,message_unread:0
msgid "If checked new messages require your attention."
msgstr ""
msgstr "如果要求你关注新消息，勾选此项"
#. module: hr
#: field:hr.employee,color:0
@ -235,7 +235,7 @@ msgstr "系统用户的员工字段（包括他的权限）。"
#. module: hr
#: field:hr.employee,image_medium:0
msgid "Medium-sized photo"
msgstr ""
msgstr "中等尺寸图片"
#. module: hr
#: field:hr.employee,identification_id:0
@ -251,7 +251,7 @@ msgstr "女性"
#: model:ir.actions.act_window,name:hr.open_view_categ_form
#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
msgid "Categories of Employees"
msgstr ""
msgstr "员工分类"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@ -282,7 +282,7 @@ msgstr "办公地点"
#. module: hr
#: field:hr.job,message_follower_ids:0
msgid "Followers"
msgstr ""
msgstr "关注者"
#. module: hr
#: view:hr.employee:0
@ -302,7 +302,7 @@ msgid ""
"Small-sized photo of the employee. It is automatically resized as a 64x64px "
"image, with aspect ratio preserved. Use this field anywhere a small image is "
"required."
msgstr ""
msgstr "小尺寸的员工照片。保留纵横比，自动缩放为64x64px。用在任何需要小图片的场合"
#. module: hr
#: field:hr.employee,birthday:0
@ -317,21 +317,21 @@ msgstr "您计划招聘的新员工数。"
#. module: hr
#: model:ir.actions.client,name:hr.action_client_hr_menu
msgid "Open HR Menu"
msgstr ""
msgstr "打开 人力资源 菜单"
#. module: hr
#: help:hr.job,message_summary:0
msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
#. module: hr
#: help:hr.config.settings,module_account_analytic_analysis:0
msgid ""
"This installs the module account_analytic_analysis, which will install sales "
"management too."
msgstr ""
msgstr "为此要安装模块 account_analytic_analysis, 也将安装销售管理"
#. module: hr
#: view:board.board:0
@ -348,7 +348,7 @@ msgstr "职务"
#. module: hr
#: field:hr.job,no_of_employee:0
msgid "Current Number of Employees"
msgstr ""
msgstr "当前员工数量"
#. module: hr
#: field:hr.department,member_ids:0
@ -363,7 +363,7 @@ msgstr "设置"
#. module: hr
#: field:hr.config.settings,module_hr_expense:0
msgid "Manage employees expenses"
msgstr ""
msgstr "管理员工的费用"
#. module: hr
#: help:hr.job,expected_employees:0
@ -374,7 +374,7 @@ msgstr "新的招聘后这个工作岗位上期望的员工人数"
#. module: hr
#: view:hr.employee:0
msgid "Tel:"
msgstr ""
msgstr "电话:"
#. module: hr
#: selection:hr.employee,marital:0
@ -389,7 +389,7 @@ msgstr "上级分类"
#. module: hr
#: sql_constraint:res.users:0
msgid "OAuth UID must be unique per provider"
msgstr ""
msgstr "OAuth UID必须是每个提供者唯一的"
#. module: hr
#: view:hr.department:0
@ -425,6 +425,15 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 单击定义个一个新的工作岗位.\n"
" </p><p>\n"
" 工作岗位用来定义工作和他们的要求。\n"
" 你能跟踪跟踪每个工作岗位员工数，并且根据你未来的计划跟进变化。\n"
" </p><p>\n"
" 你能附加一个调查表到工作岗位. 用在招聘流程中评估这个岗位的申请人.\n"
" </p>\n"
" "
#. module: hr
#: selection:hr.employee,gender:0
@ -437,26 +446,28 @@ msgid ""
"$('.oe_employee_picture').load(function() { if($(this).width() > "
"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
msgstr ""
"$('.oe_employee_picture').load(function() { if($(this).width() > "
"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
#. module: hr
#: help:hr.config.settings,module_hr_evaluation:0
msgid "This installs the module hr_evaluation."
msgstr ""
msgstr "为此要安装模块 hr_evaluation."
#. module: hr
#: constraint:hr.employee:0
msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
msgstr "错误！，你不能创建递归的员工层次"
#. module: hr
#: help:hr.config.settings,module_hr_attendance:0
msgid "This installs the module hr_attendance."
msgstr ""
msgstr "为此要安装模块 hr_attendance."
#. module: hr
#: field:hr.employee,image_small:0
msgid "Smal-sized photo"
msgstr ""
msgstr "小尺寸照片"
#. module: hr
#: view:hr.employee.category:0
@ -467,12 +478,12 @@ msgstr "员工分类"
#. module: hr
#: field:hr.employee,category_ids:0
msgid "Tags"
msgstr ""
msgstr "标签"
#. module: hr
#: help:hr.config.settings,module_hr_contract:0
msgid "This installs the module hr_contract."
msgstr ""
msgstr "为此要安装模块hr_contract."
#. module: hr
#: view:hr.employee:0
@ -482,7 +493,7 @@ msgstr "相关用户"
#. module: hr
#: view:hr.config.settings:0
msgid "or"
msgstr ""
msgstr "or"
#. module: hr
#: field:hr.employee.category,name:0
@ -492,12 +503,12 @@ msgstr "分类"
#. module: hr
#: view:hr.job:0
msgid "Stop Recruitment"
msgstr ""
msgstr "停止招聘"
#. module: hr
#: field:hr.config.settings,module_hr_attendance:0
msgid "Install attendances feature"
msgstr ""
msgstr "安装 出勤率特性"
#. module: hr
#: help:hr.employee,bank_account_id:0
@ -527,7 +538,7 @@ msgstr "联系信息"
#. module: hr
#: field:hr.config.settings,module_hr_holidays:0
msgid "Manage holidays, leaves and allocation requests"
msgstr ""
msgstr "管理假期、请假和分配请求"
#. module: hr
#: field:hr.department,child_ids:0
@ -554,27 +565,27 @@ msgstr "员工合约"
#. module: hr
#: view:hr.config.settings:0
msgid "Contracts"
msgstr ""
msgstr "合同列表"
#. module: hr
#: help:hr.job,message_ids:0
msgid "Messages and communication history"
msgstr ""
msgstr "消息和通信历史"
#. module: hr
#: field:hr.employee,ssnid:0
msgid "SSN No"
msgstr "员工号"
msgstr "社会保险号SSN"
#. module: hr
#: field:hr.job,message_is_follower:0
msgid "Is a Follower"
msgstr ""
msgstr "是一个关注者"
#. module: hr
#: field:hr.config.settings,module_hr_recruitment:0
msgid "Manage the recruitment process"
msgstr ""
msgstr "管理招聘流程"
#. module: hr
#: view:hr.employee:0
@ -584,12 +595,12 @@ msgstr "生效"
#. module: hr
#: view:hr.config.settings:0
msgid "Human Resources Management"
msgstr ""
msgstr "人力资源管理"
#. module: hr
#: view:hr.config.settings:0
msgid "Install your country's payroll"
msgstr ""
msgstr "安装你所在国家的工资表"
#. module: hr
#: field:hr.employee,bank_account_id:0
@ -604,7 +615,7 @@ msgstr "公司"
#. module: hr
#: field:hr.job,message_summary:0
msgid "Summary"
msgstr ""
msgstr "摘要"
#. module: hr
#: model:process.transition,note:hr.process_transition_contactofemployee0
@ -627,21 +638,29 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 单击 添加新的员工.\n"
" </p><p>\n"
" 在OpenERP员工界面快速浏览一下，你\n"
" 能很容易看到你需要的每人的信息：\n"
" 包括 联系人数据、工作岗位、可用性等等.\n"
" </p>\n"
" "
#. module: hr
#: view:hr.employee:0
msgid "HR Settings"
msgstr ""
msgstr "人力资源设置"
#. module: hr
#: view:hr.employee:0
msgid "Citizenship & Other Info"
msgstr ""
msgstr "国籍和其他信息"
#. module: hr
#: constraint:hr.department:0
msgid "Error! You cannot create recursive departments."
msgstr ""
msgstr "错误！你不能创建递归的部门"
#. module: hr
#: sql_constraint:res.users:0
@ -656,7 +675,7 @@ msgstr "工作地址"
#. module: hr
#: view:hr.employee:0
msgid "Public Information"
msgstr ""
msgstr "公开信息"
#. module: hr
#: field:hr.employee,marital:0
@ -681,7 +700,7 @@ msgstr "相片"
#. module: hr
#: view:hr.config.settings:0
msgid "Cancel"
msgstr ""
msgstr "取消"
#. module: hr
#: model:ir.actions.act_window,help:hr.open_module_tree_department
@ -696,17 +715,25 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 单击创建部门.\n"
" </p><p>\n"
" OpenERP 的部门结构 用来管理所有跟部门员工相关\n"
" 的单据：费用、计工单、请假、假期和招聘等等。\n"
" \n"
" </p>\n"
" "
#. module: hr
#: help:hr.config.settings,module_hr_timesheet:0
msgid "This installs the module hr_timesheet."
msgstr ""
msgstr "为此要安装模块hr_timesheet."
#. module: hr
#: field:hr.job,message_comment_ids:0
#: help:hr.job,message_comment_ids:0
msgid "Comments and emails"
msgstr ""
msgstr "评论和电子邮件"
#. module: hr
#: model:ir.actions.act_window,help:hr.view_department_form_installer
@ -721,6 +748,14 @@ msgid ""
" </p>\n"
" "
msgstr ""
"<p class=\"oe_view_nocontent_create\">\n"
" 单击创建部门.\n"
" </p><p>\n"
" OpenERP 的部门结构 用来管理所有跟部门员工相关\n"
" 的单据：费用、计工单、请假、假期和招聘等等。\n"
" \n"
" </p>\n"
" "
#. module: hr
#: view:hr.employee:0
@ -745,13 +780,13 @@ msgstr "办公手机"
#. module: hr
#: selection:hr.job,state:0
msgid "Recruitement in Progress"
msgstr ""
msgstr "招聘进行中"
#. module: hr
#: field:hr.config.settings,module_account_analytic_analysis:0
msgid ""
"Allow invoicing based on timesheets (the sale application will be installed)"
msgstr ""
msgstr "允许基于计工单开票（销售应用模块将被安装）"
#. module: hr
#: view:hr.employee.category:0
@ -771,7 +806,7 @@ msgstr "家庭地址"
#. module: hr
#: field:hr.config.settings,module_hr_timesheet:0
msgid "Manage timesheets"
msgstr ""
msgstr "管理计工单"
#. module: hr
#: model:ir.actions.act_window,name:hr.open_view_categ_tree
@ -802,12 +837,12 @@ msgstr "在职"
#. module: hr
#: help:hr.config.settings,module_hr_payroll:0
msgid "This installs the module hr_payroll."
msgstr ""
msgstr "为此要安装模块 hr_payroll."
#. module: hr
#: field:hr.config.settings,module_hr_contract:0
msgid "Record contracts per employee"
msgstr ""
msgstr "记录每个员工的联系人"
#. module: hr
#: view:hr.department:0
@ -822,7 +857,7 @@ msgstr "国籍"
#. module: hr
#: view:hr.config.settings:0
msgid "Additional Features"
msgstr ""
msgstr "附加特性"
#. module: hr
#: field:hr.employee,notes:0
@ -875,23 +910,23 @@ msgstr "部门名称"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
msgid "Reports"
msgstr ""
msgstr "报表"
#. module: hr
#: field:hr.config.settings,module_hr_payroll:0
msgid "Manage payroll"
msgstr ""
msgstr "管理工资单"
#. module: hr
#: view:hr.config.settings:0
#: model:ir.actions.act_window,name:hr.action_human_resources_configuration
msgid "Configure Human Resources"
msgstr ""
msgstr "配置人力资源"
#. module: hr
#: selection:hr.job,state:0
msgid "No Recruitment"
msgstr ""
msgstr "没有招聘"
#. module: hr
#: help:hr.employee,ssnid:0
@ -911,19 +946,19 @@ msgstr "登录名"
#. module: hr
#: field:hr.job,expected_employees:0
msgid "Total Forecasted Employees"
msgstr ""
msgstr "预计员工数合计"
#. module: hr
#: help:hr.job,state:0
msgid ""
"By default 'In position', set it to 'In Recruitment' if recruitment process "
"is going on for this job position."
msgstr ""
msgstr "默认是'In position', 这个岗位的招聘进程开始后，设置为'In Recruitment'。"
#. module: hr
#: model:ir.model,name:hr.model_res_users
msgid "Users"
msgstr ""
msgstr "用户"
#. module: hr
#: model:ir.actions.act_window,name:hr.action_hr_job
@ -949,6 +984,18 @@ msgid ""
" </div>\n"
" "
msgstr ""
"<div class=\"oe_empty_custom_dashboard\">\n"
" <p>\n"
" <b>人力资源的仪表板是空的.</b>\n"
" </p><p>\n"
" 要增加第一个报表到仪表板。\n"
" 进入任意菜单，切换为列表视图或者图形视图，\n"
" 然后在扩展搜索选项里点击“添加到仪表板”\n"
" </p><p>\n"
" 在插入到仪表板之前，你能过滤和分组这些数据.\n"
" </p>\n"
" </div>\n"
" "
#. module: hr
#: view:hr.employee:0
@ -964,12 +1011,12 @@ msgstr "每个公司里的任一职位名称都必须唯一"
#. module: hr
#: help:hr.config.settings,module_hr_expense:0
msgid "This installs the module hr_expense."
msgstr ""
msgstr "为此要安装模块hr_expense."
#. module: hr
#: model:ir.model,name:hr.model_hr_config_settings
msgid "hr.config.settings"
msgstr ""
msgstr "hr.config.settings"
#. module: hr
#: field:hr.department,manager_id:0
@ -981,7 +1028,7 @@ msgstr "经理"
#. module: hr
#: constraint:res.users:0
msgid "Error: Invalid ean code"
msgstr ""
msgstr "错误：无效的(EAN)条码"
#. module: hr
#: selection:hr.employee,marital:0
@ -996,7 +1043,7 @@ msgstr "下属"
#. module: hr
#: view:hr.config.settings:0
msgid "Apply"
msgstr ""
msgstr "接受"
#~ msgid "Group name"
#~ msgstr "组名"

2
addons/hr/static/src/css/hr.css
View File

@ -38,7 +38,7 @@
}
.oe_employee_details {
width: 220px;
width: 210px;
font-size: 13px;
padding: 2px 5px;
color: #4c4c4c;

20
addons/hr_contract/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:53+0000\n"
"PO-Revision-Date: 2012-01-23 10:05+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"PO-Revision-Date: 2012-11-27 03:09+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: hr_contract
#: field:hr.contract,wage:0
@ -102,7 +102,7 @@ msgstr "合同类型"
#. module: hr_contract
#: view:hr.employee:0
msgid "Medical Exam"
msgstr ""
msgstr "体检"
#. module: hr_contract
#: field:hr.contract,date_end:0
@ -162,7 +162,7 @@ msgstr "工作安排"
#. module: hr_contract
#: view:hr.contract:0
msgid "Salary and Advantages"
msgstr ""
msgstr "工资和机会"
#. module: hr_contract
#: field:hr.contract,job_id:0
@ -172,7 +172,7 @@ msgstr "职务名称"
#. module: hr_contract
#: constraint:hr.contract:0
msgid "Error! Contract start-date must be less than contract end-date."
msgstr ""
msgstr "错误！联系人开始日期必须小于结束日期"
#. module: hr_contract
#: field:hr.employee,manager:0
@ -197,7 +197,7 @@ msgstr "签证号"
#. module: hr_contract
#: field:hr.employee,vehicle_distance:0
msgid "Home-Work Dist."
msgstr ""
msgstr "家里和工作场所的距离"
#. module: hr_contract
#: field:hr.employee,place_of_birth:0
@ -207,7 +207,7 @@ msgstr "出生地"
#. module: hr_contract
#: view:hr.contract:0
msgid "Trial Period Duration"
msgstr ""
msgstr "试用期"
#. module: hr_contract
#: view:hr.contract:0
@ -227,7 +227,7 @@ msgstr "体检日期"
#. module: hr_contract
#: constraint:hr.employee:0
msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
msgstr "错误！，你不能创建递归的员工层次"
#. module: hr_contract
#: view:hr.contract.type:0

4
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -305,11 +305,9 @@
'default_subject': 'Reminder to fill up Survey' }"/>
</div>
<group>
<group col="3" colspan="1">
<group>
<field name="survey_id"/>
<button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
<field name="user_to_review_id"/>
<label string=""/>
<field name="user_id" string="Interviewer"/>
</group>
<group>

4
addons/hr_expense/hr_expense_view.xml
View File

@ -85,7 +85,7 @@
</group>
<notebook>
<page string="Description">
<field name="line_ids" context="{'currency_id': currency_id}">
<field name="line_ids" context="{'currency_id': currency_id, 'default_analytic_account': context.get('analytic_account')}">
<form string="Expense Lines" version="7.0">
<group>
<group>
@ -211,7 +211,7 @@
<field name="search_view_id" ref="product.product_search_form_view"/>
</record>
<menuitem id="menu_hr_product" name="Type of Expenses" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
<menuitem id="menu_hr_product" name="Types of Expenses" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
<menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
<menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>

12
addons/hr_holidays/hr_holidays.py
View File

@ -79,7 +79,7 @@ class hr_holidays_status(osv.osv):
'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'),
'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'),
'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
@ -143,18 +143,18 @@ class hr_holidays(osv.osv):
'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True),
'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'number_of_days_temp': fields.float('Allocation', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
'parent_id': fields.many2one('hr.holidays', 'Parent'),
'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
'category_id': fields.many2one('hr.employee.category', "Employee Tag", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Tag')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Tag: Allocation/Request for group of employees in category', required=True),
'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
'double_validation': fields.related('holiday_status_id', 'double_validation', type='boolean', relation='hr.holidays.status', string='Apply Double Validation'),
}
@ -541,7 +541,7 @@ class hr_employee(osv.osv):
return result
_columns = {
'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests.'),
'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit.'),
'current_leave_state': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Status", type="selection",
selection=[('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')]),

29
addons/hr_holidays/hr_holidays_view.xml
View File

@ -146,7 +146,10 @@
<group>
<field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
<field name="holiday_status_id" context="{'employee_id':employee_id}"/>
<field name="number_of_days_temp"/>
<label for="number_of_days_temp"/>
<div>
<field name="number_of_days_temp" class="oe_inline"/> days
</div>
</group>
<group>
<field name="holiday_type" on_change="onchange_type(holiday_type)"/>
@ -176,7 +179,7 @@
<field name="department_id" invisible="1"/>
<field name="holiday_status_id"/>
<field name="name"/>
<field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
<field name="number_of_days" string="Allocated Days" sum="Remaining Days"/>
<field name="manager_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<!--field name="type"/-->
@ -257,12 +260,12 @@
<menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
<record model="ir.actions.act_window" id="open_ask_holidays">
<field name="name">My Leave Requests</field>
<field name="name">Leave Requests</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_id" ref="edit_holiday_new"/>
<field name="context">{}</field>
<field name="domain">[('type','=','remove'),('employee_id.user_id','=', uid)]</field>
<field name="context">{'default_type': 'remove', 'search_default_my_leaves':1}</field>
<field name="domain">[('type','=','remove')]</field>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
@ -297,10 +300,10 @@
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
<menuitem parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
<record model="ir.actions.act_window" id="request_approve_holidays">
<field name="name">Requests Approve</field>
<field name="name">Requests to Approve</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="context">{'default_type': 'remove', 'search_default_approve':1}</field>
@ -326,11 +329,11 @@
<menuitem name="Leave Requests to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_holidays" action="request_approve_holidays" groups="base.group_hr_user"/>
<record model="ir.actions.act_window" id="open_allocation_holidays">
<field name="name">My Allocation Requests</field>
<field name="name">Allocation Requests</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="context">{'default_type':'add'}</field>
<field name="domain">[('type','=','add'),('employee_id.user_id','=', uid)]</field>
<field name="context">{'default_type':'add', 'search_default_my_leaves':1}</field>
<field name="domain">[('type','=','add')]</field>
<field name="view_id" ref="allocation_leave_new"/>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
</record>
@ -349,7 +352,7 @@
<field name="act_window_id" ref="open_allocation_holidays"/>
</record>
<menuitem name="My Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
<menuitem parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
<record model="ir.actions.act_window" id="request_approve_allocation">
<field name="name">Allocation Requests to Approve</field>
@ -476,7 +479,7 @@
</record>
<menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
<menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
<menuitem name="Leaves Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
<!-- Holiday on resource leave -->
<record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
@ -541,7 +544,7 @@
<group string="Leaves">
<label for="remaining_leaves"/>
<div>
<field name="remaining_leaves" class="oe_inline"/>
<field name="remaining_leaves" class="oe_inline"/> days
</div>
</group>
</xpath>

10
addons/hr_payroll_account/i18n/zh_CN.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:53+0000\n"
"PO-Revision-Date: 2012-02-15 05:24+0000\n"
"Last-Translator: 开阖软件 Jeff Wang <jeff@osbzr.com>\n"
"PO-Revision-Date: 2012-11-27 03:05+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: hr_payroll_account
#: field:hr.salary.rule,account_credit:0
@ -103,7 +103,7 @@ msgstr "设置错误!"
#. module: hr_payroll_account
#: constraint:hr.contract:0
msgid "Error! Contract start-date must be less than contract end-date."
msgstr ""
msgstr "错误！联系人开始日期必须小于结束日期"
#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_salary_rule

2
addons/hr_timesheet/hr_timesheet.py
View File

@ -195,7 +195,7 @@ class account_analytic_account(osv.osv):
_inherit = 'account.analytic.account'
_description = 'Analytic Account'
_columns = {
'use_timesheets': fields.boolean('Use Timesheets', help="Check this field if this project manages timesheets"),
'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
}
def on_change_template(self, cr, uid, ids, template_id, context=None):

25
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
View File

@ -127,31 +127,6 @@
</field>
</record>
<!-- Menus -->
<record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
<field name="name">Invoice Tasks Work</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
<field name="context">{'search_default_to_invoice': 1}</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
Click to add some tasks work to be invoiced.
</p><p>
This list shows every task you can invoice to the customer.
Select the lines and invoice from the '<i>more...</i>' contextual
menu to generate invoices automatically.
</p>
</field>
</record>
<menuitem
action="action_hr_analytic_timesheet_open_tree"
id="menu_hr_analytic_timesheet_tree"
parent="account.menu_finance_periodical_processing_billing"
sequence="1"/>
<record id="view_hr_timesheet_invoice_factor_search" model="ir.ui.view">
<field name="name">hr_timesheet_invoice.factor.search</field>
<field name="model">hr_timesheet_invoice.factor</field>

16
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
View File

@ -62,16 +62,12 @@ class account_analytic_line(osv.osv):
if data is None:
data = {}
account_ids = {}
for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
account_ids[line.account_id.id] = True
account_ids = account_ids.keys() #data['accounts']
account_ids = [line.account_id.id for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context)]
for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
partner = account.partner_id
if (not partner) or not (account.pricelist_id):
raise osv.except_osv(_('Analytic Account incomplete !'),
_('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s.') % (account.name,))
_('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
@ -106,18 +102,18 @@ class account_analytic_line(osv.osv):
last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
invoices.append(last_invoice)
cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id " \
"FROM account_analytic_line as line " \
"WHERE account_id = %s " \
"AND id IN %s AND to_invoice IS NOT NULL " \
"GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
"GROUP BY product_id, user_id, to_invoice, product_uom_id", (account.id, tuple(ids),))
for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
for product_id, user_id, factor_id, qty, uom in cr.fetchall():
if data.get('product'):
product_id = data['product'][0]
product = product_obj.browse(cr, uid, product_id, context=context2)
if not product:
raise osv.except_osv(_('Error!'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name))
raise osv.except_osv(_('Error!'), _('There is no product defined. Please select one or force the product through the wizard.'))
factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
if factor.customer_name:

1
addons/hr_timesheet_sheet/static/src/js/timesheet.js
View File

@ -14,6 +14,7 @@ openerp.hr_timesheet_sheet = function(instance) {
date_to: false,
date_from: false,
});
this.updating = true;
this.field_manager.on("field_changed:timesheet_ids", this, this.query_sheets);
this.field_manager.on("field_changed:date_from", this, function() {
this.set({"date_from": instance.web.str_to_date(this.field_manager.get_field_value("date_from"))});

8
addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
View File

@ -54,16 +54,10 @@
<div t-if="widget.accounts.length == 0">
<div class="oe_view_nocontent">
<p class="oe_view_nocontent_create">
Click to add projects/analytic accounts you worked on.
Click to add projects, contracts or analytic accounts.
</p><p>
You will be able to register your working hours and
activities.
</p><p>
By default, you record timesheets on analytic accounts.
But if an analytic account represents a customer
contract, you can change the type of the analytic
account to 'Contract or Project' to setup the invoicing
options.
</p>
</div>
</div>

8
addons/idea/idea.py
View File

@ -68,20 +68,20 @@ class idea_idea(osv.osv):
def idea_cancel(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, { 'state': 'cancel' })
self.message_post(cr, uid, ids, body=_('Idea canceled.'), context=context)
self.message_post(cr, uid, ids, body=_('Idea has been refused.'), context=context)
return True
def idea_open(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state': 'open'}, context=context)
self.message_post(cr, uid, ids, body=_('Idea accepted.'), context=context)
self.message_post(cr, uid, ids, body=_('Idea has been opened.'), context=context)
return True
def idea_close(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state': 'close'}, context=context)
self.message_post(cr, uid, ids, body=_('Idea closed.'), context=context)
self.message_post(cr, uid, ids, body=_('Idea has been accepted.'), context=context)
return True
def idea_draft(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state': 'draft'}, context=context)
self.message_post(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
self.message_post(cr, uid, ids, body=_('Idea has been created.'), context=context)
return True

29
addons/knowledge/i18n/zh_CN.po
View File

@ -8,52 +8,52 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-11-24 02:53+0000\n"
"PO-Revision-Date: 2011-01-13 19:01+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"PO-Revision-Date: 2012-11-26 13:46+0000\n"
"Last-Translator: hifly <Unknown>\n"
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
"X-Generator: Launchpad (build 16293)\n"
"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
"X-Generator: Launchpad (build 16309)\n"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Documents"
msgstr ""
msgstr "文档"
#. module: knowledge
#: model:ir.model,name:knowledge.model_knowledge_config_settings
msgid "knowledge.config.settings"
msgstr ""
msgstr "knowledge.config.settings"
#. module: knowledge
#: help:knowledge.config.settings,module_document_webdav:0
msgid ""
"Access your documents in OpenERP through WebDAV.\n"
" This installs the module document_webdav."
msgstr ""
msgstr "在OpenERP中，通过WebDAV访问你的文档。"
#. module: knowledge
#: help:knowledge.config.settings,module_document_page:0
msgid "This installs the module document_page."
msgstr ""
msgstr "安装模块document_page."
#. module: knowledge
#: model:ir.ui.menu,name:knowledge.menu_document2
msgid "Collaborative Content"
msgstr "协作编辑"
msgstr "协作内容"
#. module: knowledge
#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
#: view:knowledge.config.settings:0
msgid "Configure Knowledge"
msgstr ""
msgstr "配置知识库"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Knowledge and Documents Management"
msgstr ""
msgstr "知识和文档管理"
#. module: knowledge
#: help:knowledge.config.settings,module_document:0
@ -63,16 +63,19 @@ msgid ""
"and a document dashboard.\n"
" This installs the module document."
msgstr ""
"这是一个完整的文档管理系统，\n"
"包含：用户认证，全文搜索（目前不支持pptx和docx）和一个文档控制台。\n"
"需要安装document模块。"
#. module: knowledge
#: field:knowledge.config.settings,module_document_page:0
msgid "Create static web pages"
msgstr ""
msgstr "创建静态页面"
#. module: knowledge
#: field:knowledge.config.settings,module_document_ftp:0
msgid "Share repositories (FTP)"
msgstr ""
msgstr "共享库(FTP)"
#. module: knowledge
#: field:knowledge.config.settings,module_document:0

Some files were not shown because too many files have changed in this diff Show More