diff --git a/addons/account/account.py b/addons/account/account.py index cfba30856a9..15881100441 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -641,8 +641,7 @@ class account_account(osv.osv): return True def _check_allow_type_change(self, cr, uid, ids, new_type, context=None): - group1 = ['payable', 'receivable', 'other'] - group2 = ['consolidation','view'] + restricted_groups = ['consolidation','view'] line_obj = self.pool.get('account.move.line') for account in self.browse(cr, uid, ids, context=context): old_type = account.type @@ -650,14 +649,25 @@ class account_account(osv.osv): if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]): #Check for 'Closed' type if old_type == 'closed' and new_type !='closed': - raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!")) - #Check for change From group1 to group2 and vice versa - if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1): - raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,)) + raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type as it contains journal items!")) + # Forbid to change an account type for restricted_groups as it contains journal items (or if one of its children does) + if (new_type in restricted_groups): + raise osv.except_osv(_('Warning !'), _("You cannot change the type of account to '%s' type as it contains journal items!") % (new_type,)) + + return True + + # For legal reason (forbiden to modify journal entries which belongs to a closed fy or period), Forbid to modify + # the code of an account if journal entries have been already posted on this account. This cannot be simply + # 'configurable' since it can lead to a lack of confidence in OpenERP and this is what we want to change. + def _check_allow_code_change(self, cr, uid, ids, context=None): + line_obj = self.pool.get('account.move.line') + for account in self.browse(cr, uid, ids, context=context): + account_ids = self.search(cr, uid, [('id', 'child_of', [account.id])], context=context) + if line_obj.search(cr, uid, [('account_id', 'in', account_ids)], context=context): + raise osv.except_osv(_('Warning !'), _("You cannot change the code of account which contains journal items!")) return True def write(self, cr, uid, ids, vals, context=None): - if context is None: context = {} if not ids: @@ -677,6 +687,8 @@ class account_account(osv.osv): self._check_moves(cr, uid, ids, "write", context=context) if 'type' in vals.keys(): self._check_allow_type_change(cr, uid, ids, vals['type'], context=context) + if 'code' in vals.keys(): + self._check_allow_code_change(cr, uid, ids, context=context) return super(account_account, self).write(cr, uid, ids, vals, context=context) def unlink(self, cr, uid, ids, context=None): @@ -1470,6 +1482,11 @@ class account_move(osv.osv): raise osv.except_osv(_('User Error!'), _('You cannot delete a posted journal entry "%s".') % \ move['name']) + for line in move.line_id: + if line.invoice: + raise osv.except_osv(_('User Error!'), + _("Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)") % \ + (line.invoice.number,move.name)) line_ids = map(lambda x: x.id, move.line_id) context['journal_id'] = move.journal_id.id context['period_id'] = move.period_id.id @@ -1678,11 +1695,41 @@ class account_move_reconcile(osv.osv): 'line_id': fields.one2many('account.move.line', 'reconcile_id', 'Entry Lines'), 'line_partial_ids': fields.one2many('account.move.line', 'reconcile_partial_id', 'Partial Entry lines'), 'create_date': fields.date('Creation date', readonly=True), + 'opening_reconciliation': fields.boolean('Opening Entries Reconciliation', help="Is this reconciliation produced by the opening of a new fiscal year ?."), } _defaults = { 'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/', } + + # You cannot unlink a reconciliation if it is a opening_reconciliation one, + # you should use the generate opening entries wizard for that + def unlink(self, cr, uid, ids, context=None): + for move_rec in self.browse(cr, uid, ids, context=context): + if move_rec.opening_reconciliation: + raise osv.except_osv(_('Error!'), _('You cannot unreconcile journal items if they has been generated by the \ + opening/closing fiscal year process.')) + return super(account_move_reconcile, self).unlink(cr, uid, ids, context=context) + + # Look in the line_id and line_partial_ids to ensure the partner is the same or empty + # on all lines. We allow that only for opening/closing period + def _check_same_partner(self, cr, uid, ids, context=None): + for reconcile in self.browse(cr, uid, ids, context=context): + move_lines = [] + if not reconcile.opening_reconciliation: + if reconcile.line_id: + first_partner = reconcile.line_id[0].partner_id.id + move_lines = reconcile.line_id + elif reconcile.line_partial_ids: + first_partner = reconcile.line_partial_ids[0].partner_id.id + move_lines = reconcile.line_partial_ids + if any([line.partner_id.id != first_partner for line in move_lines]): + return False + return True + _constraints = [ + (_check_same_partner, 'You can only reconcile journal items with the same partner.', ['line_id']), + ] + def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None): total = 0.0 for rec in self.browse(cr, uid, ids, context=context): diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 4422537007f..e7e3f740067 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -311,7 +311,7 @@ class account_bank_statement(osv.osv): 'statement_id': st_line.statement_id.id, 'journal_id': st_line.statement_id.journal_id.id, 'period_id': st_line.statement_id.period_id.id, - 'currency_id': cur_id, + 'currency_id': amount_currency and cur_id, 'amount_currency': amount_currency, 'analytic_account_id': analytic_id, } diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 80a406bb0b7..6804d5116f1 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1073,8 +1073,9 @@ class account_invoice(osv.osv): self.message_post(cr, uid, [inv_id], body=message, context=context) return True - def action_cancel(self, cr, uid, ids, *args): - context = {} # TODO: Use context from arguments + def action_cancel(self, cr, uid, ids, context=None): + if context is None: + context = {} account_move_obj = self.pool.get('account.move') invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids']) move_ids = [] # ones that we will need to remove @@ -1244,12 +1245,15 @@ class account_invoice(osv.osv): ref = invoice.reference else: ref = self._convert_ref(cr, uid, invoice.number) + partner = invoice.partner_id + if partner.parent_id and not partner.is_company: + partner = partner.parent_id # Pay attention to the sign for both debit/credit AND amount_currency l1 = { 'debit': direction * pay_amount>0 and direction * pay_amount, 'credit': direction * pay_amount<0 and - direction * pay_amount, 'account_id': src_account_id, - 'partner_id': invoice.partner_id.id, + 'partner_id': partner.id, 'ref':ref, 'date': date, 'currency_id':currency_id, @@ -1260,7 +1264,7 @@ class account_invoice(osv.osv): 'debit': direction * pay_amount<0 and - direction * pay_amount, 'credit': direction * pay_amount>0 and direction * pay_amount, 'account_id': pay_account_id, - 'partner_id': invoice.partner_id.id, + 'partner_id': partner.id, 'ref':ref, 'date': date, 'currency_id':currency_id, diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 5c5a25880cb..48fec608195 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -435,7 +435,7 @@
- +
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 00fad390282..3b2fe21d95b 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -620,12 +620,34 @@ class account_move_line(osv.osv): return False return True + def _check_currency_and_amount(self, cr, uid, ids, context=None): + for l in self.browse(cr, uid, ids, context=context): + if (l.amount_currency and not l.currency_id): + return False + return True + + def _check_currency_amount(self, cr, uid, ids, context=None): + for l in self.browse(cr, uid, ids, context=context): + if l.amount_currency: + if (l.amount_currency > 0.0 and l.credit > 0.0) or (l.amount_currency < 0.0 and l.debit > 0.0): + return False + return True + + def _check_currency_company(self, cr, uid, ids, context=None): + for l in self.browse(cr, uid, ids, context=context): + if l.currency_id.id == l.company_id.currency_id.id: + return False + return True + _constraints = [ (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']), (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']), (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']), (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']), (_check_currency, '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.', ['currency_id']), + (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']), + (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']), + (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']), ] #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id @@ -1111,7 +1133,7 @@ class account_move_line(osv.osv): 'has been confirmed.') % res[2]) return res - def _remove_move_reconcile(self, cr, uid, move_ids=None, context=None): + def _remove_move_reconcile(self, cr, uid, move_ids=None, opening_reconciliation=False, context=None): # Function remove move rencocile ids related with moves obj_move_line = self.pool.get('account.move.line') obj_move_rec = self.pool.get('account.move.reconcile') @@ -1126,6 +1148,8 @@ class account_move_line(osv.osv): unlink_ids += rec_ids unlink_ids += part_rec_ids if unlink_ids: + if opening_reconciliation: + obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False}) obj_move_rec.unlink(cr, uid, unlink_ids) return True diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 449810103b2..460104fe4bc 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-25 23:52+0000\n" -"Last-Translator: Sergio Corato \n" +"PO-Revision-Date: 2012-11-28 19:42+0000\n" +"Last-Translator: Davide Corio - agilebg.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-27 05:24+0000\n" -"X-Generator: Launchpad (build 16309)\n" +"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -26,6 +26,7 @@ msgstr "Sistema di pagamento" msgid "" "An account fiscal position could be defined only once time on same accounts." msgstr "" +"Una posizione fiscale può essere definita una sola volta per lo stesso conto." #. module: account #: view:account.unreconcile:0 @@ -85,7 +86,7 @@ msgstr "Importa da fatture o pagamenti" #: code:addons/account/account_move_line.py:1303 #, python-format msgid "Bad Account!" -msgstr "" +msgstr "Conto Errato!" #. module: account #: view:account.move:0 @@ -242,7 +243,7 @@ msgstr "Sezionale: %s" #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" -msgstr "" +msgstr "N. di cifre da usare per il codice conto" #. module: account #: help:account.analytic.journal,type:0 @@ -394,7 +395,7 @@ msgstr "Annulla Riconciliazione" #. module: account #: field:account.config.settings,module_account_budget:0 msgid "Budget management" -msgstr "" +msgstr "Gestione Budget" #. module: account #: view:product.template:0 @@ -416,7 +417,7 @@ msgstr "" #. module: account #: field:account.config.settings,group_multi_currency:0 msgid "Allow multi currencies" -msgstr "" +msgstr "Consenti valute multiple" #. module: account #: code:addons/account/account_invoice.py:73 @@ -437,12 +438,12 @@ msgstr "Giugno" #: code:addons/account/wizard/account_automatic_reconcile.py:148 #, python-format msgid "You must select accounts to reconcile." -msgstr "" +msgstr "Devi selezionare i conti da riconciliare." #. module: account #: help:account.config.settings,group_analytic_accounting:0 msgid "Allows you to use the analytic accounting." -msgstr "" +msgstr "Abilita la contabilità analitica." #. module: account #: model:ir.actions.act_window,help:account.action_account_moves_bank @@ -462,7 +463,7 @@ msgstr "" #: view:account.invoice.report:0 #: field:account.invoice.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Commerciale" #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -685,12 +686,12 @@ msgstr "Il contabile conferma la registrazione" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 #, python-format msgid "Nothing to reconcile" -msgstr "" +msgstr "Nulla da riconciliare" #. module: account #: field:account.config.settings,decimal_precision:0 msgid "Decimal precision on journal entries" -msgstr "" +msgstr "Accuratezza decimale nelle registrazioni sezionale" #. module: account #: selection:account.config.settings,period:0 @@ -725,6 +726,8 @@ msgid "" "Specified journal does not have any account move entries in draft state for " "this period." msgstr "" +"Il sezionale specificato non ha registrazioni in stato bozza per questo " +"periodo." #. module: account #: view:account.fiscal.position:0 diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po index 38502ad287f..0a8b6e23ad5 100644 --- a/addons/account/i18n/nb.po +++ b/addons/account/i18n/nb.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-26 15:09+0000\n" +"PO-Revision-Date: 2012-11-28 13:31+0000\n" "Last-Translator: Kaare Pettersen \n" "Language-Team: Norwegian Bokmal \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-27 05:24+0000\n" -"X-Generator: Launchpad (build 16309)\n" +"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -2399,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 @@ -2420,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 @@ -2515,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 @@ -2555,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 @@ -2781,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 @@ -2816,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 @@ -2826,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 @@ -2903,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 @@ -3001,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 @@ -3175,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 @@ -3213,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 @@ -3222,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 @@ -3240,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 @@ -3346,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 @@ -3359,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 @@ -3481,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 @@ -3533,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 @@ -3617,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 @@ -3638,7 +3640,7 @@ msgstr "Konto Partner ledger" #: code:addons/account/account_invoice.py:1321 #, python-format msgid "%s created." -msgstr "" +msgstr "%s Opprettet." #. module: account #: help:account.journal.column,sequence:0 @@ -3648,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 @@ -3676,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 @@ -3851,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 @@ -3890,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 @@ -3938,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 @@ -4059,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 @@ -4087,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 @@ -4227,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 @@ -4314,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 @@ -4342,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 @@ -4376,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 @@ -4417,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 @@ -4485,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 @@ -4517,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 @@ -4544,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 @@ -4705,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 @@ -4712,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 @@ -4727,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 @@ -4859,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 @@ -4877,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 @@ -4968,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 @@ -5009,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 @@ -5140,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 @@ -5150,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 @@ -5208,7 +5220,7 @@ msgstr "Fakturaer" #. module: account #: help:account.config.settings,expects_chart_of_accounts:0 msgid "Check this box if this company is a legal entity." -msgstr "" +msgstr "Kryss av denne boksen hvis dette selskapet er en juridisk enhet." #. module: account #: model:account.account.type,name:account.conf_account_type_chk @@ -5225,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 @@ -5265,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 @@ -5358,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 @@ -5393,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 @@ -5441,7 +5453,7 @@ msgstr "" #. module: account #: model:res.groups,name:account.group_account_manager msgid "Financial Manager" -msgstr "" +msgstr "Finansiell ledelse." #. module: account #: field:account.journal,group_invoice_lines:0 @@ -5457,7 +5469,7 @@ msgstr "Bevegelser" #: field:account.bank.statement,details_ids:0 #: view:account.journal:0 msgid "CashBox Lines" -msgstr "" +msgstr "Kontontboks linjer." #. module: account #: model:ir.model,name:account.model_account_vat_declaration @@ -5503,6 +5515,8 @@ msgid "" "There is no period defined for this date: %s.\n" "Please create one." msgstr "" +"Det er ingen periode definert for denne datoen:% s.\n" +"Vennligst opprette en." #. module: account #: help:account.tax,price_include:0 @@ -5604,7 +5618,7 @@ msgstr "" #: code:addons/account/account_invoice.py:1326 #, python-format msgid "%s paid." -msgstr "" +msgstr "%s Betalt." #. module: account #: view:account.financial.report:0 @@ -5747,7 +5761,7 @@ msgstr "Beregningskode (dersom type=kode)" #, python-format msgid "" "Cannot find a chart of accounts for this company, you should create one." -msgstr "" +msgstr "Kan ikke finne en kontoplan for dette selskapet, du bør opprette en." #. module: account #: selection:account.analytic.journal,type:0 @@ -5882,7 +5896,7 @@ msgstr "Inkludert i basisbeløpet" #. module: account #: field:account.invoice,supplier_invoice_number:0 msgid "Supplier Invoice Number" -msgstr "" +msgstr "Leverandør faktura nummer." #. module: account #: help:account.payment.term.line,days:0 @@ -5903,6 +5917,8 @@ msgstr "Beregning" #, python-format msgid "You can not add/modify entries in a closed period %s of journal %s." msgstr "" +"Du kan ikke legge til / endre oppføringer i en lukket periode% s av " +"tidsskriftet% s." #. module: account #: view:account.journal:0 @@ -5927,7 +5943,7 @@ msgstr "Periodestart" #. module: account #: model:account.account.type,name:account.account_type_asset_view1 msgid "Asset View" -msgstr "" +msgstr "Eiendel Vis." #. module: account #: model:ir.model,name:account.model_account_common_account_report @@ -6000,12 +6016,12 @@ msgstr "Årsavslutningsjournal" #. module: account #: view:account.invoice:0 msgid "Draft Refund " -msgstr "" +msgstr "Utkast refusjon. " #. module: account #: view:cash.box.in:0 msgid "Fill in this form if you put money in the cash register:" -msgstr "" +msgstr "Fyll ut dette skjemaet hvis du setter penger i kasse apparatet:" #. module: account #: field:account.payment.term.line,value_amount:0 @@ -6082,7 +6098,7 @@ msgstr "Kundefakturaer og kreditnotaer" #: code:addons/account/wizard/account_move_journal.py:161 #, python-format msgid "This period is already closed." -msgstr "" +msgstr "Denne perioden er allerede lukket." #. module: account #: field:account.analytic.line,amount_currency:0 @@ -6095,7 +6111,7 @@ msgstr "Valutabeløp" #. module: account #: selection:res.company,tax_calculation_rounding_method:0 msgid "Round per Line" -msgstr "" +msgstr "Runde per. linje." #. module: account #: model:ir.actions.act_window,name:account.action_view_move_line @@ -6156,7 +6172,7 @@ msgstr "" #: code:addons/account/wizard/account_report_aged_partner_balance.py:56 #, python-format msgid "You must set a period length greater than 0." -msgstr "" +msgstr "Du må angi en periode lengde større enn 0." #. module: account #: view:account.fiscal.position.template:0 @@ -6167,7 +6183,7 @@ msgstr "Regnskapsstatus Mal" #. module: account #: view:account.invoice:0 msgid "Draft Refund" -msgstr "" +msgstr "Utkast refusjon." #. module: account #: view:account.analytic.chart:0 @@ -6204,7 +6220,7 @@ msgstr "Avstem med nedskriving" #. module: account #: constraint:account.move.line:0 msgid "You cannot create journal items on an account of type view." -msgstr "" +msgstr "Du kan ikke opprette journal elementer på en konto av typen visning." #. module: account #: selection:account.payment.term.line,value:0 @@ -6279,7 +6295,7 @@ msgstr "Flytt navn (id): %s (%s)" #. module: account #: view:account.move.journal:0 msgid "Standard Entries" -msgstr "" +msgstr "Standard oppføringer." #. module: account #: view:account.move.line.reconcile:0 @@ -6352,7 +6368,7 @@ msgstr "Avgiftskartlegging" #. module: account #: view:account.config.settings:0 msgid "Select Company" -msgstr "" +msgstr "Velg Firma." #. module: account #: model:ir.actions.act_window,name:account.action_account_state_open @@ -6426,7 +6442,7 @@ msgstr "Antall linjer" #. module: account #: view:account.invoice:0 msgid "(update)" -msgstr "" +msgstr "(Oppdatering)" #. module: account #: field:account.aged.trial.balance,filter:0 @@ -6468,7 +6484,7 @@ msgstr "" #. module: account #: field:account.journal,loss_account_id:0 msgid "Loss Account" -msgstr "" +msgstr "Tap konto." #. module: account #: field:account.tax,account_collected_id:0 @@ -6730,7 +6746,7 @@ msgstr "" #. module: account #: view:account.config.settings:0 msgid "Bank & Cash" -msgstr "" +msgstr "Bank og kontant." #. module: account #: help:account.fiscalyear.close.state,fy_id:0 @@ -6816,7 +6832,7 @@ msgstr "Fordring" #. module: account #: constraint:account.move.line:0 msgid "You cannot create journal items on closed account." -msgstr "" +msgstr "Du kan ikke opprette journal enmer i en lukker konto." #. module: account #: code:addons/account/account_invoice.py:594 diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index 51633c9e660..365e5f20596 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-25 13:43+0000\n" -"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" +"PO-Revision-Date: 2012-11-28 21:53+0000\n" +"Last-Translator: Thomas Pot (Open2bizz) \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:41+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n" +"X-Generator: Launchpad (build 16319)\n" #, python-format #~ msgid "Integrity Error !" @@ -155,6 +155,19 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klik om de zichtbare kolommen van een dagboek te " +"specificeren.\n" +"

\n" +" Dagboekweergaves bepalen de manier waarop boekingen \n" +" ingevoerd kunnen worden. Selecteer de velden welke zichtbaar " +"\n" +" moeten zijn en bepaald de volgorde daarvan.\n" +"

\n" +" In de dagboekinstellingen kan bepaald worden welke gegevens\n" +" zichtbaar zijn bij boekingen in het betreffende dagboek.\n" +"

\n" +" " #. module: account #: help:account.payment.term,active:0 @@ -205,6 +218,8 @@ msgid "" "which is set after generating opening entries from 'Generate Opening " "Entries'." msgstr "" +"U dient het 'Jaarafsluiting dagboek' te definiëren voor het fiscale jaar, " +"nadat u een openingsbalans heeft gemaakt" #. module: account #: field:account.fiscal.position.account,account_src_id:0 @@ -223,6 +238,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" klik hier om een fiscale periode toe te voegen.\n" +"

\n" +" Een fiscale periode is vaak een maand of een kwartaal. " +"Normaal\n" +" zal dit gelijk zijn met de periode van uw Belasting " +"aangifte.\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -243,7 +267,7 @@ msgstr "Dagboek: %s" #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" -msgstr "" +msgstr "Aantal cijfers voor de rekening code" #. module: account #: help:account.analytic.journal,type:0 @@ -263,6 +287,9 @@ msgid "" "lines for invoices. Leave empty if you don't want to use an analytic account " "on the invoice tax lines by default." msgstr "" +"Geef de kostenplaats welke standaard gebruikt moet worden bij BTW factuur " +"regels. Als u dit veld niet invuld, wordt er standaard geen kostenplaats " +"gebruikt." #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form @@ -298,7 +325,7 @@ msgstr "Belgische overzichten" #. module: account #: model:account.account.type,name:account.account_type_income_view1 msgid "Income View" -msgstr "" +msgstr "View opbrengsten" #. module: account #: help:account.account,user_type:0 @@ -314,7 +341,7 @@ msgstr "" #. module: account #: field:account.config.settings,sale_refund_sequence_next:0 msgid "Next credit note number" -msgstr "" +msgstr "Volgend nummer creditnota" #. module: account #: help:account.config.settings,module_account_voucher:0 @@ -323,6 +350,10 @@ msgid "" "sales, purchase, expense, contra, etc.\n" " This installs the module account_voucher." msgstr "" +"Deze module bevat alle voorzieningen voor registratie van " +"(bank)afschriften.\n" +" " +"hiermee installeert u de module 'account_voucher'" #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry @@ -361,6 +392,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klik hier om een creditnota te maken. \n" +"

\n" +" Een creditnota is een factuur, waarbij u een bestaande " +"factuur volledig of gedeeltelijk \n" +" crediteert.\n" +"

\n" +" In plaats van handmatig kunt u hiermee een creditnota maken " +"\n" +" direct vanaf de originele factuur.\n" +"

\n" +" " #. module: account #: field:account.journal.column,field:0 @@ -426,12 +469,12 @@ msgstr "Juni" #: code:addons/account/wizard/account_automatic_reconcile.py:148 #, python-format msgid "You must select accounts to reconcile." -msgstr "" +msgstr "Selecteer de grootboekrekeningen die afgeletterd moeten worden." #. module: account #: help:account.config.settings,group_analytic_accounting:0 msgid "Allows you to use the analytic accounting." -msgstr "" +msgstr "stelt u in staat kostenplaatsen te gebruiken" #. module: account #: model:ir.actions.act_window,help:account.action_account_moves_bank @@ -531,6 +574,18 @@ msgid "" "should choose 'Round per line' because you certainly want the sum of your " "tax-included line subtotals to be equal to the total amount with taxes." msgstr "" +"Als u 'afronden per regel' selecteert: voor elke BTW rekening , wordt het " +"BTW bedrag eerst berekend en afgerond voor elke factuur regel en vervolgens " +"worden deze afgeronde bedragen opgeteld, wat leidt tot het totale bedrag " +"voor deze belasting. \r\n" +"\r\n" +"Als u 'afronden globaal' selecteert: voor elke BTW rekening wordt het BTW " +"bedrag berekend voor elke factuur regel. vervolgens zullen deze bedragen " +"worden opgeteld en uiteindelijk wordt dit totale BTW bedrag afgerond. \r\n" +"\r\n" +"Als u verkoopt met BTW inbegrepen, moet u kiezen voor 'afronden per regel', " +"omdat U zeker wil zijn dat de subtotalen van \r\n" +"uw (BTW inbegrepen) regels gelijk zijn aan het totale bedrag met BTW." #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts @@ -600,7 +655,7 @@ msgstr "Bovenliggend doel" #. module: account #: help:account.invoice.line,sequence:0 msgid "Gives the sequence of this line when displaying the invoice." -msgstr "" +msgstr "Geeft de volgorde van de factuur regel bij het tonen van de factuur" #. module: account #: field:account.bank.statement,account_id:0 @@ -679,7 +734,7 @@ msgstr "Niets af te letteren" #. module: account #: field:account.config.settings,decimal_precision:0 msgid "Decimal precision on journal entries" -msgstr "" +msgstr "Aantal decimalen van journaalposten" #. module: account #: selection:account.config.settings,period:0 @@ -713,7 +768,7 @@ msgstr "Rapport waarde" msgid "" "Specified journal does not have any account move entries in draft state for " "this period." -msgstr "" +msgstr "Geselecteerd dagboek heeft geen 'concept'boekingen" #. module: account #: view:account.fiscal.position:0 @@ -768,12 +823,16 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Geen journaalposten gevonden.\n" +"

\n" +" " #. module: account #: code:addons/account/account.py:1606 #, python-format msgid "Cannot create move with currency different from .." -msgstr "" +msgstr "U kunt geen boeking doen met een andere valuta dan ..." #. module: account #: model:email.template,report_name:account.email_template_edi_invoice diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 55d61f5c611..c95e3919012 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-01 08:44+0000\n" +"PO-Revision-Date: 2012-11-28 07:22+0000\n" "Last-Translator: ccdos \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:01+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -776,7 +776,7 @@ msgstr "账簿的会计期间" #: constraint:account.move:0 msgid "" "You cannot create more than one move per period on a centralized journal." -msgstr "" +msgstr "在每个会计期间，你不可以创建1个以上的总分类凭证" #. module: account #: help:account.tax,account_analytic_paid_id:0 @@ -784,7 +784,7 @@ msgid "" "Set the analytic account that will be used by default on the invoice tax " "lines for refunds. Leave empty if you don't want to use an analytic account " "on the invoice tax lines by default." -msgstr "" +msgstr "设置辅助核算项，用于退款时发票上默认税科目。如果默认不要在发票的税上 使用辅助核算项，留空。" #. module: account #: view:account.account:0 @@ -6098,7 +6098,7 @@ msgstr "固定金额" #: code:addons/account/account_move_line.py:1151 #, python-format msgid "You cannot change the tax, you should remove and recreate lines." -msgstr "" +msgstr "你不能修改税，你需要删去并且重建这一行" #. module: account #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index 9b54647e726..a70fdf38f3c 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -7,14 +7,14 @@ - + - + - + diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index dbf815d5218..e11b4dcd34b 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -60,7 +60,7 @@ class account_fiscalyear_close(osv.osv_memory): cr.execute('select distinct(company_id) from account_move_line where id in %s',(tuple(ids),)) if len(cr.fetchall()) > 1: raise osv.except_osv(_('Warning!'), _('The entries to reconcile should belong to the same company.')) - r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto'}) + r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto', 'opening_reconciliation': True}) cr.execute('update account_move_line set reconcile_id = %s where id in %s',(r_id, tuple(ids),)) return r_id @@ -107,7 +107,7 @@ class account_fiscalyear_close(osv.osv_memory): ('journal_id', '=', new_journal.id), ('period_id', '=', period.id)]) if move_ids: move_line_ids = obj_acc_move_line.search(cr, uid, [('move_id', 'in', move_ids)]) - obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, context=context) + obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, opening_reconciliation=True, context=context) obj_acc_move_line.unlink(cr, uid, move_line_ids, context=context) obj_acc_move.unlink(cr, uid, move_ids, context=context) diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po index db12ba122d0..2436e754e50 100644 --- a/addons/account_accountant/i18n/it.po +++ b/addons/account_accountant/i18n/it.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:51+0000\n" -"PO-Revision-Date: 2011-01-17 07:34+0000\n" -"Last-Translator: Nicola Riolini - Micronaet \n" +"PO-Revision-Date: 2012-11-28 19:50+0000\n" +"Last-Translator: Davide Corio - agilebg.com \n" "Language-Team: Italian \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: account_accountant #: model:ir.actions.client,name:account_accountant.action_client_account_menu msgid "Open Accounting Menu" -msgstr "" +msgstr "Apri Menù Contabilità" #~ msgid "Accountant" #~ msgstr "Contabile" diff --git a/addons/account_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po index 7240f08569a..2a5ef937b6e 100644 --- a/addons/account_accountant/i18n/nl_BE.po +++ b/addons/account_accountant/i18n/nl_BE.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \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 \n" +"PO-Revision-Date: 2012-11-27 13:16+0000\n" +"Last-Translator: Els Van Vossel (Agaplan) \n" "Language-Team: Dutch (Belgium) \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" diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 06e2fd2bb18..466db63e61e 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -75,15 +75,21 @@ class account_analytic_account(osv.osv): res[id][f] = 0.0 res2 = {} for account in accounts: - cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \ - "FROM account_analytic_line as line " \ - "WHERE account_id = %s " \ - "AND invoice_id is NULL AND to_invoice IS NOT NULL " \ - "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id,)) + cr.execute(""" + SELECT product_id, sum(amount), user_id, to_invoice, sum(unit_amount), product_uom_id, line.name + FROM account_analytic_line line + LEFT JOIN account_analytic_journal journal ON (journal.id = line.journal_id) + WHERE account_id = %s + AND journal.type != 'purchase' + AND invoice_id IS NULL + AND to_invoice IS NOT NULL + GROUP BY product_id, user_id, to_invoice, product_uom_id, line.name""", (account.id,)) res[account.id][f] = 0.0 - for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall(): - price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context) + for product_id, price, user_id, factor_id, qty, uom, line_name in cr.fetchall(): + price = -price + if product_id: + price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context) factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context) res[account.id][f] += price * qty * (100-factor.factor or 0.0) / 100.0 diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index fd32edba0a1..be2a504658f 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -60,14 +60,13 @@ or view - + No order to invoice, create - - - - -
    • -
    • +
  • + + + + +
    • diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 8590bcb8b49..84c03d68dbd 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -5,7 +5,7 @@ - Mark read + CRM Meeting: Mark read True ir.actions.server @@ -23,7 +23,7 @@ - Mark unread + CRM Meeting: Mark unread True ir.actions.server diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po index 4fb5c3afbca..8d5d3f545f1 100644 --- a/addons/base_calendar/i18n/zh_CN.po +++ b/addons/base_calendar/i18n/zh_CN.po @@ -8,25 +8,25 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-05-10 17:39+0000\n" -"Last-Translator: 开阖软件 Jeff Wang \n" +"PO-Revision-Date: 2012-11-28 16:50+0000\n" +"Last-Translator: Joshua Jan(SHINEIT) \n" "Language-Team: Chinese (Simplified) \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:27+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 #: selection:res.alarm,trigger_related:0 msgid "The event starts" -msgstr "事件开始时" +msgstr "活动开始" #. module: base_calendar #: view:calendar.event:0 msgid "My Events" -msgstr "我的事件" +msgstr "我的活动" #. module: base_calendar #: help:calendar.event,exdate:0 @@ -40,14 +40,14 @@ msgstr "这属性定义循环日程的日期/时间异常列表。" #. module: base_calendar #: constraint:res.users:0 msgid "The chosen company is not in the allowed companies for this user" -msgstr "用户无权操作所选择公司数据" +msgstr "选择的公司不属于此用户允许访问的公司。" #. module: base_calendar #: field:calendar.event,we:0 #: field:calendar.todo,we:0 #: field:crm.meeting,we:0 msgid "Wed" -msgstr "周三" +msgstr "星期三" #. module: base_calendar #: selection:calendar.attendee,cutype:0 @@ -64,13 +64,13 @@ msgstr "定期会议" #. module: base_calendar #: model:crm.meeting.type,name:base_calendar.categ_meet5 msgid "Feedback Meeting" -msgstr "" +msgstr "会议反馈" #. module: base_calendar #: code:addons/base_calendar/crm_meeting.py:117 #, python-format msgid "Meeting completed." -msgstr "" +msgstr "会议完成." #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view @@ -83,7 +83,7 @@ msgstr "提醒" #: selection:calendar.todo,week_list:0 #: selection:crm.meeting,week_list:0 msgid "Sunday" -msgstr "周日" +msgstr "星期天" #. module: base_calendar #: field:calendar.attendee,role:0 @@ -147,14 +147,14 @@ msgstr "指定类型的邀请" #: view:crm.meeting:0 #: field:crm.meeting,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "未读信息" #. module: base_calendar #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 #: selection:crm.meeting,week_list:0 msgid "Friday" -msgstr "周五" +msgstr "星期五" #. module: base_calendar #: field:calendar.event,allday:0 @@ -182,12 +182,12 @@ msgstr "空闲" #. module: base_calendar #: help:crm.meeting,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "如果要求你关注新消息，勾选此项" #. module: base_calendar #: help:calendar.attendee,rsvp:0 msgid "Indicats whether the favor of a reply is requested" -msgstr "标明是否要求答复赞成" +msgstr "标明是否要求答复" #. module: base_calendar #: field:calendar.alarm,alarm_id:0 @@ -209,7 +209,7 @@ msgstr "事件" #: field:calendar.todo,tu:0 #: field:crm.meeting,tu:0 msgid "Tue" -msgstr "周二" +msgstr "星期二" #. module: base_calendar #: selection:calendar.event,byday:0 @@ -222,7 +222,7 @@ msgstr "第三个" #: selection:calendar.alarm,trigger_related:0 #: selection:res.alarm,trigger_related:0 msgid "The event ends" -msgstr "这事件结束时" +msgstr "这活动结束时" #. module: base_calendar #: selection:calendar.event,byday:0 @@ -234,12 +234,12 @@ msgstr "最近" #. module: base_calendar #: help:crm.meeting,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "消息和通信历史" #. module: base_calendar #: field:crm.meeting,message_ids:0 msgid "Messages" -msgstr "" +msgstr "消息" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -266,7 +266,7 @@ msgstr "主席" #. module: base_calendar #: view:crm.meeting:0 msgid "My Meetings" -msgstr "" +msgstr "我的会议" #. module: base_calendar #: selection:calendar.alarm,action:0 @@ -303,12 +303,12 @@ msgstr "" #. module: base_calendar #: field:crm.meeting,name:0 msgid "Meeting Subject" -msgstr "" +msgstr "会议主题" #. module: base_calendar #: view:calendar.event:0 msgid "End of Recurrence" -msgstr "" +msgstr "循环结束" #. module: base_calendar #: view:calendar.event:0 @@ -329,7 +329,7 @@ msgstr "选择重复会议的日子" #: view:crm.meeting:0 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting msgid "Meetings" -msgstr "" +msgstr "会议" #. module: base_calendar #: field:calendar.event,recurrent_id:0 @@ -342,19 +342,19 @@ msgstr "循环日期" #: field:calendar.alarm,event_end_date:0 #: field:calendar.attendee,event_end_date:0 msgid "Event End Date" -msgstr "事件结束日期" +msgstr "活动结束日期" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "Optional Participation" -msgstr "可参与" +msgstr "可选择参与" #. module: base_calendar #: help:crm.meeting,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: base_calendar #: code:addons/base_calendar/base_calendar.py:388 diff --git a/addons/base_crypt/i18n/it.po b/addons/base_crypt/i18n/it.po index 1425a8c7924..e82a13db711 100644 --- a/addons/base_crypt/i18n/it.po +++ b/addons/base_crypt/i18n/it.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \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 \n" +"PO-Revision-Date: 2012-11-28 19:47+0000\n" +"Last-Translator: Davide Corio - agilebg.com \n" "Language-Team: Italian \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: base_crypt #: constraint:res.users:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Errore: codice EAN non valido" #. module: base_crypt #: constraint:res.users:0 @@ -30,12 +30,12 @@ msgstr "L'azienda scelta non è fra le aziende abilitate per questo utente" #. module: base_crypt #: model:ir.model,name:base_crypt.model_res_users msgid "Users" -msgstr "" +msgstr "Utenti" #. module: base_crypt #: sql_constraint:res.users:0 msgid "OAuth UID must be unique per provider" -msgstr "" +msgstr "il UID OAuth deve essere unico per provider" #. module: base_crypt #: sql_constraint:res.users:0 diff --git a/addons/base_crypt/i18n/tr.po b/addons/base_crypt/i18n/tr.po index 6a0590cfbbe..24ea4a9da7c 100644 --- a/addons/base_crypt/i18n/tr.po +++ b/addons/base_crypt/i18n/tr.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \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 \n" +"PO-Revision-Date: 2012-11-27 21:53+0000\n" +"Last-Translator: Ahmet Altınışık \n" "Language-Team: Turkish \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 diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po index 200f04f2971..25cb55361b9 100644 --- a/addons/base_crypt/i18n/zh_CN.po +++ b/addons/base_crypt/i18n/zh_CN.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2011-06-22 08:19+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-11-28 06:30+0000\n" +"Last-Translator: mrshelly \n" "Language-Team: Chinese (Simplified) \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: base_crypt #: constraint:res.users:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "错误：无效的(EAN)条码" #. module: base_crypt #: constraint:res.users:0 @@ -30,17 +30,17 @@ msgstr "用户无权操作所选择公司数据" #. module: base_crypt #: model:ir.model,name:base_crypt.model_res_users msgid "Users" -msgstr "" +msgstr "用户" #. module: base_crypt #: sql_constraint:res.users:0 msgid "OAuth UID must be unique per provider" -msgstr "" +msgstr "OAuth UID必须是每个提供者唯一的" #. module: base_crypt #: sql_constraint:res.users:0 msgid "You can not have two users with the same login !" -msgstr "你不能同时登录两个用户！" +msgstr "两个用户不能使用相同的用户名！" #, python-format #~ msgid "Error" diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py index c831ffd229d..b926c6b2782 100644 --- a/addons/base_import/controllers.py +++ b/addons/base_import/controllers.py @@ -14,7 +14,7 @@ class ImportController(openerp.addons.web.http.Controller): 'file': file.read(), 'file_name': file.filename, 'file_type': file.content_type, - }, req.session.eval_context(req.context)) + }, req.context) return 'window.top.%s(%s)' % ( jsonp, simplejson.dumps({'result': written})) diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po index 981a8d63301..514223d74e0 100644 --- a/addons/base_report_designer/i18n/it.po +++ b/addons/base_report_designer/i18n/it.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-05-10 18:17+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-11-28 19:53+0000\n" +"Last-Translator: Davide Corio - agilebg.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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: base_report_designer #: model:ir.model,name:base_report_designer.model_base_report_sxw @@ -180,7 +180,7 @@ msgstr "Annulla" #. module: base_report_designer #: view:base.report.sxw:0 msgid "or" -msgstr "" +msgstr "o" #. module: base_report_designer #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po index cab3828f12d..143b96d3c0f 100644 --- a/addons/base_report_designer/i18n/tr.po +++ b/addons/base_report_designer/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-05-10 18:06+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-11-27 20:20+0000\n" +"Last-Translator: Ahmet Altınışık \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 diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po index 431a39bfe02..abee97593ac 100644 --- a/addons/base_report_designer/i18n/zh_CN.po +++ b/addons/base_report_designer/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n" +"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n" "X-Generator: Launchpad (build 16309)\n" #. module: base_report_designer diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po index 85494807d9c..7fa74452b03 100644 --- a/addons/base_setup/i18n/zh_CN.po +++ b/addons/base_setup/i18n/zh_CN.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-02-10 03:32+0000\n" +"PO-Revision-Date: 2012-11-28 16:54+0000\n" "Last-Translator: ccdos \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:52+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: base_setup #: view:sale.config.settings:0 msgid "Emails Integration" -msgstr "" +msgstr "Email 集成" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -29,18 +29,18 @@ msgstr "访客" #. module: base_setup #: view:sale.config.settings:0 msgid "Contacts" -msgstr "" +msgstr "联系人" #. module: base_setup #: model:ir.model,name:base_setup.model_base_config_settings msgid "base.config.settings" -msgstr "" +msgstr "base.config.settings" #. module: base_setup #: field:base.config.settings,module_auth_oauth:0 msgid "" "Use external authentication providers, sign in with google, facebook, ..." -msgstr "" +msgstr "使用OpenID登陆(Google, Facebook...)" #. module: base_setup #: view:sale.config.settings:0 @@ -63,24 +63,24 @@ msgstr "会员" #. module: base_setup #: view:base.config.settings:0 msgid "Portal access" -msgstr "" +msgstr "门户访问" #. module: base_setup #: view:base.config.settings:0 msgid "Authentication" -msgstr "" +msgstr "身份验证" #. module: base_setup #: view:sale.config.settings:0 msgid "Quotations and Sales Orders" -msgstr "" +msgstr "报价和销售订单" #. module: base_setup #: view:base.config.settings:0 #: model:ir.actions.act_window,name:base_setup.action_general_configuration #: model:ir.ui.menu,name:base_setup.menu_general_configuration msgid "General Settings" -msgstr "" +msgstr "常规设置" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -90,12 +90,12 @@ msgstr "捐助者" #. module: base_setup #: view:base.config.settings:0 msgid "Email" -msgstr "" +msgstr "Email" #. module: base_setup #: field:sale.config.settings,module_crm:0 msgid "CRM" -msgstr "" +msgstr "CRM" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -105,12 +105,12 @@ msgstr "病人" #. module: base_setup #: field:base.config.settings,module_base_import:0 msgid "Allow users to import data from CSV files" -msgstr "" +msgstr "允许导入CSV数据" #. module: base_setup #: field:base.config.settings,module_multi_company:0 msgid "Manage multiple companies" -msgstr "" +msgstr "允许多公司操作" #. module: base_setup #: help:base.config.settings,module_portal:0 @@ -120,17 +120,17 @@ msgstr "" #. module: base_setup #: view:sale.config.settings:0 msgid "On Mail Client" -msgstr "" +msgstr "在邮件客户端" #. module: base_setup #: field:sale.config.settings,module_web_linkedin:0 msgid "Get contacts automatically from linkedIn" -msgstr "" +msgstr "自动获取LinkedIn联系人" #. module: base_setup #: field:sale.config.settings,module_plugin_thunderbird:0 msgid "Enable Thunderbird plug-in" -msgstr "" +msgstr "允许 Thunderbird 插件" #. module: base_setup #: view:base.setup.terminology:0 @@ -140,22 +140,22 @@ msgstr "res_config_contents" #. module: base_setup #: view:sale.config.settings:0 msgid "Customer Features" -msgstr "" +msgstr "客户特性" #. module: base_setup #: view:base.config.settings:0 msgid "Import / Export" -msgstr "" +msgstr "导入/导出" #. module: base_setup #: view:sale.config.settings:0 msgid "Sale Features" -msgstr "" +msgstr "销售特性" #. module: base_setup #: field:sale.config.settings,module_plugin_outlook:0 msgid "Enable Outlook plug-in" -msgstr "" +msgstr "允许 Outlook 插件" #. module: base_setup #: view:base.setup.terminology:0 @@ -172,7 +172,7 @@ msgstr "承租人" #. module: base_setup #: help:base.config.settings,module_share:0 msgid "Share or embbed any screen of openerp." -msgstr "" +msgstr "分享或者嵌入任意Openerp屏幕" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -193,6 +193,8 @@ msgid "" "companies.\n" " This installs the module multi_company." msgstr "" +"工作在多公司环境，公司之间适当地安全访问\n" +" 为此安装模块multi_company。" #. module: base_setup #: view:base.config.settings:0 @@ -204,7 +206,7 @@ msgstr "" #. module: base_setup #: model:ir.model,name:base_setup.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: base_setup #: field:base.setup.terminology,partner:0 @@ -224,7 +226,7 @@ msgstr "客户" #. module: base_setup #: help:base.config.settings,module_auth_anonymous:0 msgid "Enable the public part of openerp, openerp becomes a public website." -msgstr "" +msgstr "启用Openerp的公共部分，Openerp成为一个公共的web站点" #. module: base_setup #: help:sale.config.settings,module_plugin_thunderbird:0 @@ -237,6 +239,9 @@ msgid "" " Partner from the selected emails.\n" " This installs the module plugin_thunderbird." msgstr "" +"插件允许把你的email和附件存档到Openerp对象。你能选择一个业务伙伴、或者线索，并 选择邮件存为 .eml 文件 附加到在选中记录的附件中。\n" +"\n" +"为此要安装模块 plugin_thunderbird." #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -252,7 +257,7 @@ msgstr "称呼客户的另一种方式" #: model:ir.actions.act_window,name:base_setup.action_sale_config #: view:sale.config.settings:0 msgid "Configure Sales" -msgstr "" +msgstr "销售模块配置" #. module: base_setup #: help:sale.config.settings,module_plugin_outlook:0 @@ -265,36 +270,39 @@ msgid "" " email into an OpenERP mail message with attachments.\n" " This installs the module plugin_outlook." msgstr "" +"Outlook 插件允许你把 邮件和它附件添加到你选择对象里。 你能选择一个业务伙伴或者线索 对象，并且把选择的邮件存档到一个带附件的 Openerp " +"邮件消息中。\n" +"为此要安装模块plugin_outlook." #. module: base_setup #: view:base.config.settings:0 msgid "Options" -msgstr "" +msgstr "选项" #. module: base_setup #: field:base.config.settings,module_portal:0 msgid "Activate the customer/supplier portal" -msgstr "" +msgstr "开启合作伙伴Portal" #. module: base_setup #: field:base.config.settings,module_share:0 msgid "Allow documents sharing" -msgstr "" +msgstr "允许分享单据" #. module: base_setup #: field:base.config.settings,module_auth_anonymous:0 msgid "Activate the public portal" -msgstr "" +msgstr "启用公共门户" #. module: base_setup #: view:base.config.settings:0 msgid "Configure outgoing email servers" -msgstr "" +msgstr "配置邮箱发件服务器" #. module: base_setup #: view:sale.config.settings:0 msgid "Social Network Integration" -msgstr "" +msgstr "集成社交网络" #. module: base_setup #: view:base.config.settings:0 @@ -306,7 +314,7 @@ msgstr "取消" #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "Apply" -msgstr "" +msgstr "应用" #. module: base_setup #: view:base.setup.terminology:0 @@ -317,12 +325,12 @@ msgstr "指定贵公司所用的术语" #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "or" -msgstr "" +msgstr "or" #. module: base_setup #: view:base.config.settings:0 msgid "Configure your company data" -msgstr "" +msgstr "配置公司信息" #~ msgid "Report Header" #~ msgstr "报表页眉" diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py index 67c6354fd3b..9858a7fe0cc 100644 --- a/addons/base_status/base_stage.py +++ b/addons/base_status/base_stage.py @@ -41,12 +41,10 @@ class base_stage(object): """ if context is None: context = {} - if not context or not context.get('portal'): - return False - user = self.pool.get('res.users').browse(cr, uid, uid, context=context) - if hasattr(user, 'partner_address_id') and user.partner_address_id: - return user.partner_address_id - return user.company_id.partner_id.id + if context.get('portal'): + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + return user.partner_id.id + return False def _get_default_email(self, cr, uid, context=None): """ Gives default email address for current user @@ -54,10 +52,10 @@ class base_stage(object): """ if context is None: context = {} - if not context or not context.get('portal'): - return False - user = self.pool.get('res.users').browse(cr, uid, uid, context=context) - return user.email + if context.get('portal'): + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + return user.email + return False def _get_default_user(self, cr, uid, context=None): """ Gives current user id @@ -65,7 +63,7 @@ class base_stage(object): """ if context is None: context = {} - if not context or not context.get('portal'): + if not context or context.get('portal'): return False return uid diff --git a/addons/base_status/i18n/zh_CN.po b/addons/base_status/i18n/zh_CN.po new file mode 100644 index 00000000000..bfb2e6fcebf --- /dev/null +++ b/addons/base_status/i18n/zh_CN.po @@ -0,0 +1,88 @@ +# 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-11-24 02:52+0000\n" +"PO-Revision-Date: 2012-11-28 07:43+0000\n" +"Last-Translator: ccdos \n" +"Language-Team: Chinese (Simplified) \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" + +#. module: base_status +#: code:addons/base_status/base_state.py:107 +#, python-format +msgid "Error !" +msgstr "错误！" + +#. module: base_status +#: code:addons/base_status/base_stage.py:333 +#: code:addons/base_status/base_state.py:187 +#, python-format +msgid "%s has been opened." +msgstr "%s 已经被 打开." + +#. module: base_status +#: code:addons/base_status/base_stage.py:357 +#: code:addons/base_status/base_state.py:220 +#, python-format +msgid "%s has been renewed." +msgstr "%s 已经被 更新." + +#. module: base_status +#: code:addons/base_status/base_stage.py:215 +#, python-format +msgid "Error!" +msgstr "错误!" + +#. module: base_status +#: code:addons/base_status/base_state.py:107 +#, python-format +msgid "" +"You can not escalate, you are already at the top level regarding your sales-" +"team category." +msgstr "不能上报，你已经在您销售团队类别中的最高级了。" + +#. module: base_status +#: code:addons/base_status/base_stage.py:351 +#: code:addons/base_status/base_state.py:214 +#, python-format +msgid "%s is now pending." +msgstr "%s 现在 待定." + +#. module: base_status +#: code:addons/base_status/base_stage.py:345 +#, python-format +msgid "%s has been cancelled." +msgstr "%s 已经被 取消." + +#. module: base_status +#: code:addons/base_status/base_state.py:208 +#, python-format +msgid "%s has been canceled." +msgstr "%s 已经被 取消." + +#. module: base_status +#: code:addons/base_status/base_stage.py:215 +#, python-format +msgid "" +"You are already at the top level of your sales-team category.\n" +"Therefore you cannot escalate furthermore." +msgstr "" +"你已经在您销售团队类别中的最高级了。\n" +"因此，你不能再上报了。" + +#. module: base_status +#: code:addons/base_status/base_stage.py:339 +#: code:addons/base_status/base_state.py:202 +#, python-format +msgid "%s has been closed." +msgstr "%s 已经被 关闭." diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po index 39aed5e32b3..209639474fc 100644 --- a/addons/base_vat/i18n/tr.po +++ b/addons/base_vat/i18n/tr.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 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 \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 diff --git a/addons/board/controllers.py b/addons/board/controllers.py index 81557f64fa3..3bdebe1ef26 100644 --- a/addons/board/controllers.py +++ b/addons/board/controllers.py @@ -2,7 +2,6 @@ from xml.etree import ElementTree import openerp -from openerp.addons.web import nonliterals from openerp.addons.web.controllers.main import load_actions_from_ir_values class Board(openerp.addons.web.http.Controller): @@ -11,16 +10,8 @@ class Board(openerp.addons.web.http.Controller): @openerp.addons.web.http.jsonrequest def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''): # FIXME move this method to board.board model - to_eval = nonliterals.CompoundContext(context_to_save) - to_eval.session = req.session - ctx = dict((k, v) for k, v in to_eval.evaluate().iteritems() - if not k.startswith('search_default_')) - ctx['dashboard_merge_domains_contexts'] = False # TODO: replace this 6.1 workaround by attribute on - domain = nonliterals.CompoundDomain(domain) - domain.session = req.session - domain = domain.evaluate() - - dashboard_action = load_actions_from_ir_values(req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False) + dashboard_action = load_actions_from_ir_values( + req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False) if dashboard_action: action = dashboard_action[0][2] @@ -36,7 +27,7 @@ class Board(openerp.addons.web.http.Controller): 'name': str(action_id), 'string': name, 'view_mode': view_mode, - 'context': str(ctx), + 'context': str(context_to_save), 'domain': str(domain) }) column.insert(0, new_action) @@ -45,6 +36,6 @@ class Board(openerp.addons.web.http.Controller): 'user_id': req.session._uid, 'ref_id': view_id, 'arch': arch - }, req.session.eval_context(req.context)) + }, req.context) return False diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index eb835c43e22..13a51cc663e 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -375,11 +375,22 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({ var domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []); _.each(data.contexts, context.add, context); _.each(data.domains, domain.add, domain); + + var c = instance.web.pyeval.eval('context', context); + for(var k in c) { + if (c.hasOwnProperty(k) && /^search_default_/.test(k)) { + delete c[k]; + } + } + // TODO: replace this 6.1 workaround by attribute on + c.dashboard_merge_domains_contexts = false; + var d = instance.web.pyeval.eval('domain', domain); + this.rpc('/board/add_to_dashboard', { menu_id: this.$el.find("select").val(), action_id: view_parent.action.id, - context_to_save: context, - domain: domain, + context_to_save: c, + domain: d, view_mode: view_parent.active_view, name: this.$el.find("input").val() }).done(function(r) { diff --git a/addons/contacts/i18n/es.po b/addons/contacts/i18n/es.po index c4f38f1f584..f4b3a345289 100644 --- a/addons/contacts/i18n/es.po +++ b/addons/contacts/i18n/es.po @@ -14,7 +14,7 @@ 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-27 05:24+0000\n" +"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n" "X-Generator: Launchpad (build 16309)\n" #. module: contacts diff --git a/addons/contacts/i18n/hu.po b/addons/contacts/i18n/hu.po new file mode 100644 index 00000000000..eacc9b22406 --- /dev/null +++ b/addons/contacts/i18n/hu.po @@ -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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \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 \n" +"Language-Team: Hungarian \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" + +#. module: contacts +#: model:ir.actions.act_window,help:contacts.action_contacts +msgid "" +"

    \n" +" Click to add a contact in your address book.\n" +"

    \n" +" OpenERP helps you easily track all activities related to\n" +" a customer; discussions, history of business opportunities,\n" +" documents, etc.\n" +"

    \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" diff --git a/addons/contacts/i18n/it.po b/addons/contacts/i18n/it.po new file mode 100644 index 00000000000..e0d4d816737 --- /dev/null +++ b/addons/contacts/i18n/it.po @@ -0,0 +1,46 @@ +# Italian 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-11-24 02:52+0000\n" +"PO-Revision-Date: 2012-11-28 19:52+0000\n" +"Last-Translator: Davide Corio - agilebg.com \n" +"Language-Team: Italian \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" + +#. module: contacts +#: model:ir.actions.act_window,help:contacts.action_contacts +msgid "" +"

    \n" +" Click to add a contact in your address book.\n" +"

    \n" +" OpenERP helps you easily track all activities related to\n" +" a customer; discussions, history of business opportunities,\n" +" documents, etc.\n" +"

    \n" +" " +msgstr "" +"

    \n" +" Premere per creare un contatto in rubrica.\n" +"

    \n" +" OpenERP ti aiuta a tenere traccia delle attività legate\n" +" a clienti, discussioni, storia delle opportunità,\n" +" document, etc.\n" +"\n" +"

    \n" +" " + +#. module: contacts +#: model:ir.actions.act_window,name:contacts.action_contacts +#: model:ir.ui.menu,name:contacts.menu_contacts +msgid "Contacts" +msgstr "Contatti" diff --git a/addons/contacts/i18n/tr.po b/addons/contacts/i18n/tr.po new file mode 100644 index 00000000000..9b68dbf5ddc --- /dev/null +++ b/addons/contacts/i18n/tr.po @@ -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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \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 \n" +"Language-Team: Turkish \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 "" +"

    \n" +" Click to add a contact in your address book.\n" +"

    \n" +" OpenERP helps you easily track all activities related to\n" +" a customer; discussions, history of business opportunities,\n" +" documents, etc.\n" +"

    \n" +" " +msgstr "" +"

    \n" +" Adres defterinizden bir carinin üzerine tıklayın.\n" +"

    \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" +"

    \n" +" " + +#. module: contacts +#: model:ir.actions.act_window,name:contacts.action_contacts +#: model:ir.ui.menu,name:contacts.menu_contacts +msgid "Contacts" +msgstr "Cariler" diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 88b2edcd665..c552b1835f2 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -4,7 +4,7 @@ - Mark unread + CRM Lead: Mark unread True ir.actions.server @@ -22,7 +22,7 @@ - Mark read + CRM Lead: Mark read True ir.actions.server diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 9cb09e71be2..a6e8dbe397a 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -4,7 +4,7 @@ - Mark unread + CRM Phonecall: Mark unread True ir.actions.server @@ -22,7 +22,7 @@ - Mark read + CRM Phonecall: Mark read True ir.actions.server diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 85507a32c0f..8b6217b97e1 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -104,7 +104,7 @@
    @@ -113,9 +113,9 @@ - + - + @@ -130,17 +130,17 @@ - + - +     - + @@ -167,7 +167,7 @@
    - +
    diff --git a/addons/crm_todo/i18n/zh_CN.po b/addons/crm_todo/i18n/zh_CN.po index 68a2aeeccbc..40c9d42e153 100644 --- a/addons/crm_todo/i18n/zh_CN.po +++ b/addons/crm_todo/i18n/zh_CN.po @@ -14,7 +14,7 @@ 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-27 05:24+0000\n" +"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n" "X-Generator: Launchpad (build 16309)\n" #. module: crm_todo diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po index 0880c6e8394..53f4da9eaad 100644 --- a/addons/decimal_precision/i18n/it.po +++ b/addons/decimal_precision/i18n/it.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2011-01-12 19:11+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-11-28 19:56+0000\n" +"Last-Translator: Davide Corio - agilebg.com \n" "Language-Team: Italian \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\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 "" +"Errore! La precisione decimale di 'Contabilità' non può essere più grande " +"del fattore di arrotondamento della valuta principale dell'azienda" #. module: decimal_precision #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form diff --git a/addons/decimal_precision/i18n/nl_BE.po b/addons/decimal_precision/i18n/nl_BE.po index 95078305c13..1da382b14d0 100644 --- a/addons/decimal_precision/i18n/nl_BE.po +++ b/addons/decimal_precision/i18n/nl_BE.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \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 \n" +"PO-Revision-Date: 2012-11-27 13:41+0000\n" +"Last-Translator: Els Van Vossel (Agaplan) \n" "Language-Team: Dutch (Belgium) \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 diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po index c028b40ab6e..2920c8bd9ce 100644 --- a/addons/delivery/i18n/zh_CN.po +++ b/addons/delivery/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n" +"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n" "X-Generator: Launchpad (build 16309)\n" #. module: delivery diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po index 86a4e7ea912..0c7c6a448d5 100644 --- a/addons/document_webdav/i18n/zh_CN.po +++ b/addons/document_webdav/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-02-10 07:02+0000\n" -"Last-Translator: 开阖软件 Jeff Wang \n" +"PO-Revision-Date: 2012-11-27 16:44+0000\n" +"Last-Translator: ccdos \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 diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py index 10bf214d921..14cd97b3e62 100644 --- a/addons/edi/controllers/main.py +++ b/addons/edi/controllers/main.py @@ -23,10 +23,9 @@ class EDI(openerpweb.Controller): @openerpweb.jsonrequest def import_edi_url(self, req, url): - context = req.session.eval_context(req.context) result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url) if len(result) == 1: - return {"action": webmain.clean_action(req, result[0][2], context)} + return {"action": webmain.clean_action(req, result[0][2])} return True # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/edi/i18n/tr.po b/addons/edi/i18n/tr.po index aea467b0a0f..26e12724682 100644 --- a/addons/edi/i18n/tr.po +++ b/addons/edi/i18n/tr.po @@ -8,28 +8,28 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \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 \n" "Language-Team: Turkish \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" diff --git a/addons/edi/i18n/zh_CN.po b/addons/edi/i18n/zh_CN.po index 5f9d159b7b3..4a71e45fa8e 100644 --- a/addons/edi/i18n/zh_CN.po +++ b/addons/edi/i18n/zh_CN.po @@ -8,28 +8,28 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-02-17 03:29+0000\n" -"Last-Translator: 开阖软件 Jeff Wang \n" +"PO-Revision-Date: 2012-11-28 07:46+0000\n" +"Last-Translator: ccdos \n" "Language-Team: Chinese (Simplified) \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: edi #. openerp-web #: code:addons/edi/static/src/js/edi.js:67 #, python-format msgid "Reason:" -msgstr "" +msgstr "原因：" #. module: edi #. openerp-web #: code:addons/edi/static/src/js/edi.js:60 #, python-format msgid "The document has been successfully imported!" -msgstr "" +msgstr "这个单据已经被成功导入！" #. module: edi #: sql_constraint:res.company:0 @@ -46,7 +46,7 @@ msgstr "错误，您不能创建循环引用的会员用户" #: code:addons/edi/static/src/js/edi.js:65 #, python-format msgid "Sorry, the document could not be imported." -msgstr "" +msgstr "对不起，这个单据不能导入！" #. module: edi #: constraint:res.company:0 @@ -61,7 +61,7 @@ msgstr "公司" #. module: edi #: constraint:res.partner:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "错误：无效的(EAN)条码" #. module: edi #: sql_constraint:res.currency:0 @@ -78,13 +78,13 @@ msgstr "货币" #: code:addons/edi/static/src/js/edi.js:71 #, python-format msgid "Document Import Notification" -msgstr "" +msgstr "单据导入通知" #. module: edi #: code:addons/edi/models/edi.py:130 #, python-format msgid "Missing application." -msgstr "" +msgstr "找不到的应用。" #. module: edi #: code:addons/edi/models/edi.py:131 @@ -111,12 +111,12 @@ msgstr "业务伙伴" msgid "" "Error! You cannot define a rounding factor for the company's main currency " "that is smaller than the decimal precision of 'Account'." -msgstr "" +msgstr "错误！公司本位币的舍入系数不能定义得小于”科目“的小数位数" #. module: edi #: model:ir.model,name:edi.model_edi_edi msgid "EDI Subsystem" -msgstr "" +msgstr "EDI 子系统" #~ msgid "Partner Addresses" #~ msgstr "业务伙伴地址" diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 14895f2a1a7..a9a60570735 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -59,7 +59,7 @@ - Mark unread + Event: Mark unread True ir.actions.server @@ -77,7 +77,7 @@ - Mark read + Event: Mark read True ir.actions.server @@ -107,7 +107,7 @@ -
    +
    @@ -204,7 +204,7 @@
    - +
    @@ -377,7 +377,7 @@ - Mark unread + Event registration : Mark unread True ir.actions.server @@ -395,7 +395,7 @@ - Mark read + Event registration : Mark read True ir.actions.server @@ -538,7 +538,7 @@ tree,form,calendar,graph {} - view_ + \n" +"PO-Revision-Date: 2012-11-29 01:57+0000\n" +"Last-Translator: mrshelly \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-29 05:13+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: event #: view:event.event:0 #: view:report.event.registration:0 msgid "My Events" -msgstr "我的事件" +msgstr "我的活动" #. module: event #: field:event.registration,nb_register:0 msgid "Number of Participants" -msgstr "" +msgstr "参与者数目" #. module: event #: field:event.event,register_attended:0 msgid "# of Participations" -msgstr "" +msgstr "参与编号#" #. module: event #: field:event.event,main_speaker_id:0 @@ -61,12 +61,12 @@ msgstr "" #: code:addons/event/event.py:305 #, python-format msgid "Event has been cancelled." -msgstr "" +msgstr "活动 已经被取消." #. module: event #: field:event.registration,date_open:0 msgid "Registration Date" -msgstr "登记记录日期" +msgstr "活动日期" #. module: event #: help:event.registration,origin:0 @@ -76,7 +76,7 @@ msgstr "" #. module: event #: field:event.event,type:0 msgid "Type of Event" -msgstr "" +msgstr "活动类型" #. module: event #: model:event.event,name:event.event_0 @@ -88,17 +88,17 @@ msgstr "Bon Jovi音乐会" #: selection:event.registration,state:0 #: selection:report.event.registration,registration_state:0 msgid "Attended" -msgstr "" +msgstr "参加" #. module: event #: selection:report.event.registration,month:0 msgid "March" -msgstr "3月" +msgstr "三月" #. module: event #: view:event.registration:0 msgid "Send Email" -msgstr "" +msgstr "发送邮件" #. module: event #: field:event.event,company_id:0 @@ -112,29 +112,29 @@ msgstr "公司" #: field:event.event,email_confirmation_id:0 #: field:event.type,default_email_event:0 msgid "Event Confirmation Email" -msgstr "" +msgstr "活动确认邮件" #. module: event #: field:event.type,default_registration_max:0 msgid "Default Maximum Registration" -msgstr "" +msgstr "默认最多的注册者" #. module: event #: help:event.event,message_unread:0 #: help:event.registration,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "如果要求你关注新消息，勾选此项" #. module: event #: field:event.event,register_avail:0 msgid "Available Registrations" -msgstr "" +msgstr "可注册项目" #. module: event #: view:event.registration:0 #: model:ir.model,name:event.model_event_registration msgid "Event Registration" -msgstr "事件登记记录" +msgstr "活动登记记录" #. module: event #: model:ir.module.category,description:event.module_category_event_management @@ -149,7 +149,7 @@ msgstr "" #. module: event #: view:report.event.registration:0 msgid "Event on Registration" -msgstr "登记记录的事件" +msgstr "登记记录的活动" #. module: event #: view:event.event:0 @@ -167,12 +167,12 @@ msgstr "活动开始日期" #: model:ir.ui.menu,name:event.menu_report_event_registration #: view:report.event.registration:0 msgid "Events Analysis" -msgstr "事件分析" +msgstr "活动分析" #. module: event #: help:event.type,default_registration_max:0 msgid "It will select this default maximum value when you choose this event" -msgstr "" +msgstr "当你选择这个活动，将选择默认最大值" #. module: event #: view:report.event.registration:0 @@ -207,13 +207,13 @@ msgstr "错误！" #. module: event #: view:event.event:0 msgid "Confirm Event" -msgstr "确认事件" +msgstr "确认活动" #. module: event #: view:board.board:0 #: model:ir.actions.act_window,name:event.act_event_view msgid "Next Events" -msgstr "下一个事件" +msgstr "下一个活动" #. module: event #: selection:event.event,state:0 @@ -236,23 +236,23 @@ msgstr "Verdi歌剧" #. module: event #: view:report.event.registration:0 msgid "Display" -msgstr "" +msgstr "显示" #. module: event #: view:report.event.registration:0 #: field:report.event.registration,registration_state:0 msgid "Registration State" -msgstr "" +msgstr "等级状态" #. module: event #: view:event.event:0 msgid "tickets" -msgstr "" +msgstr "门票" #. module: event #: view:res.partner:0 msgid "False" -msgstr "" +msgstr "False" #. module: event #: model:mail.message.subtype,name:event.mt_event_registration @@ -262,7 +262,7 @@ msgstr "" #. module: event #: field:event.registration,event_end_date:0 msgid "Event End Date" -msgstr "" +msgstr "活动结束日期" #. module: event #: help:event.event,message_summary:0 @@ -270,7 +270,7 @@ msgstr "" 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: event #: view:report.event.registration:0 @@ -300,12 +300,12 @@ msgstr "业务伙伴" #. module: event #: help:event.type,default_registration_min:0 msgid "It will select this default minimum value when you choose this event" -msgstr "" +msgstr "当你选择这个活动，将选择默认最小值" #. module: event #: model:ir.model,name:event.model_event_type msgid " Event Type " -msgstr " 事件类型 " +msgstr " 活动类型 " #. module: event #: view:event.registration:0 @@ -315,7 +315,7 @@ msgstr " 事件类型 " #: field:report.event.registration,event_id:0 #: view:res.partner:0 msgid "Event" -msgstr "事件" +msgstr "活动" #. module: event #: view:event.event:0 @@ -346,14 +346,14 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Register with this event" -msgstr "" +msgstr "注册这次活动" #. module: event #: help:event.type,default_email_registration:0 msgid "" "It will select this default confirmation registration mail value when you " "choose this event" -msgstr "" +msgstr "当你选择这个活动，将选择确认登记邮件值" #. module: event #: view:event.event:0 @@ -421,7 +421,7 @@ msgstr "创建日期" #: view:report.event.registration:0 #: field:report.event.registration,user_id:0 msgid "Event Responsible" -msgstr "" +msgstr "活动负责人" #. module: event #: view:event.event:0 @@ -453,7 +453,7 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Event Organization" -msgstr "事件结构" +msgstr "活动组织机构" #. module: event #: view:event.confirm:0 @@ -463,7 +463,7 @@ msgstr "总是确认" #. module: event #: field:report.event.registration,nbevent:0 msgid "Number Of Events" -msgstr "事件数" +msgstr "活动数量" #. module: event #: help:event.event,main_speaker_id:0 @@ -479,7 +479,7 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Cancel Event" -msgstr "取消事件" +msgstr "取消活动" #. module: event #: code:addons/event/event.py:398 @@ -491,12 +491,12 @@ msgstr "" #: model:ir.actions.act_window,name:event.act_event_reg #: view:report.event.registration:0 msgid "Events Filling Status" -msgstr "事件填充状态" +msgstr "活动填充状态" #. module: event #: view:event.event:0 msgid "Event Category" -msgstr "" +msgstr "活动分类" #. module: event #: field:event.event,register_prospect:0 @@ -506,13 +506,13 @@ msgstr "不确认登记记录" #. module: event #: model:ir.actions.client,name:event.action_client_event_menu msgid "Open Event Menu" -msgstr "" +msgstr "打开活动菜单" #. module: event #: view:report.event.registration:0 #: field:report.event.registration,event_state:0 msgid "Event State" -msgstr "" +msgstr "活动状态" #. module: event #: field:event.registration,log_ids:0 @@ -559,7 +559,7 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Finish Event" -msgstr "" +msgstr "结束活动" #. module: event #: model:ir.actions.server,name:event.actions_server_event_event_unread @@ -575,7 +575,7 @@ msgstr "未确认状态的报名者" #. module: event #: view:event.event:0 msgid "Event Description" -msgstr "" +msgstr "活动描述" #. module: event #: field:event.event,date_begin:0 @@ -591,7 +591,7 @@ msgstr "" #: code:addons/event/event.py:315 #, python-format msgid "Event has been done." -msgstr "" +msgstr "活动已经 完成" #. module: event #: help:res.partner,speaker:0 @@ -627,6 +627,12 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" 单击添加一个新的活动\n" +"

    \n" +" OpenERP帮你排程并有效地组织活动：跟踪订阅和参与、自动确认邮件、卖票等等。\n" +"

    \n" +" " #. module: event #: help:event.event,register_max:0 @@ -634,7 +640,7 @@ msgid "" "You can for each event define a maximum registration level. If you have too " "much registrations you are not able to confirm your event. (put 0 to ignore " "this rule )" -msgstr "" +msgstr "你能为每个活动定义最大的登记水平。如果你有太多的登记，你不能确认你的活动。（输入0忽略这个规则）" #. module: event #: code:addons/event/event.py:462 @@ -649,14 +655,14 @@ msgid "" "The total of confirmed registration for the event '%s' does not meet the " "expected minimum/maximum. Please reconsider those limits before going " "further." -msgstr "" +msgstr "活动 '%s' 的确认登记合计没有遇到最小或最大值。进一步深入前请重新考虑这些限制。" #. module: event #: help:event.event,email_confirmation_id:0 msgid "" "If you set an email template, each participant will receive this email " "announcing the confirmation of the event." -msgstr "" +msgstr "如果你设定了邮件模板，每个参与者将收到邮件公告确认次次活动。" #. module: event #: view:board.board:0 @@ -696,7 +702,7 @@ msgstr "" #: model:ir.ui.menu,name:event.menu_reporting_events #: view:res.partner:0 msgid "Events" -msgstr "事件" +msgstr "活动" #. module: event #: view:event.event:0 @@ -743,7 +749,7 @@ msgid "" "The email address of the organizer which is put in the 'Reply-To' of all " "emails sent automatically at event or registrations confirmation. You can " "also put your email address of your mail gateway if you use one." -msgstr "" +msgstr "在自动发送的活动或者登记确认的email中，组织者的email地址放在'Reply-To' 。你也能放你用的邮件网关的Email地址" #. module: event #: help:event.event,message_ids:0 @@ -787,7 +793,7 @@ msgstr "" msgid "" "Warning: This Event has not reached its Minimum Registration Limit. Are you " "sure you want to confirm it?" -msgstr "警告：这事件没有达到最低登记记录的规定，你肯定要确认它？" +msgstr "警告：这活动没有达到最低登记记录的规定，你肯定要确认它？" #. module: event #: view:event.event:0 @@ -803,7 +809,7 @@ msgstr "我的登记记录" #: code:addons/event/event.py:310 #, python-format msgid "Event has been set to draft." -msgstr "" +msgstr "活动被设置为“草稿”状态" #. module: event #: view:report.event.registration:0 @@ -877,7 +883,7 @@ msgstr "地址" #: model:ir.actions.act_window,name:event.action_event_type #: model:ir.ui.menu,name:event.menu_event_type msgid "Types of Events" -msgstr "事件类型" +msgstr "活动类型" #. module: event #: help:event.event,email_registration_id:0 @@ -889,7 +895,7 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Attended the Event" -msgstr "" +msgstr "参加活动" #. module: event #: constraint:event.event:0 @@ -900,7 +906,7 @@ msgstr "错误！结束日期不能在开始日期前。" #: code:addons/event/event.py:400 #, python-format msgid "You must wait for the starting day of the event to do this action." -msgstr "" +msgstr "你必须等待活动开始才能做这些动作" #. module: event #: field:event.event,user_id:0 @@ -938,7 +944,7 @@ msgstr "" #: model:email.template,subject:event.confirmation_event #: model:email.template,subject:event.confirmation_registration msgid "Your registration at ${object.event_id.name}" -msgstr "" +msgstr "你的登记在${object.event_id.name}" #. module: event #: view:event.registration:0 @@ -977,13 +983,13 @@ msgstr "关注者" #. module: event #: view:event.event:0 msgid "Upcoming events from today" -msgstr "" +msgstr "今天将开始的活动" #. module: event #: code:addons/event/event.py:300 #, python-format msgid "Event has been created." -msgstr "" +msgstr "活动已经被'创建'" #. module: event #: model:event.event,name:event.event_2 @@ -1014,12 +1020,12 @@ msgstr "" #: code:addons/event/event.py:320 #, python-format msgid "Event has been confirmed." -msgstr "" +msgstr "活动已经被'确认'" #. module: event #: view:res.partner:0 msgid "Events Registration" -msgstr "事件登记记录" +msgstr "活动登记记录" #. module: event #: view:event.event:0 @@ -1115,7 +1121,7 @@ msgstr "已确认状态的活动" #: view:report.event.registration:0 #: field:report.event.registration,event_type:0 msgid "Event Type" -msgstr "事件类型" +msgstr "活动类型" #. module: event #: field:event.event,message_summary:0 @@ -1148,7 +1154,7 @@ msgstr "错误，您不能创建循环引用的会员用户" #: field:event.registration,event_begin_date:0 #: field:report.event.registration,event_date:0 msgid "Event Start Date" -msgstr "事件开始日期" +msgstr "活动开始日期" #. module: event #: view:report.event.registration:0 @@ -1203,7 +1209,7 @@ msgstr "错误:无效EAN编码" #: model:ir.actions.act_window,name:event.action_event_confirm #: model:ir.model,name:event.model_event_confirm msgid "Event Confirmation" -msgstr "事件确认" +msgstr "活动确认" #. module: event #: view:report.event.registration:0 diff --git a/addons/event_sale/i18n/zh_CN.po b/addons/event_sale/i18n/zh_CN.po new file mode 100644 index 00000000000..84a135bab6d --- /dev/null +++ b/addons/event_sale/i18n/zh_CN.po @@ -0,0 +1,101 @@ +# 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-11-24 02:52+0000\n" +"PO-Revision-Date: 2012-11-29 01:53+0000\n" +"Last-Translator: mrshelly \n" +"Language-Team: Chinese (Simplified) \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" + +#. module: event_sale +#: model:ir.model,name:event_sale.model_product_product +msgid "Product" +msgstr "产品" + +#. module: event_sale +#: help:product.product,event_ok:0 +msgid "" +"Determine if a product needs to create automatically an event registration " +"at the confirmation of a sale order line." +msgstr "销售订单确认时自动创建产品的相关活动." + +#. module: event_sale +#: help:sale.order.line,event_id:0 +msgid "" +"Choose an event and it will automatically create a registration for this " +"event." +msgstr "选择活动" + +#. module: event_sale +#: sql_constraint:product.product:0 +msgid "Error ! Ending Date cannot be set before Beginning Date." +msgstr "错误!结束日期不能早于开始日期。" + +#. module: event_sale +#: model:event.event,name:event_sale.event_technical_training +msgid "Technical training in Grand-Rosiere" +msgstr "" + +#. module: event_sale +#: help:product.product,event_type_id:0 +msgid "" +"Filter the list of event on this category only, in the sale order lines" +msgstr "仅在此类中过滤." + +#. module: event_sale +#: constraint:product.product:0 +msgid "" +"You provided an invalid \"EAN13 Barcode\" reference. You may use the " +"\"Internal Reference\" field instead." +msgstr "你提供了一个错误的 \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。" + +#. module: event_sale +#: code:addons/event_sale/event_sale.py:88 +#, python-format +msgid "The registration %s has been created from the Sale Order %s." +msgstr "" + +#. module: event_sale +#: field:sale.order.line,event_ok:0 +msgid "event_ok" +msgstr "" + +#. module: event_sale +#: field:product.product,event_ok:0 +msgid "Event Subscription" +msgstr "订阅活动" + +#. module: event_sale +#: field:product.product,event_type_id:0 +msgid "Type of Event" +msgstr "活动类型" + +#. module: event_sale +#: field:sale.order.line,event_type_id:0 +msgid "Event Type" +msgstr "活动类型" + +#. module: event_sale +#: model:product.template,name:event_sale.event_product_product_template +msgid "Technical Training" +msgstr "" + +#. module: event_sale +#: field:sale.order.line,event_id:0 +msgid "Event" +msgstr "活动" + +#. module: event_sale +#: model:ir.model,name:event_sale.model_sale_order_line +msgid "Sales Order Line" +msgstr "销售订单明细" diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po index 1043991c9a2..4ccea4d621e 100644 --- a/addons/fetchmail/i18n/hu.po +++ b/addons/fetchmail/i18n/hu.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 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 \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\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 diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po index 9a3c37cedb2..9a2ff824da7 100644 --- a/addons/fetchmail/i18n/zh_CN.po +++ b/addons/fetchmail/i18n/zh_CN.po @@ -14,7 +14,7 @@ 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-27 05:24+0000\n" +"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n" "X-Generator: Launchpad (build 16309)\n" #. module: fetchmail diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 8c7ceaf8d2d..416ca191a6e 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -318,12 +318,7 @@ -
    - -
    - -
    - +
    diff --git a/addons/google_base_account/i18n/zh_CN.po b/addons/google_base_account/i18n/zh_CN.po index 40b08fb64c9..391d9f10409 100644 --- a/addons/google_base_account/i18n/zh_CN.po +++ b/addons/google_base_account/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-02-16 12:46+0000\n" -"Last-Translator: 开阖软件 Jeff Wang \n" +"PO-Revision-Date: 2012-11-28 15:28+0000\n" +"Last-Translator: ccdos \n" "Language-Team: Chinese (Simplified) \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-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" #. module: google_base_account #: field:res.users,gmail_user:0 @@ -25,7 +25,7 @@ msgstr "用户名：" #. module: google_base_account #: view:res.users:0 msgid "Synchronization" -msgstr "" +msgstr "同步" #. module: google_base_account #: model:ir.actions.act_window,name:google_base_account.act_google_login_form @@ -41,7 +41,7 @@ msgstr "导入Google联系人失败！" #. module: google_base_account #: model:ir.model,name:google_base_account.model_res_users msgid "Users" -msgstr "" +msgstr "用户" #. module: google_base_account #: constraint:res.users:0 @@ -56,7 +56,7 @@ msgstr "两个用户不能使用相同的用户名！" #. module: google_base_account #: sql_constraint:res.users:0 msgid "OAuth UID must be unique per provider" -msgstr "" +msgstr "OAuth UID必须是每个提供者（ provider ）唯一的" #. module: google_base_account #: view:google.login:0 @@ -71,13 +71,13 @@ msgstr "Google密码" #. module: google_base_account #: view:google.login:0 msgid "or" -msgstr "" +msgstr "or" #. module: google_base_account #: code:addons/google_base_account/wizard/google_login.py:77 #, python-format msgid "Error!" -msgstr "" +msgstr "错误!" #. module: google_base_account #: view:res.users:0 @@ -87,13 +87,13 @@ msgstr "Google 帐户" #. module: google_base_account #: constraint:res.users:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "错误：无效的(EAN)条码" #. module: google_base_account #: code:addons/google_base_account/wizard/google_login.py:77 #, python-format msgid "Authentication failed. Check the user and password." -msgstr "" +msgstr "身份授权失败。检查用户名和密码。" #. module: google_base_account #: code:addons/google_base_account/wizard/google_login.py:29 @@ -113,7 +113,7 @@ msgstr "Google联系人" #. module: google_base_account #: view:google.login:0 msgid "Cancel" -msgstr "" +msgstr "取消" #. module: google_base_account #: field:google.login,user:0 diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index bcee15e02e8..7d27fe456b8 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -227,6 +227,7 @@ + diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po index efee5a9bb02..7131a0b306b 100644 --- a/addons/hr/i18n/hr.po +++ b/addons/hr/i18n/hr.po @@ -7,13 +7,13 @@ 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-26 20:53+0000\n" +"PO-Revision-Date: 2012-11-27 21:53+0000\n" "Last-Translator: Lovro Lazarin \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-27 05:24+0000\n" +"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n" "X-Generator: Launchpad (build 16309)\n" "Language: hr\n" @@ -389,7 +389,7 @@ msgstr "" #. module: hr #: view:hr.employee:0 msgid "Tel:" -msgstr "" +msgstr "Tel:" #. module: hr #: selection:hr.employee,marital:0 @@ -404,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 @@ -440,6 +440,23 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" " +"Kliknite da bi definirali novo radno mjesto.\n" +"

    \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" +"

    \n" +" " +"Možete dodati anketu za radno mjesto, koja će se koristiti za ispitivanje \n" +" " +"kandidata u procesu zapošljavanja.\n" +"

    \n" +" " #. module: hr #: selection:hr.employee,gender:0 @@ -456,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 @@ -482,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 @@ -497,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 @@ -507,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 @@ -542,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 @@ -569,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 @@ -584,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 @@ -599,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 @@ -619,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 @@ -644,21 +661,33 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" " +"Kliknite da bi dodali novog radnika.\n" +"

    \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" +"

    \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 @@ -673,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 @@ -698,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 @@ -713,17 +742,30 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" " +"Kliknite da bi kreirali odjel.\n" +" " +"

    \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" +"

    \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 @@ -738,6 +780,19 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" " +"Kliknite da bi definirali novi odjel.\n" +"

    \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" +"

    \n" +" " #. module: hr #: view:hr.employee:0 @@ -762,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 @@ -788,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 @@ -819,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 @@ -839,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 @@ -892,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 @@ -923,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 @@ -936,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 @@ -966,6 +1025,33 @@ msgid "" "
    \n" " " msgstr "" +"
    \n" +" " +"

    \n" +" " +" Ploča ljudskih resursa je prazna.\n" +" " +"

    \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 'Dodaj na " +"ploču' u proširenim\n" +" " +" opcijama pretraživanja.\n" +" " +"

    \n" +" " +" Možete filtrirati i grupirati podatke prije nego ih " +"ubacite u ploču koristeći\n" +" " +" opcije za pretraživanje.\n" +" " +"

    \n" +" " +"
    \n" +" " #. module: hr #: view:hr.employee:0 @@ -981,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 @@ -998,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 @@ -1013,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 !" diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po index 939270dbaf6..1d55acccbac 100644 --- a/addons/hr/i18n/zh_CN.po +++ b/addons/hr/i18n/zh_CN.po @@ -7,14 +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:51+0000\n" -"PO-Revision-Date: 2012-11-27 04:57+0000\n" +"PO-Revision-Date: 2012-11-28 16:54+0000\n" "Last-Translator: ccdos \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-27 05:24+0000\n" -"X-Generator: Launchpad (build 16309)\n" +"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n" +"X-Generator: Launchpad (build 16319)\n" + +#. module: hr +#: constraint:hr.employee:0 +msgid "Error! You cannot create recursive hierarchy of Employee(s)." +msgstr "错误！，你不能创建循环的员工等级" #. module: hr #: model:process.node,name:hr.process_node_openerpuser0 @@ -39,7 +44,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 @@ -148,7 +153,7 @@ 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 @@ -454,11 +459,6 @@ msgstr "" msgid "This installs the module hr_evaluation." msgstr "为此要安装模块 hr_evaluation." -#. module: hr -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "错误！，你不能创建递归的员工层次" - #. module: hr #: help:hr.config.settings,module_hr_attendance:0 msgid "This installs the module hr_attendance." @@ -575,7 +575,7 @@ msgstr "消息和通信历史" #. module: hr #: field:hr.employee,ssnid:0 msgid "SSN No" -msgstr "员工号" +msgstr "社会保险号SSN" #. module: hr #: field:hr.job,message_is_follower:0 @@ -660,7 +660,7 @@ msgstr "国籍和其他信息" #. module: hr #: constraint:hr.department:0 msgid "Error! You cannot create recursive departments." -msgstr "错误！你不能创建递归的部门" +msgstr "错误！你不能创建循环的部门" #. module: hr #: sql_constraint:res.users:0 @@ -715,6 +715,14 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" 单击创建部门.\n" +"

    \n" +" OpenERP 的部门结构 用来管理所有跟部门员工相关\n" +" 的单据：费用、计工单、请假、假期和招聘等等。\n" +" \n" +"

    \n" +" " #. module: hr #: help:hr.config.settings,module_hr_timesheet:0 @@ -740,6 +748,14 @@ msgid "" "

    \n" " " msgstr "" +"

    \n" +" 单击创建部门.\n" +"

    \n" +" OpenERP 的部门结构 用来管理所有跟部门员工相关\n" +" 的单据：费用、计工单、请假、假期和招聘等等。\n" +" \n" +"

    \n" +" " #. module: hr #: view:hr.employee:0 @@ -937,7 +953,7 @@ msgstr "预计员工数合计" 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 @@ -968,6 +984,18 @@ msgid "" " \n" " " msgstr "" +"
    \n" +"

    \n" +" 人力资源的仪表板是空的.\n" +"

    \n" +" 要增加第一个报表到仪表板。\n" +" 进入任意菜单，切换为列表视图或者图形视图，\n" +" 然后在扩展搜索选项里点击“添加到仪表板”\n" +"

    \n" +" 在插入到仪表板之前，你能过滤和分组这些数据.\n" +"

    \n" +"
    \n" +" " #. module: hr #: view:hr.employee:0 diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po index 5f26a837eef..136facd67d6 100644 --- a/addons/hr_contract/i18n/zh_CN.po +++ b/addons/hr_contract/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n" +"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n" "X-Generator: Launchpad (build 16309)\n" #. module: hr_contract diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index e0978847acb..de0a9714763 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -305,11 +305,9 @@ 'default_subject': 'Reminder to fill up Survey' }"/> - + -