[MERGE] Merged lp:openobject-addons/7.0
bzr revid: bde@tinyerp.com-20130904061852-ybzve9dslyqcrbnm bzr revid: psa@tinyerp.com-20130911095650-s8yjb2zt1gxygbr6
This commit is contained in:
commit
9ffd1e1346
|
@ -1272,6 +1272,10 @@ class account_move(osv.osv):
|
|||
return [('id', 'in', tuple(ids))]
|
||||
return [('id', '=', '0')]
|
||||
|
||||
def _get_move_from_lines(self, cr, uid, ids, context=None):
|
||||
line_obj = self.pool.get('account.move.line')
|
||||
return [line.move_id.id for line in line_obj.browse(cr, uid, ids, context=context)]
|
||||
|
||||
_columns = {
|
||||
'name': fields.char('Number', size=64, required=True),
|
||||
'ref': fields.char('Reference', size=64),
|
||||
|
@ -1281,7 +1285,10 @@ class account_move(osv.osv):
|
|||
help='All manually created new journal entries are usually in the status \'Unposted\', but you can set the option to skip that status on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' status.'),
|
||||
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
|
||||
'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
|
||||
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
|
||||
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store={
|
||||
_name: (lambda self, cr,uid,ids,c: ids, ['line_id'], 10),
|
||||
'account.move.line': (_get_move_from_lines, ['partner_id'],10)
|
||||
}),
|
||||
'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
|
||||
'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
|
||||
'narration':fields.text('Internal Note'),
|
||||
|
@ -1647,9 +1654,11 @@ class account_move(osv.osv):
|
|||
else:
|
||||
# We can't validate it (it's unbalanced)
|
||||
# Setting the lines as draft
|
||||
obj_move_line.write(cr, uid, line_ids, {
|
||||
'state': 'draft'
|
||||
}, context, check=False)
|
||||
not_draft_line_ids = list(set(line_ids) - set(line_draft_ids))
|
||||
if not_draft_line_ids:
|
||||
obj_move_line.write(cr, uid, not_draft_line_ids, {
|
||||
'state': 'draft'
|
||||
}, context, check=False)
|
||||
# Create analytic lines for the valid moves
|
||||
for record in valid_moves:
|
||||
obj_move_line.create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
|
||||
|
|
|
@ -1407,6 +1407,7 @@ class account_invoice_line(osv.osv):
|
|||
|
||||
_name = "account.invoice.line"
|
||||
_description = "Invoice Line"
|
||||
_order = "invoice_id,sequence,id"
|
||||
_columns = {
|
||||
'name': fields.text('Description', required=True),
|
||||
'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."),
|
||||
|
@ -1443,6 +1444,7 @@ class account_invoice_line(osv.osv):
|
|||
'discount': 0.0,
|
||||
'price_unit': _price_unit_default,
|
||||
'account_id': _default_account_id,
|
||||
'sequence': 10,
|
||||
}
|
||||
|
||||
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
|
||||
|
|
|
@ -191,6 +191,7 @@
|
|||
<page string="Invoice">
|
||||
<field context="{'partner_id': partner_id, 'price_type': context.get('price_type') or False, 'type': type}" name="invoice_line">
|
||||
<tree string="Invoice lines" editable="bottom">
|
||||
<field name="sequence" widget="handle" />
|
||||
<field name="product_id"
|
||||
on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
|
||||
<field name="name"/>
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-05 15:41+0000\n"
|
||||
"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
|
||||
"Language-Team: Danish <da@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:39+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-06 06:07+0000\n"
|
||||
"X-Generator: Launchpad (build 16760)\n"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||
|
@ -38,7 +38,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: view:res.partner:0
|
||||
msgid "the parent company"
|
||||
msgstr ""
|
||||
msgstr "Moderselskab"
|
||||
|
||||
#. module: account
|
||||
#: view:account.move.reconcile:0
|
||||
|
@ -55,7 +55,7 @@ msgstr "Konto statistikker"
|
|||
#. module: account
|
||||
#: view:account.invoice:0
|
||||
msgid "Proforma/Open/Paid Invoices"
|
||||
msgstr ""
|
||||
msgstr "Proforma/Åbne/Betalte faktura"
|
||||
|
||||
#. module: account
|
||||
#: field:report.invoice.created,residual:0
|
||||
|
@ -84,7 +84,7 @@ msgstr "Importér fra faktura eller betaling"
|
|||
#: code:addons/account/account_move_line.py:1210
|
||||
#, python-format
|
||||
msgid "Bad Account!"
|
||||
msgstr ""
|
||||
msgstr "Forkert konto!"
|
||||
|
||||
#. module: account
|
||||
#: view:account.move:0
|
||||
|
@ -98,6 +98,8 @@ msgid ""
|
|||
"Error!\n"
|
||||
"You cannot create recursive account templates."
|
||||
msgstr ""
|
||||
"Fejl!\n"
|
||||
"Du kan ikke oprette rekursiv konto skabelon."
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
@ -128,6 +130,8 @@ msgid ""
|
|||
"If the active field is set to False, it will allow you to hide the payment "
|
||||
"term without removing it."
|
||||
msgstr ""
|
||||
"Hvis det aktive felt sættes til falsk, kan du skjule betalings betingelse "
|
||||
"uden at slette den."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account.py:641
|
||||
|
@ -156,7 +160,7 @@ msgstr "Advarsel!"
|
|||
#: code:addons/account/account.py:3197
|
||||
#, python-format
|
||||
msgid "Miscellaneous Journal"
|
||||
msgstr ""
|
||||
msgstr "Diverse journal"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
|
||||
|
@ -184,21 +188,30 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Klik for at oprette en bogførings periode.\n"
|
||||
" </p><p>\n"
|
||||
" En bogførings periode er typisk en måned eller et kvartal. "
|
||||
"Den\n"
|
||||
" defineres normalt svarende til samme længde som en "
|
||||
"momsafregnings periode.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
|
||||
msgid "Invoices Created Within Past 15 Days"
|
||||
msgstr ""
|
||||
msgstr "Fakturaer oprettet inden for de sidste 15 dage"
|
||||
|
||||
#. module: account
|
||||
#: field:accounting.report,label_filter:0
|
||||
msgid "Column Label"
|
||||
msgstr ""
|
||||
msgstr "Kolonne navn"
|
||||
|
||||
#. module: account
|
||||
#: help:account.config.settings,code_digits:0
|
||||
msgid "No. of digits to use for account code"
|
||||
msgstr ""
|
||||
msgstr "Antal cifre som bruges til konto kode"
|
||||
|
||||
#. module: account
|
||||
#: help:account.analytic.journal,type:0
|
||||
|
@ -220,7 +233,7 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
|
||||
#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
|
||||
msgid "Tax Templates"
|
||||
msgstr ""
|
||||
msgstr "Moms skabelon"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_move_line_reconcile_select
|
||||
|
@ -240,12 +253,12 @@ msgstr "Belgiske rapporter"
|
|||
#. module: account
|
||||
#: model:mail.message.subtype,name:account.mt_invoice_validated
|
||||
msgid "Validated"
|
||||
msgstr ""
|
||||
msgstr "Valideret"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_income_view1
|
||||
msgid "Income View"
|
||||
msgstr ""
|
||||
msgstr "Indtægt visning"
|
||||
|
||||
#. module: account
|
||||
#: help:account.account,user_type:0
|
||||
|
@ -258,7 +271,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: field:account.config.settings,sale_refund_sequence_next:0
|
||||
msgid "Next credit note number"
|
||||
msgstr ""
|
||||
msgstr "Næste kredit nota nummer"
|
||||
|
||||
#. module: account
|
||||
#: help:account.config.settings,module_account_voucher:0
|
||||
|
@ -271,17 +284,17 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
|
||||
msgid "Manual Recurring"
|
||||
msgstr ""
|
||||
msgstr "Manuel gentagelse"
|
||||
|
||||
#. module: account
|
||||
#: field:account.automatic.reconcile,allow_write_off:0
|
||||
msgid "Allow write off"
|
||||
msgstr ""
|
||||
msgstr "Slå skrivning fra"
|
||||
|
||||
#. module: account
|
||||
#: view:account.analytic.chart:0
|
||||
msgid "Select the Period for Analysis"
|
||||
msgstr ""
|
||||
msgstr "Vælg analyse periode"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_invoice_tree3
|
||||
|
@ -316,7 +329,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: field:account.config.settings,module_account_budget:0
|
||||
msgid "Budget management"
|
||||
msgstr ""
|
||||
msgstr "Budget opsætning"
|
||||
|
||||
#. module: account
|
||||
#: view:product.template:0
|
||||
|
@ -334,7 +347,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: field:account.config.settings,group_multi_currency:0
|
||||
msgid "Allow multi currencies"
|
||||
msgstr ""
|
||||
msgstr "Tillad flere valutaer"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account_invoice.py:77
|
||||
|
@ -368,13 +381,13 @@ msgstr ""
|
|||
#: view:account.invoice.report:0
|
||||
#: field:account.invoice.report,user_id:0
|
||||
msgid "Salesperson"
|
||||
msgstr ""
|
||||
msgstr "Sælger"
|
||||
|
||||
#. module: account
|
||||
#: view:account.bank.statement:0
|
||||
#: view:account.invoice:0
|
||||
msgid "Responsible"
|
||||
msgstr ""
|
||||
msgstr "Ansvarlig"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_accounts_wizard
|
||||
|
@ -395,7 +408,7 @@ msgstr "Annuller Faktura"
|
|||
#. module: account
|
||||
#: selection:account.journal,type:0
|
||||
msgid "Purchase Refund"
|
||||
msgstr ""
|
||||
msgstr "Indkøb Kreditnota"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,type:0
|
||||
|
@ -439,7 +452,7 @@ msgstr ""
|
|||
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
|
||||
#, python-format
|
||||
msgid "Period :"
|
||||
msgstr ""
|
||||
msgstr "Periode:"
|
||||
|
||||
#. module: account
|
||||
#: field:account.account.template,chart_template_id:0
|
||||
|
@ -480,12 +493,12 @@ msgstr "Det beløb udtrykt i anden valgfri valuta."
|
|||
#. module: account
|
||||
#: view:account.journal:0
|
||||
msgid "Available Coins"
|
||||
msgstr ""
|
||||
msgstr "Tilgængelige mønter"
|
||||
|
||||
#. module: account
|
||||
#: field:accounting.report,enable_filter:0
|
||||
msgid "Enable Comparison"
|
||||
msgstr ""
|
||||
msgstr "Aktiver sammenligning"
|
||||
|
||||
#. module: account
|
||||
#: view:account.analytic.line:0
|
||||
|
@ -518,12 +531,12 @@ msgstr ""
|
|||
#: model:ir.model,name:account.model_account_journal
|
||||
#: field:validate.account.move,journal_id:0
|
||||
msgid "Journal"
|
||||
msgstr ""
|
||||
msgstr "Journal"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_invoice_confirm
|
||||
msgid "Confirm the selected invoices"
|
||||
msgstr ""
|
||||
msgstr "Godkend valgte faktura"
|
||||
|
||||
#. module: account
|
||||
#: field:account.addtmpl.wizard,cparent_id:0
|
||||
|
@ -538,7 +551,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: field:account.bank.statement,account_id:0
|
||||
msgid "Account used in this journal"
|
||||
msgstr ""
|
||||
msgstr "Konto brugt i Journal"
|
||||
|
||||
#. module: account
|
||||
#: help:account.aged.trial.balance,chart_account_id:0
|
||||
|
@ -561,7 +574,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_invoice_refund
|
||||
msgid "Invoice Refund"
|
||||
msgstr ""
|
||||
msgstr "Kreditnota"
|
||||
|
||||
#. module: account
|
||||
#: report:account.overdue:0
|
||||
|
@ -617,7 +630,7 @@ msgstr ""
|
|||
#: selection:account.config.settings,period:0
|
||||
#: selection:account.installer,period:0
|
||||
msgid "3 Monthly"
|
||||
msgstr ""
|
||||
msgstr "3 Pr. måned"
|
||||
|
||||
#. module: account
|
||||
#: field:ir.sequence,fiscal_ids:0
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
|
||||
"PO-Revision-Date: 2013-08-22 11:02+0000\n"
|
||||
"PO-Revision-Date: 2013-09-08 09:45+0000\n"
|
||||
"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
|
||||
"Language-Team: Hungarian <hu@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
|
||||
"X-Generator: Launchpad (build 16737)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-09 04:59+0000\n"
|
||||
"X-Generator: Launchpad (build 16760)\n"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||
|
@ -3867,7 +3867,7 @@ msgstr "Számlatükör"
|
|||
#: view:cash.box.out:0
|
||||
#: model:ir.actions.act_window,name:account.action_cash_box_out
|
||||
msgid "Take Money Out"
|
||||
msgstr ""
|
||||
msgstr "Készpénz kifizetése"
|
||||
|
||||
#. module: account
|
||||
#: report:account.vat.declaration:0
|
||||
|
@ -9437,7 +9437,7 @@ msgstr "Időszak vége"
|
|||
#: model:ir.actions.act_window,name:account.action_account_report
|
||||
#: model:ir.ui.menu,name:account.menu_account_reports
|
||||
msgid "Financial Reports"
|
||||
msgstr ""
|
||||
msgstr "Pénzügyi kimutatások"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_liability_view1
|
||||
|
@ -9940,7 +9940,7 @@ msgstr ""
|
|||
#: view:cash.box.in:0
|
||||
#: model:ir.actions.act_window,name:account.action_cash_box_in
|
||||
msgid "Put Money In"
|
||||
msgstr ""
|
||||
msgstr "Készpénz befizetése"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.account.type,close_method:0
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
|
||||
"PO-Revision-Date: 2013-07-17 10:37+0000\n"
|
||||
"Last-Translator: Dariusz Kubiak <d.kubiak@macopedia.pl>\n"
|
||||
"PO-Revision-Date: 2013-09-03 07:49+0000\n"
|
||||
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
|
||||
"Language-Team: Polish <pl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-18 07:14+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||
|
@ -7492,7 +7492,7 @@ msgstr "Wyświetl raport z każdym partnerem na osobnej stronie"
|
|||
#: report:account.third_party_ledger:0
|
||||
#: report:account.third_party_ledger_other:0
|
||||
msgid "JRNL"
|
||||
msgstr "DK"
|
||||
msgstr "DZ"
|
||||
|
||||
#. module: account
|
||||
#: view:account.state.open:0
|
||||
|
@ -8445,7 +8445,7 @@ msgstr "Środek trwały"
|
|||
#. module: account
|
||||
#: field:account.bank.statement,balance_end:0
|
||||
msgid "Computed Balance"
|
||||
msgstr "Wyliczona salso"
|
||||
msgstr "Wyliczone saldo"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
@ -9939,7 +9939,7 @@ msgstr "Nie ma konta %s w dzienniku %s."
|
|||
#: report:account.third_party_ledger:0
|
||||
#: report:account.third_party_ledger_other:0
|
||||
msgid "Filters By"
|
||||
msgstr "Fltry po"
|
||||
msgstr "Filtry"
|
||||
|
||||
#. module: account
|
||||
#: field:account.cashbox.line,number_closing:0
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-14 22:29+0000\n"
|
||||
"PO-Revision-Date: 2013-08-05 16:30+0000\n"
|
||||
"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
|
||||
"PO-Revision-Date: 2013-09-07 07:23+0000\n"
|
||||
"Last-Translator: youring <youring@gmail.com>\n"
|
||||
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-08-06 05:04+0000\n"
|
||||
"X-Generator: Launchpad (build 16718)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-08 05:02+0000\n"
|
||||
"X-Generator: Launchpad (build 16760)\n"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||
|
@ -4409,7 +4409,7 @@ msgstr "显示业务伙伴"
|
|||
#. module: account
|
||||
#: view:account.invoice:0
|
||||
msgid "Validate"
|
||||
msgstr "使其生效"
|
||||
msgstr "确认生效"
|
||||
|
||||
#. module: account
|
||||
#: model:account.financial.report,name:account.account_financial_report_assets0
|
||||
|
@ -7358,7 +7358,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: field:account.config.settings,module_account_voucher:0
|
||||
msgid "Manage customer payments"
|
||||
msgstr ""
|
||||
msgstr "管理客户付款"
|
||||
|
||||
#. module: account
|
||||
#: help:report.invoice.created,origin:0
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
<field name="model">account.analytic.chart</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Analytic Account Charts" version="7.0">
|
||||
<header>
|
||||
<button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</header>
|
||||
<group string="Select the Period for Analysis" col="4">
|
||||
<field name="from_date"/>
|
||||
<field name="to_date"/>
|
||||
<label string="(Keep empty to open the current situation)" colspan="4"/>
|
||||
</group>
|
||||
<footer>
|
||||
<button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel"/>
|
||||
</footer>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -38,6 +38,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
|
|||
'get_filter': self._get_filter,
|
||||
'get_start_date':self._get_start_date,
|
||||
'get_end_date':self._get_end_date,
|
||||
'get_target_move': self._get_target_move,
|
||||
})
|
||||
self.context = context
|
||||
|
||||
|
|
|
@ -166,11 +166,12 @@
|
|||
<para style="Standard">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="163.0,163.0,163.0" style="Table2_header">
|
||||
<blockTable colWidths="122.0,122.0,122.0,122.0" style="Table2_header">
|
||||
<tr>
|
||||
<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
|
||||
<td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
|
||||
<td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td>
|
||||
<td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
|
||||
|
@ -197,6 +198,10 @@
|
|||
</tr>
|
||||
</blockTable>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
</blockTable>
|
||||
<para style="Standard">
|
||||
|
|
|
@ -54,7 +54,7 @@ class accounting_report(osv.osv_memory):
|
|||
'target_move': 'posted',
|
||||
'account_report_id': _get_account_report,
|
||||
}
|
||||
|
||||
|
||||
def _build_comparison_context(self, cr, uid, ids, data, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
|
@ -62,6 +62,7 @@ class accounting_report(osv.osv_memory):
|
|||
result['fiscalyear'] = 'fiscalyear_id_cmp' in data['form'] and data['form']['fiscalyear_id_cmp'] or False
|
||||
result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False
|
||||
result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False
|
||||
result['state'] = 'target_move' in data['form'] and data['form']['target_move'] or ''
|
||||
if data['form']['filter_cmp'] == 'filter_date':
|
||||
result['date_from'] = data['form']['date_from_cmp']
|
||||
result['date_to'] = data['form']['date_to_cmp']
|
||||
|
@ -86,7 +87,7 @@ class accounting_report(osv.osv_memory):
|
|||
return res
|
||||
|
||||
def _print_report(self, cr, uid, ids, data, context=None):
|
||||
data['form'].update(self.read(cr, uid, ids, ['date_from_cmp', 'debit_credit', 'date_to_cmp', 'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp', 'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter'], context=context)[0])
|
||||
data['form'].update(self.read(cr, uid, ids, ['date_from_cmp', 'debit_credit', 'date_to_cmp', 'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp', 'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter','target_move'], context=context)[0])
|
||||
return {
|
||||
'type': 'ir.actions.report.xml',
|
||||
'report_name': 'account.financial.report',
|
||||
|
|
|
@ -154,6 +154,7 @@ class account_common_report(osv.osv_memory):
|
|||
result['fiscalyear'] = 'fiscalyear_id' in data['form'] and data['form']['fiscalyear_id'] or False
|
||||
result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False
|
||||
result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False
|
||||
result['state'] = 'target_move' in data['form'] and data['form']['target_move'] or ''
|
||||
if data['form']['filter'] == 'filter_date':
|
||||
result['date_from'] = data['form']['date_from']
|
||||
result['date_to'] = data['form']['date_to']
|
||||
|
|
|
@ -8,16 +8,16 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-05 15:11+0000\n"
|
||||
"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
|
||||
"Language-Team: Danish <da@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:45+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-06 06:07+0000\n"
|
||||
"X-Generator: Launchpad (build 16760)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
|
||||
msgid "Open Accounting Menu"
|
||||
msgstr ""
|
||||
msgstr "Open Finans Menu"
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-08-22 11:22+0000\n"
|
||||
"PO-Revision-Date: 2013-09-08 09:43+0000\n"
|
||||
"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
|
||||
"Language-Team: Hungarian <hu@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n"
|
||||
"X-Generator: Launchpad (build 16737)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-09 04:59+0000\n"
|
||||
"X-Generator: Launchpad (build 16760)\n"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
@ -338,7 +338,7 @@ msgstr ""
|
|||
#: view:account.asset.history:0
|
||||
#: model:ir.model,name:account_asset.model_account_asset_history
|
||||
msgid "Asset history"
|
||||
msgstr ""
|
||||
msgstr "Esuközök előzménye"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.category:0
|
||||
|
@ -478,7 +478,7 @@ msgstr "Kiszámítás"
|
|||
#. module: account_asset
|
||||
#: view:account.asset.history:0
|
||||
msgid "Asset History"
|
||||
msgstr "Eszköz történet"
|
||||
msgstr "Esuközök előzménye"
|
||||
|
||||
#. module: account_asset
|
||||
#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
|
||||
|
@ -628,7 +628,7 @@ msgstr "Napló"
|
|||
#. module: account_asset
|
||||
#: field:account.asset.history,name:0
|
||||
msgid "History name"
|
||||
msgstr ""
|
||||
msgstr "Előzmény neve"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.depreciation.line,depreciated_value:0
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-02 08:30+0000\n"
|
||||
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
|
||||
"Language-Team: Polish <pl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:47+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
@ -37,7 +37,7 @@ msgstr "Wartość pozostała"
|
|||
#. module: account_asset
|
||||
#: field:account.asset.category,account_expense_depreciation_id:0
|
||||
msgid "Depr. Expense Account"
|
||||
msgstr "Konto umorzenia"
|
||||
msgstr "Konto amortyzacji"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:asset.asset.report:0
|
||||
|
@ -178,7 +178,7 @@ msgstr "Środki trwałe"
|
|||
#. module: account_asset
|
||||
#: field:account.asset.category,account_depreciation_id:0
|
||||
msgid "Depreciation Account"
|
||||
msgstr "Konto amortyzacji"
|
||||
msgstr "Konto umorzenia"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
|
@ -8,19 +8,20 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-07-18 19:48+0000\n"
|
||||
"Last-Translator: Claudio de Araujo Santos <Unknown>\n"
|
||||
"PO-Revision-Date: 2013-08-31 04:33+0000\n"
|
||||
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
|
||||
"<webmaster@guaru.net>\n"
|
||||
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-19 06:36+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-01 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build 16750)\n"
|
||||
|
||||
#. module: account_report_company
|
||||
#: field:res.partner,display_name:0
|
||||
msgid "Name"
|
||||
msgstr "Name"
|
||||
msgstr "Nome"
|
||||
|
||||
#. module: account_report_company
|
||||
#: field:account.invoice,commercial_partner_id:0
|
||||
|
@ -48,7 +49,7 @@ msgstr "Parceiro"
|
|||
#. module: account_report_company
|
||||
#: model:ir.model,name:account_report_company.model_account_invoice_report
|
||||
msgid "Invoices Statistics"
|
||||
msgstr "Faturas Estatísticas"
|
||||
msgstr "Estatísticas das Faturas"
|
||||
|
||||
#. module: account_report_company
|
||||
#: view:res.partner:0
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-07 07:02+0000\n"
|
||||
"Last-Translator: youring <youring@gmail.com>\n"
|
||||
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:49+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-08 05:02+0000\n"
|
||||
"X-Generator: Launchpad (build 16760)\n"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.bank.statement.line,voucher_id:0
|
||||
|
@ -158,7 +158,7 @@ msgstr "记账"
|
|||
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
|
||||
msgid "Supplier Payments"
|
||||
msgstr ""
|
||||
msgstr "供应商付款"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
|
||||
|
@ -226,7 +226,7 @@ msgstr "消息"
|
|||
#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
|
||||
msgid "Purchase Receipts"
|
||||
msgstr ""
|
||||
msgstr "采购收据"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,move_line_id:0
|
||||
|
@ -579,6 +579,14 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Click to register a new payment.登记一笔付款 \n"
|
||||
" </p><p>\n"
|
||||
" 输入客户名称及其付款方式,然后手工创建一条付款记录,\n"
|
||||
" 或者OpenERP会提醒您自动核销此笔付款,以关闭相应发\n"
|
||||
" 票或销售收据。\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.config.settings,expense_currency_exchange_account_id:0
|
||||
|
@ -791,7 +799,7 @@ msgstr "已付款"
|
|||
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
|
||||
msgid "Sales Receipts"
|
||||
msgstr ""
|
||||
msgstr "销售收据"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,message_is_follower:0
|
||||
|
@ -889,7 +897,7 @@ msgstr "请在分类账上定义一个序列( sequence )。"
|
|||
#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
|
||||
msgid "Customer Payments"
|
||||
msgstr ""
|
||||
msgstr "客户付款"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
|
||||
|
|
|
@ -8,19 +8,19 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-09 19:17+0000\n"
|
||||
"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
|
||||
"Language-Team: Danish <da@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:50+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-10 05:23+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,user:0
|
||||
msgid "Template User"
|
||||
msgstr ""
|
||||
msgstr "Skabelon bruger"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: help:res.company.ldap,ldap_tls:0
|
||||
|
@ -29,112 +29,114 @@ msgid ""
|
|||
"option requires a server with STARTTLS enabled, otherwise all authentication "
|
||||
"attempts will fail."
|
||||
msgstr ""
|
||||
"Kræv sikker TLS/SSL kryptering ved tilslutning til LDAP server. Denne option "
|
||||
"kræver server med STARTTLS aktiveret, ellers fejler godkendelse."
|
||||
|
||||
#. module: auth_ldap
|
||||
#: view:res.company:0
|
||||
#: view:res.company.ldap:0
|
||||
msgid "LDAP Configuration"
|
||||
msgstr ""
|
||||
msgstr "LDAP konfiguration"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,ldap_binddn:0
|
||||
msgid "LDAP binddn"
|
||||
msgstr ""
|
||||
msgstr "LDAP bind dn"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,company:0
|
||||
msgid "Company"
|
||||
msgstr ""
|
||||
msgstr "Firma"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,ldap_server:0
|
||||
msgid "LDAP Server address"
|
||||
msgstr ""
|
||||
msgstr "LDAP server adresse"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,ldap_server_port:0
|
||||
msgid "LDAP Server port"
|
||||
msgstr ""
|
||||
msgstr "LDAP server port"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: help:res.company.ldap,create_user:0
|
||||
msgid ""
|
||||
"Automatically create local user accounts for new users authenticating via "
|
||||
"LDAP"
|
||||
msgstr ""
|
||||
msgstr "Opretter automatisk ny lokal bruger når ny bruger logger på via LDAP"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,ldap_base:0
|
||||
msgid "LDAP base"
|
||||
msgstr ""
|
||||
msgstr "LDAP base"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: view:res.company.ldap:0
|
||||
msgid "User Information"
|
||||
msgstr ""
|
||||
msgstr "Brugerinformation"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,ldap_password:0
|
||||
msgid "LDAP password"
|
||||
msgstr ""
|
||||
msgstr "LDAP kodeord"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: model:ir.model,name:auth_ldap.model_res_company
|
||||
msgid "Companies"
|
||||
msgstr ""
|
||||
msgstr "Firmaer"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: view:res.company.ldap:0
|
||||
msgid "Process Parameter"
|
||||
msgstr ""
|
||||
msgstr "Proces parametre"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: model:ir.model,name:auth_ldap.model_res_company_ldap
|
||||
msgid "res.company.ldap"
|
||||
msgstr ""
|
||||
msgstr "res.company.ldap"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: help:res.company.ldap,user:0
|
||||
msgid "User to copy when creating new users"
|
||||
msgstr ""
|
||||
msgstr "Kopier fra bruger ved oprettelse af ny bruger"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,ldap_tls:0
|
||||
msgid "Use TLS"
|
||||
msgstr ""
|
||||
msgstr "Brug TLS"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,sequence:0
|
||||
msgid "Sequence"
|
||||
msgstr ""
|
||||
msgstr "Rækkefølge"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: view:res.company.ldap:0
|
||||
msgid "Login Information"
|
||||
msgstr ""
|
||||
msgstr "Login-information"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: view:res.company.ldap:0
|
||||
msgid "Server Information"
|
||||
msgstr ""
|
||||
msgstr "Serverinformation"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: model:ir.actions.act_window,name:auth_ldap.action_ldap_installer
|
||||
msgid "Setup your LDAP Server"
|
||||
msgstr ""
|
||||
msgstr "Opsætning LDAP server"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: view:res.company:0
|
||||
#: field:res.company,ldaps:0
|
||||
msgid "LDAP Parameters"
|
||||
msgstr ""
|
||||
msgstr "LDAP parametre"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: help:res.company.ldap,ldap_password:0
|
||||
msgid ""
|
||||
"The password of the user account on the LDAP server that is used to query "
|
||||
"the directory."
|
||||
msgstr ""
|
||||
msgstr "Brugers kodeord på LDAP server, bruges ved søgning i directory"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: help:res.company.ldap,ldap_binddn:0
|
||||
|
@ -142,18 +144,20 @@ msgid ""
|
|||
"The user account on the LDAP server that is used to query the directory. "
|
||||
"Leave empty to connect anonymously."
|
||||
msgstr ""
|
||||
"Bruger konto på LDAP server bruges ved søgning i directory. Hvis tomt logges "
|
||||
"på anonymt."
|
||||
|
||||
#. module: auth_ldap
|
||||
#: model:ir.model,name:auth_ldap.model_res_users
|
||||
msgid "Users"
|
||||
msgstr ""
|
||||
msgstr "Brugere"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,ldap_filter:0
|
||||
msgid "LDAP filter"
|
||||
msgstr ""
|
||||
msgstr "LDAP filter"
|
||||
|
||||
#. module: auth_ldap
|
||||
#: field:res.company.ldap,create_user:0
|
||||
msgid "Create user"
|
||||
msgstr ""
|
||||
msgstr "Opret bruger"
|
||||
|
|
|
@ -8,21 +8,21 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-10 02:43+0000\n"
|
||||
"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
|
||||
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:51+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-11 05:19+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: auth_openid
|
||||
#. openerp-web
|
||||
#: code:addons/auth_openid/static/src/xml/auth_openid.xml:24
|
||||
#, python-format
|
||||
msgid "Username"
|
||||
msgstr "用户名"
|
||||
msgstr "登陆"
|
||||
|
||||
#. module: auth_openid
|
||||
#. openerp-web
|
||||
|
|
|
@ -8,14 +8,15 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-07-18 19:46+0000\n"
|
||||
"Last-Translator: Claudio de Araujo Santos <Unknown>\n"
|
||||
"PO-Revision-Date: 2013-08-31 04:27+0000\n"
|
||||
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
|
||||
"<webmaster@guaru.net>\n"
|
||||
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-19 06:35+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-01 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build 16750)\n"
|
||||
|
||||
#. module: auth_signup
|
||||
#: view:res.users:0
|
||||
|
@ -98,7 +99,7 @@ msgstr "Por favor digite uma senha e sua confirmação."
|
|||
#. module: auth_signup
|
||||
#: view:res.users:0
|
||||
msgid "Send reset password link by email"
|
||||
msgstr "Enviar repor ligação senha por e-mail"
|
||||
msgstr "Enviar link de alteração de senha por email"
|
||||
|
||||
#. module: auth_signup
|
||||
#: model:email.template,body_html:auth_signup.reset_password_email
|
||||
|
|
|
@ -577,8 +577,7 @@ property or property parameter."),
|
|||
|
||||
def do_accept(self, cr, uid, ids, context=None, *args):
|
||||
"""
|
||||
Update state of invitation as Accepted and if the invited user is other
|
||||
then event user it will make a copy of this event for invited user.
|
||||
Marks event invitation as Accepted.
|
||||
@param cr: the current row, from the database cursor
|
||||
@param uid: the current user's ID for security checks
|
||||
@param ids: list of calendar attendee's IDs
|
||||
|
@ -587,16 +586,7 @@ property or property parameter."),
|
|||
"""
|
||||
if context is None:
|
||||
context = {}
|
||||
|
||||
for vals in self.browse(cr, uid, ids, context=context):
|
||||
if vals.ref and vals.ref.user_id:
|
||||
mod_obj = self.pool.get(vals.ref._name)
|
||||
res=mod_obj.read(cr,uid,[vals.ref.id],['duration','class'],context)
|
||||
defaults = {'user_id': vals.user_id.id, 'organizer_id': vals.ref.user_id.id,'duration':res[0]['duration'],'class':res[0]['class']}
|
||||
mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
|
||||
self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
|
||||
|
||||
return True
|
||||
return self.write(cr, uid, ids, {'state': 'accepted'}, context)
|
||||
|
||||
def do_decline(self, cr, uid, ids, context=None, *args):
|
||||
"""
|
||||
|
@ -1128,12 +1118,14 @@ rule or repeating pattern of time to exclude from the recurring rule."),
|
|||
for partner in event.partner_ids:
|
||||
if partner.id in attendees:
|
||||
continue
|
||||
local_context = context.copy()
|
||||
local_context.pop('default_state', None)
|
||||
att_id = self.pool.get('calendar.attendee').create(cr, uid, {
|
||||
'partner_id': partner.id,
|
||||
'user_id': partner.user_ids and partner.user_ids[0].id or False,
|
||||
'ref': self._name+','+str(event.id),
|
||||
'email': partner.email
|
||||
}, context=context)
|
||||
}, context=local_context)
|
||||
if partner.email:
|
||||
mail_to = mail_to + " " + partner.email
|
||||
self.write(cr, uid, [event.id], {
|
||||
|
|
|
@ -8,19 +8,19 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-09 19:28+0000\n"
|
||||
"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
|
||||
"Language-Team: Danish <da@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:53+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-10 05:23+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: base_vat
|
||||
#: view:res.partner:0
|
||||
msgid "Check Validity"
|
||||
msgstr ""
|
||||
msgstr "Kontroller format"
|
||||
|
||||
#. module: base_vat
|
||||
#: code:addons/base_vat/base_vat.py:152
|
||||
|
@ -29,27 +29,29 @@ msgid ""
|
|||
"This VAT number does not seem to be valid.\n"
|
||||
"Note: the expected format is %s"
|
||||
msgstr ""
|
||||
"Momsnummer ikke korrekt.\n"
|
||||
"Note: det forventede format er %s"
|
||||
|
||||
#. module: base_vat
|
||||
#: field:res.company,vat_check_vies:0
|
||||
msgid "VIES VAT Check"
|
||||
msgstr ""
|
||||
msgstr "VIES Moms kontrol"
|
||||
|
||||
#. module: base_vat
|
||||
#: model:ir.model,name:base_vat.model_res_company
|
||||
msgid "Companies"
|
||||
msgstr ""
|
||||
msgstr "Firmaer"
|
||||
|
||||
#. module: base_vat
|
||||
#: code:addons/base_vat/base_vat.py:113
|
||||
#, python-format
|
||||
msgid "Error!"
|
||||
msgstr ""
|
||||
msgstr "Fejl!"
|
||||
|
||||
#. module: base_vat
|
||||
#: view:res.partner:0
|
||||
msgid "e.g. BE0477472701"
|
||||
msgstr ""
|
||||
msgstr "f.eks. DK12345678"
|
||||
|
||||
#. module: base_vat
|
||||
#: help:res.partner,vat_subjected:0
|
||||
|
@ -57,8 +59,8 @@ msgid ""
|
|||
"Check this box if the partner is subjected to the VAT. It will be used for "
|
||||
"the VAT legal statement."
|
||||
msgstr ""
|
||||
"Afkryds dette felt, hvis kontakten er momsregistreret. Det bruges til "
|
||||
"momsbestemmelser."
|
||||
"Afkryds dette felt, hvis kontakten er momsregistreret. Det bruges til moms "
|
||||
"afregning."
|
||||
|
||||
#. module: base_vat
|
||||
#: model:ir.model,name:base_vat.model_res_partner
|
||||
|
@ -71,6 +73,8 @@ msgid ""
|
|||
"If checked, Partners VAT numbers will be fully validated against EU's VIES "
|
||||
"service rather than via a simple format validation (checksum)."
|
||||
msgstr ""
|
||||
"Hvis afkrydset, bliver moms nummer kontrolleret i EU's VIES i stedet for "
|
||||
"simpel checksum validering."
|
||||
|
||||
#. module: base_vat
|
||||
#: field:res.partner,vat_subjected:0
|
||||
|
|
|
@ -8,19 +8,19 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-09 19:06+0000\n"
|
||||
"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
|
||||
"Language-Team: Danish <da@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:53+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-10 05:23+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead.report:0
|
||||
msgid "# Leads"
|
||||
msgstr ""
|
||||
msgstr "Emner"
|
||||
|
||||
#. module: crm
|
||||
#: help:sale.config.settings,fetchmail_lead:0
|
||||
|
@ -28,6 +28,8 @@ msgid ""
|
|||
"Allows you to configure your incoming mail server, and create leads from "
|
||||
"incoming emails."
|
||||
msgstr ""
|
||||
"Tillader opsætning af mailserver, så emner oprettes automatisk fra modtagne "
|
||||
"emails."
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:898
|
||||
|
@ -38,13 +40,13 @@ msgstr ""
|
|||
#: selection:crm.lead.report,type:0
|
||||
#, python-format
|
||||
msgid "Lead"
|
||||
msgstr ""
|
||||
msgstr "Emne"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
#: field:crm.lead,title:0
|
||||
msgid "Title"
|
||||
msgstr ""
|
||||
msgstr "Titel"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.actions.server,message:crm.action_email_reminder_lead
|
||||
|
@ -55,12 +57,17 @@ msgid ""
|
|||
"Description: [[object.description]]\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"Advarsel, ubehandlede emner er mere end 5 dage gamle.\n"
|
||||
"Navn: [[object.name ]]\n"
|
||||
"ID: [[object.id ]]\n"
|
||||
"Beskrivelse: [[object.description]]\n"
|
||||
" "
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.opportunity2phonecall,action:0
|
||||
#: field:crm.phonecall2phonecall,action:0
|
||||
msgid "Action"
|
||||
msgstr ""
|
||||
msgstr "Aktion"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.actions.server,name:crm.action_set_team_sales_department
|
||||
|
@ -101,7 +108,7 @@ msgstr ""
|
|||
#: view:crm.lead.report:0
|
||||
#: view:crm.phonecall.report:0
|
||||
msgid "Salesperson"
|
||||
msgstr ""
|
||||
msgstr "Sælger"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.model,name:crm.model_crm_lead_report
|
||||
|
@ -118,7 +125,7 @@ msgstr "Dag"
|
|||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
msgid "Company Name"
|
||||
msgstr ""
|
||||
msgstr "Firmanavn"
|
||||
|
||||
#. module: crm
|
||||
#: model:crm.case.categ,name:crm.categ_oppor6
|
||||
|
@ -144,18 +151,18 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: help:crm.lead.report,creation_day:0
|
||||
msgid "Creation day"
|
||||
msgstr ""
|
||||
msgstr "Oprettelse dato"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.segmentation.line,name:0
|
||||
msgid "Rule Name"
|
||||
msgstr ""
|
||||
msgstr "Regel Navn"
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_phonecall.py:280
|
||||
#, python-format
|
||||
msgid "It's only possible to convert one phonecall at a time."
|
||||
msgstr ""
|
||||
msgstr "Det er kun muligt at konvertere et telefon kald af gangen"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.case.resource.type:0
|
||||
|
@ -235,7 +242,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: field:res.partner,meeting_count:0
|
||||
msgid "# Meetings"
|
||||
msgstr ""
|
||||
msgstr "# Møder"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.actions.server,name:crm.action_email_reminder_lead
|
||||
|
@ -255,7 +262,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
msgid "Excluded Answers :"
|
||||
msgstr ""
|
||||
msgstr "Udeladte svar:"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.model,name:crm.model_crm_merge_opportunity
|
||||
|
@ -302,7 +309,7 @@ msgstr ""
|
|||
#: code:addons/crm/crm_lead.py:1002
|
||||
#, python-format
|
||||
msgid "No Subject"
|
||||
msgstr ""
|
||||
msgstr "Intet emne"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead,contact_name:0
|
||||
|
@ -394,7 +401,7 @@ msgstr ""
|
|||
#: field:crm.lead,message_unread:0
|
||||
#: field:crm.phonecall,message_unread:0
|
||||
msgid "Unread Messages"
|
||||
msgstr ""
|
||||
msgstr "Ulæste beskeder"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
|
@ -408,7 +415,7 @@ msgstr ""
|
|||
#: selection:crm.lead2opportunity.partner.mass,action:0
|
||||
#: selection:crm.partner.binding,action:0
|
||||
msgid "Link to an existing customer"
|
||||
msgstr ""
|
||||
msgstr "Link til eksisterende kunde"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead,write_date:0
|
||||
|
@ -485,7 +492,7 @@ msgstr ""
|
|||
#: view:crm.phonecall.report:0
|
||||
#: field:crm.phonecall.report,state:0
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
msgstr "Status"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead2opportunity.partner:0
|
||||
|
@ -495,12 +502,12 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: view:sale.config.settings:0
|
||||
msgid "Configure"
|
||||
msgstr ""
|
||||
msgstr "Konfigurer"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
msgid "Escalate"
|
||||
msgstr ""
|
||||
msgstr "Eskaler"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
|
@ -517,35 +524,35 @@ msgstr ""
|
|||
#: selection:crm.lead.report,deadline_month:0
|
||||
#: selection:crm.phonecall.report,month:0
|
||||
msgid "June"
|
||||
msgstr ""
|
||||
msgstr "Juni"
|
||||
|
||||
#. module: crm
|
||||
#: selection:crm.segmentation,state:0
|
||||
msgid "Not Running"
|
||||
msgstr ""
|
||||
msgstr "Kører ikke"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead.report,planned_revenue:0
|
||||
msgid "Planned Revenue"
|
||||
msgstr ""
|
||||
msgstr "Forventet indtægt"
|
||||
|
||||
#. module: crm
|
||||
#: code:addons/crm/crm_lead.py:988
|
||||
#, python-format
|
||||
msgid "Customer Email"
|
||||
msgstr ""
|
||||
msgstr "Kunde email"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead,planned_revenue:0
|
||||
msgid "Expected Revenue"
|
||||
msgstr ""
|
||||
msgstr "Forventet indtægt"
|
||||
|
||||
#. module: crm
|
||||
#: selection:crm.lead.report,creation_month:0
|
||||
#: selection:crm.lead.report,deadline_month:0
|
||||
#: selection:crm.phonecall.report,month:0
|
||||
msgid "October"
|
||||
msgstr ""
|
||||
msgstr "Oktober"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
|
@ -567,12 +574,12 @@ msgstr ""
|
|||
#: field:crm.lead,message_summary:0
|
||||
#: field:crm.phonecall,message_summary:0
|
||||
msgid "Summary"
|
||||
msgstr ""
|
||||
msgstr "Resumé"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.merge.opportunity:0
|
||||
msgid "Merge"
|
||||
msgstr ""
|
||||
msgstr "Flet"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.case.categ:0
|
||||
|
@ -607,12 +614,12 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: view:crm.phonecall.report:0
|
||||
msgid "#Phone calls"
|
||||
msgstr ""
|
||||
msgstr "#Telefon opkald"
|
||||
|
||||
#. module: crm
|
||||
#: sql_constraint:crm.case.section:0
|
||||
msgid "The code of the sales team must be unique !"
|
||||
msgstr ""
|
||||
msgstr "Kode for Salgs gruppe skal være entydig !"
|
||||
|
||||
#. module: crm
|
||||
#: help:crm.lead,email_from:0
|
||||
|
@ -624,7 +631,7 @@ msgstr ""
|
|||
#: view:crm.lead:0
|
||||
#: selection:crm.lead,state:0
|
||||
msgid "In Progress"
|
||||
msgstr ""
|
||||
msgstr "I gang"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
|
||||
|
@ -649,7 +656,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: field:crm.lead.report,creation_month:0
|
||||
msgid "Creation Month"
|
||||
msgstr ""
|
||||
msgstr "Oprettelses måned"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.case.section,resource_calendar_id:0
|
||||
|
@ -671,7 +678,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
msgid "Leads Form"
|
||||
msgstr ""
|
||||
msgstr "Emne form"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.segmentation:0
|
||||
|
@ -682,7 +689,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: field:crm.lead,company_currency:0
|
||||
msgid "Currency"
|
||||
msgstr ""
|
||||
msgstr "Valuta"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead.report,probable_revenue:0
|
||||
|
@ -702,7 +709,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: model:ir.filters,name:crm.filter_usa_lead
|
||||
msgid "Leads from USA"
|
||||
msgstr ""
|
||||
msgstr "Emner fra USA"
|
||||
|
||||
#. module: crm
|
||||
#: sql_constraint:crm.lead:0
|
||||
|
@ -756,7 +763,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: field:crm.case.section,alias_id:0
|
||||
msgid "Alias"
|
||||
msgstr ""
|
||||
msgstr "Alias"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.phonecall:0
|
||||
|
@ -772,7 +779,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: field:crm.segmentation.line,expr_value:0
|
||||
msgid "Value"
|
||||
msgstr ""
|
||||
msgstr "Værdi"
|
||||
|
||||
#. module: crm
|
||||
#: field:calendar.attendee,categ_id:0
|
||||
|
|
|
@ -8,78 +8,78 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-06-19 17:34+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-09 19:12+0000\n"
|
||||
"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
|
||||
"Language-Team: Danish <da@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-10 05:23+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: crm_todo
|
||||
#: model:ir.model,name:crm_todo.model_project_task
|
||||
msgid "Task"
|
||||
msgstr ""
|
||||
msgstr "Opgave"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
msgid "Timebox"
|
||||
msgstr ""
|
||||
msgstr "Timeboks"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
msgid "Lead"
|
||||
msgstr ""
|
||||
msgstr "Emne"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
msgid "For cancelling the task"
|
||||
msgstr ""
|
||||
msgstr "Afbryd opgave"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
msgid "Next"
|
||||
msgstr ""
|
||||
msgstr "Næste"
|
||||
|
||||
#. module: crm_todo
|
||||
#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
|
||||
#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
|
||||
msgid "My Tasks"
|
||||
msgstr ""
|
||||
msgstr "Mine opgaver"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
#: field:crm.lead,task_ids:0
|
||||
msgid "Tasks"
|
||||
msgstr ""
|
||||
msgstr "Opgaver"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
msgid "Done"
|
||||
msgstr ""
|
||||
msgstr "Udført"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
msgstr "Annuller"
|
||||
|
||||
#. module: crm_todo
|
||||
#: model:ir.model,name:crm_todo.model_crm_lead
|
||||
msgid "Lead/Opportunity"
|
||||
msgstr ""
|
||||
msgstr "Emne/Forventning"
|
||||
|
||||
#. module: crm_todo
|
||||
#: field:project.task,lead_id:0
|
||||
msgid "Lead / Opportunity"
|
||||
msgstr ""
|
||||
msgstr "Emne / Forventning"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
msgid "For changing to done state"
|
||||
msgstr ""
|
||||
msgstr "Ændre til afsluttet"
|
||||
|
||||
#. module: crm_todo
|
||||
#: view:crm.lead:0
|
||||
msgid "Previous"
|
||||
msgstr ""
|
||||
msgstr "Forrige"
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-09 19:30+0000\n"
|
||||
"Last-Translator: Hans Henrik Gabelgaard <Unknown>\n"
|
||||
"Language-Team: Danish <da@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-10 05:23+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: decimal_precision
|
||||
#: field:decimal.precision,digits:0
|
||||
|
@ -26,7 +26,7 @@ msgstr "Cifre"
|
|||
#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
|
||||
#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
|
||||
msgid "Decimal Accuracy"
|
||||
msgstr ""
|
||||
msgstr "Antal decimaler"
|
||||
|
||||
#. module: decimal_precision
|
||||
#: field:decimal.precision,name:0
|
||||
|
|
|
@ -8,19 +8,19 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2013-06-19 17:36+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-09 19:33+0000\n"
|
||||
"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
|
||||
"Language-Team: Danish <da@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:58+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-10 05:23+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: event_sale
|
||||
#: model:ir.model,name:event_sale.model_product_product
|
||||
msgid "Product"
|
||||
msgstr ""
|
||||
msgstr "Produkt"
|
||||
|
||||
#. module: event_sale
|
||||
#: help:product.product,event_ok:0
|
||||
|
@ -71,7 +71,7 @@ msgstr ""
|
|||
#. module: event_sale
|
||||
#: model:product.template,name:event_sale.event_product_product_template
|
||||
msgid "Technical Training"
|
||||
msgstr ""
|
||||
msgstr "Teknisk træning"
|
||||
|
||||
#. module: event_sale
|
||||
#: code:addons/event_sale/event_sale.py:88
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2012-12-22 14:02+0000\n"
|
||||
"Last-Translator: Sergio Corato <Unknown>\n"
|
||||
"PO-Revision-Date: 2013-09-10 10:31+0000\n"
|
||||
"Last-Translator: PkLab.net <Unknown>\n"
|
||||
"Language-Team: Italian <it@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 05:59+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-11 05:19+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: hr
|
||||
#: model:process.node,name:hr.process_node_openerpuser0
|
||||
|
@ -821,7 +821,7 @@ msgstr "Categorie Dipendenti"
|
|||
#. module: hr
|
||||
#: field:hr.employee,address_home_id:0
|
||||
msgid "Home Address"
|
||||
msgstr "Indirizzo abitazione"
|
||||
msgstr "Indirizzo fiscale"
|
||||
|
||||
#. module: hr
|
||||
#: field:hr.config.settings,module_hr_timesheet:0
|
||||
|
|
|
@ -37,13 +37,6 @@ def _employee_get(obj, cr, uid, context=None):
|
|||
|
||||
class hr_expense_expense(osv.osv):
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if not default: default = {}
|
||||
default.update({'voucher_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False})
|
||||
return super(hr_expense_expense, self).copy(cr, uid, id, default, context=context)
|
||||
|
||||
def _amount(self, cr, uid, ids, field_name, arg, context=None):
|
||||
res= {}
|
||||
for expense in self.browse(cr, uid, ids, context=context):
|
||||
|
@ -112,7 +105,12 @@ class hr_expense_expense(osv.osv):
|
|||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if default is None:
|
||||
default = {}
|
||||
default.update(account_move_id=False)
|
||||
default.update(
|
||||
account_move_id=False,
|
||||
voucher_id=False,
|
||||
date_confirm=False,
|
||||
date_valid=False,
|
||||
user_valid=False)
|
||||
return super(hr_expense_expense, self).copy(cr, uid, id, default=default, context=context)
|
||||
|
||||
def unlink(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -247,9 +247,9 @@ class partner_vat_intra(osv.osv_memory):
|
|||
for client in xml_data['clientlist']:
|
||||
if not client['vatnum']:
|
||||
raise osv.except_osv(_('Insufficient Data!'),_('No vat number defined for %s.') % client['partner_name'])
|
||||
data_clientinfo +='\n\t\t<ns2:IntraClient SequenceNumber="%(seq)s">\n\t\t\t<ns2:CompanyVATNumber issuedBy="%(country)s">%(vatnum)s</ns2:CompanyVATNumber>\n\t\t\t<ns2:Code>%(code)s</ns2:Code>\n\t\t\t<ns2:Amount>%(amount)s</ns2:Amount>\n\t\t</ns2:IntraClient>' % (client)
|
||||
data_clientinfo +='\n\t\t<ns2:IntraClient SequenceNumber="%(seq)s">\n\t\t\t<ns2:CompanyVATNumber issuedBy="%(country)s">%(vatnum)s</ns2:CompanyVATNumber>\n\t\t\t<ns2:Code>%(code)s</ns2:Code>\n\t\t\t<ns2:Amount>%(amount).2f</ns2:Amount>\n\t\t</ns2:IntraClient>' % (client)
|
||||
|
||||
data_decl = '\n\t<ns2:IntraListing SequenceNumber="1" ClientsNbr="%(clientnbr)s" DeclarantReference="%(dnum)s" AmountSum="%(amountsum)s">' % (xml_data)
|
||||
data_decl = '\n\t<ns2:IntraListing SequenceNumber="1" ClientsNbr="%(clientnbr)s" DeclarantReference="%(dnum)s" AmountSum="%(amountsum).2f">' % (xml_data)
|
||||
|
||||
data_file += data_head + data_decl + data_comp_period + data_clientinfo + '\n\t\t<ns2:Comment>%(comments)s</ns2:Comment>\n\t</ns2:IntraListing>\n</ns2:IntraConsignment>' % (xml_data)
|
||||
context['file_save'] = data_file
|
||||
|
|
|
@ -241,11 +241,11 @@ class account_coda_import(osv.osv_memory):
|
|||
if statement['debit'] == '1': # 1=Debit
|
||||
statement['balance_end_real'] = - statement['balance_end_real']
|
||||
if statement['balance_end_realDate']:
|
||||
period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['balance_end_realDate']), ('date_stop', '>=', statement['balance_end_realDate'])])
|
||||
period_id = self.pool.get('account.period').search(cr, uid, [('company_id', '=', statement['journal_id'].company_id.id), ('date_start', '<=', statement['balance_end_realDate']), ('date_stop', '>=', statement['balance_end_realDate'])])
|
||||
else:
|
||||
period_id = self.pool.get('account.period').search(cr, uid, [('date_start', '<=', statement['date']), ('date_stop', '>=', statement['date'])])
|
||||
period_id = self.pool.get('account.period').search(cr, uid, [('company_id', '=', statement['journal_id'].company_id.id), ('date_start', '<=', statement['date']), ('date_stop', '>=', statement['date'])])
|
||||
if not period_id and len(period_id) == 0:
|
||||
raise osv.except_osv(_('Error') + 'R0002', _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s.") % statement['balance_end_realDate'])
|
||||
raise osv.except_osv(_('Error') + 'R0002', _("The CODA Statement New Balance date doesn't fall within a defined Accounting Period! Please create the Accounting Period for date %s for the company %s.") % (statement['balance_end_realDate'], statement['journal_id'].company_id.name))
|
||||
statement['period_id'] = period_id[0]
|
||||
elif line[0] == '9':
|
||||
statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2013-06-26 12:58+0000\n"
|
||||
"PO-Revision-Date: 2013-09-02 09:29+0000\n"
|
||||
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
|
||||
"Language-Team: Dutch <nl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 06:08+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: marketing_campaign
|
||||
#: view:marketing.campaign:0
|
||||
|
@ -102,6 +102,8 @@ msgid ""
|
|||
"Hi, we are delighted to let you know that you have entered the select circle "
|
||||
"of our Gold Partners"
|
||||
msgstr ""
|
||||
"Hallo, we zijn verheugt om je te kunnen melden dat je bent toegetreden tot "
|
||||
"de selectie groep van Gold partners."
|
||||
|
||||
#. module: marketing_campaign
|
||||
#: selection:campaign.analysis,month:0
|
||||
|
@ -159,11 +161,13 @@ msgid ""
|
|||
"The campaign cannot be started. It does not have any starting activity. "
|
||||
"Modify campaign's activities to mark one as the starting point."
|
||||
msgstr ""
|
||||
"De campagne kan niet worden gestart. Het heeft geen enkele start activiteit. "
|
||||
"Pas de campagne activiteiten aan om er een als start punt aan te merken."
|
||||
|
||||
#. module: marketing_campaign
|
||||
#: help:marketing.campaign.activity,email_template_id:0
|
||||
msgid "The email to send when this activity is activated"
|
||||
msgstr ""
|
||||
msgstr "De te versturen e-mail wanneer deze activiteit wordt geactiveerd."
|
||||
|
||||
#. module: marketing_campaign
|
||||
#: view:marketing.campaign.segment:0
|
||||
|
@ -528,6 +532,22 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Click to create a marketing campaign.\n"
|
||||
" </p><p>\n"
|
||||
" OpenERP's marketing campagne geeft u de mogelijkheid om de "
|
||||
"communicatie met uw\n"
|
||||
" prospects te automatiseren. U kunt een segment (een set van "
|
||||
"condities) definiëren bij uw\n"
|
||||
" leads en relaties om de campagne te volbrengen.\n"
|
||||
" </p><p>\n"
|
||||
" Een campagne kan meerdere activiteiten hebben, zoals het "
|
||||
"versturen van een e-mail,\n"
|
||||
" het afdrukken van een brief of het toewijzen aan een team. Deze "
|
||||
"activiteiten worden geactiveerd\n"
|
||||
" op basis van specifieke situaties.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: marketing_campaign
|
||||
#: field:marketing.campaign.transition,interval_nbr:0
|
||||
|
@ -1094,6 +1114,7 @@ msgstr ""
|
|||
#, python-format
|
||||
msgid "The campaign cannot be started. There are no activities in it."
|
||||
msgstr ""
|
||||
"De campagne kan niet worden gestart. De campagne bevat geen activiteiten."
|
||||
|
||||
#. module: marketing_campaign
|
||||
#: field:marketing.campaign.segment,date_next_sync:0
|
||||
|
@ -1105,6 +1126,8 @@ msgstr "Volgende synchronisatie"
|
|||
msgid ""
|
||||
"Hi, we are delighted to welcome you among our Silver Partners as of today!"
|
||||
msgstr ""
|
||||
"Hallo, we zijn verheugt om je te kunnen melden dat je bent toegetreden tot "
|
||||
"de groep van Silver partners."
|
||||
|
||||
#. module: marketing_campaign
|
||||
#: field:marketing.campaign.segment,ir_filter_id:0
|
||||
|
|
|
@ -158,6 +158,7 @@
|
|||
<record id="view_res_partner_member_filter" model="ir.ui.view">
|
||||
<field name="name">res.partner.select</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="priority">50</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Membership Partners">
|
||||
<field name="membership_start" invisible="1"/>
|
||||
|
|
|
@ -497,9 +497,9 @@ class pos_order(osv.osv):
|
|||
'user_id': order['user_id'] or False,
|
||||
'session_id': order['pos_session_id'],
|
||||
'lines': order['lines'],
|
||||
'pos_reference':order['name']
|
||||
'pos_reference':order['name'],
|
||||
'partner_id': order.get('partner_id', False)
|
||||
}, context)
|
||||
|
||||
for payments in order['statement_ids']:
|
||||
payment = payments[2]
|
||||
self.add_payment(cr, uid, order_id, {
|
||||
|
|
|
@ -27,7 +27,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
|
|||
|
||||
this.connection = new instance.web.JsonRPC();
|
||||
this.connection.setup(url);
|
||||
|
||||
this.connection.session_id = _.uniqueId('posproxy');
|
||||
this.bypass_proxy = false;
|
||||
this.notifications = {};
|
||||
|
||||
|
@ -437,7 +437,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
|
|||
|
||||
// The barcode readers acts as a keyboard, we catch all keyup events and try to find a
|
||||
// barcode sequence in the typed keys, then act accordingly.
|
||||
$('body').delegate('','keyup', function (e){
|
||||
$('body').delegate('','keypress', function (e){
|
||||
//console.log('keyup:'+String.fromCharCode(e.keyCode)+' '+e.keyCode,e);
|
||||
//We only care about numbers
|
||||
if (e.keyCode >= 48 && e.keyCode < 58){
|
||||
|
|
|
@ -787,7 +787,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
|
|||
lines: orderLines,
|
||||
statement_ids: paymentLines,
|
||||
pos_session_id: this.pos.get('pos_session').id,
|
||||
partner_id: this.pos.get('client') ? this.pos.get('client').id : undefined,
|
||||
partner_id: this.get('client') ? this.get('client').id : undefined,
|
||||
user_id: this.pos.get('cashier') ? this.pos.get('cashier').id : this.pos.get('user').id,
|
||||
};
|
||||
},
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
# German translation for openobject-addons
|
||||
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2013-09-02 10:44+0000\n"
|
||||
"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
|
||||
"Language-Team: German <de@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: portal_anonymous
|
||||
#. openerp-web
|
||||
#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
|
||||
#, python-format
|
||||
msgid "Login"
|
||||
msgstr "Anmelden"
|
|
@ -8,19 +8,19 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2012-12-21 23:00+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"PO-Revision-Date: 2013-09-02 11:37+0000\n"
|
||||
"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
|
||||
"Language-Team: German <de@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 06:14+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: portal_crm
|
||||
#: selection:portal_crm.crm_contact_us,type:0
|
||||
msgid "Lead"
|
||||
msgstr "Lead"
|
||||
msgstr "Interessent"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,title:0
|
||||
|
@ -30,17 +30,17 @@ msgstr "Anrede"
|
|||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,probability:0
|
||||
msgid "Success Rate (%)"
|
||||
msgstr "Erfolgsquote (%)"
|
||||
msgstr "Erfolgsrate (%)"
|
||||
|
||||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
msgid "Contact us"
|
||||
msgstr "Kontaktieren Sie uns!"
|
||||
msgstr "Kontakt"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,date_action:0
|
||||
msgid "Next Action Date"
|
||||
msgstr "Datum der nächsten Aktion"
|
||||
msgstr "Nächste Zahlungserinnerung"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,fax:0
|
||||
|
@ -50,7 +50,7 @@ msgstr "Fax"
|
|||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,zip:0
|
||||
msgid "Zip"
|
||||
msgstr "Plz"
|
||||
msgstr "PLZ"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,message_unread:0
|
||||
|
@ -70,9 +70,7 @@ msgstr "Verkäufer"
|
|||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
msgid "Thank you for your interest, we'll respond to your request shortly."
|
||||
msgstr ""
|
||||
"Danke für Ihre Anfrage, wir werden uns schnellstmöglich um Ihre Anfrage "
|
||||
"kümmern."
|
||||
msgstr "Danke für Ihre Anfrage, wir werden uns baldmöglichst darum kümmern."
|
||||
|
||||
#. module: portal_crm
|
||||
#: selection:portal_crm.crm_contact_us,priority:0
|
||||
|
@ -112,7 +110,7 @@ msgstr "Abgebrochen"
|
|||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,message_unread:0
|
||||
msgid "If checked new messages require your attention."
|
||||
msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln."
|
||||
msgstr "Falls aktiviert, sind neue Nachrichten abzuarbeiten."
|
||||
|
||||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,channel_id:0
|
||||
|
@ -152,7 +150,7 @@ msgstr "Partner"
|
|||
#. module: portal_crm
|
||||
#: model:ir.actions.act_window,name:portal_crm.action_contact_us
|
||||
msgid "Contact Us"
|
||||
msgstr "Kontaktieren Sie uns"
|
||||
msgstr "Kontakt"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,name:0
|
||||
|
@ -162,7 +160,7 @@ msgstr "Betreff"
|
|||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,opt_out:0
|
||||
msgid "Opt-Out"
|
||||
msgstr "Opt-Out"
|
||||
msgstr "Keine Werbe-E-Mails"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,priority:0
|
||||
|
@ -224,7 +222,7 @@ msgstr "Erstellungsdatum"
|
|||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
msgid "Content..."
|
||||
msgstr ""
|
||||
msgstr "Inhalt..."
|
||||
|
||||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,opt_out:0
|
||||
|
@ -233,11 +231,15 @@ msgid ""
|
|||
"mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
|
||||
"users to filter the leads when performing mass mailing."
|
||||
msgstr ""
|
||||
"Falls 'Keine Werbung' markiert ist, hat dieser Kontakt Massen-E-Mails und "
|
||||
"Marketingkampagnen abgelehnt. Durch den Filter 'Verfügbar für Massen-E-"
|
||||
"Mails' können diejenigen Interessenten angezeigt werden, die für Massen-E-"
|
||||
"Mails verfügbar sind."
|
||||
|
||||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,type:0
|
||||
msgid "Type is used to separate Leads and Opportunities"
|
||||
msgstr "Typ wird zur Unterscheidung von Leads und Opportunities verwendet."
|
||||
msgstr "Typ wird zur Unterscheidung von Interessenten und Chancen verwendet."
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,categ_ids:0
|
||||
|
@ -257,7 +259,7 @@ msgstr "Benutzername"
|
|||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,contact_name:0
|
||||
msgid "Contact Name"
|
||||
msgstr "Kontakt Name"
|
||||
msgstr "Ansprechpartner"
|
||||
|
||||
#. module: portal_crm
|
||||
#: model:ir.ui.menu,name:portal_crm.portal_company_contact
|
||||
|
@ -267,7 +269,7 @@ msgstr "Kontakt"
|
|||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
msgid "Your name..."
|
||||
msgstr ""
|
||||
msgstr "Ihr Name..."
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,partner_address_email:0
|
||||
|
@ -302,7 +304,7 @@ msgstr "Aktualisierungsdatum"
|
|||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
msgid "Your email..."
|
||||
msgstr ""
|
||||
msgstr "Ihre E-Mail..."
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,date_deadline:0
|
||||
|
@ -335,8 +337,8 @@ msgid ""
|
|||
"The name of the future partner company that will be created while converting "
|
||||
"the lead into opportunity"
|
||||
msgstr ""
|
||||
"Der Unternehmensname des zukünftigen Kunden, der bei der Umwandlung des "
|
||||
"Leads zur Opportunity übernommen wird."
|
||||
"Der Unternehmensname des Interessenten, der bei der Umwandlung des "
|
||||
"Interessenten zur Chance verwendet wird."
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,planned_cost:0
|
||||
|
@ -346,7 +348,7 @@ msgstr "Geschätzte Kosten"
|
|||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,date_deadline:0
|
||||
msgid "Estimate of the date on which the opportunity will be won."
|
||||
msgstr "Vorraussichtliches Abschlussdatum dieses Leads"
|
||||
msgstr "Voraussichtliches Abschlussdatum dieser Chance"
|
||||
|
||||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,email_cc:0
|
||||
|
@ -356,8 +358,8 @@ msgid ""
|
|||
"addresses with a comma"
|
||||
msgstr ""
|
||||
"Diese E-Mail Adressen werden automatisch dem CC-Feld aller ein- und "
|
||||
"ausgehenden Mails hinzugefügt. Trennen Sie mehrere E-Mail Adressen mit "
|
||||
"Kommas."
|
||||
"ausgehenden E-Mails hinzugefügt. Trennen Sie mehrere E-Mail-Adressen mit "
|
||||
"Kommata."
|
||||
|
||||
#. module: portal_crm
|
||||
#: selection:portal_crm.crm_contact_us,priority:0
|
||||
|
@ -373,7 +375,7 @@ msgstr "Abgeschlossen"
|
|||
#. module: portal_crm
|
||||
#: selection:portal_crm.crm_contact_us,state:0
|
||||
msgid "Pending"
|
||||
msgstr "Schwebend"
|
||||
msgstr "Ausstehend"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,state:0
|
||||
|
@ -388,7 +390,7 @@ msgstr "Normal"
|
|||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,email_cc:0
|
||||
msgid "Global CC"
|
||||
msgstr "Allgemeine CC"
|
||||
msgstr "Globale CC"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,street2:0
|
||||
|
@ -438,24 +440,24 @@ msgstr "Zusammenfassung"
|
|||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
msgid "Subject..."
|
||||
msgstr ""
|
||||
msgstr "Betreff..."
|
||||
|
||||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,section_id:0
|
||||
msgid ""
|
||||
"When sending mails, the default email address is taken from the sales team."
|
||||
msgstr ""
|
||||
"Für den Mailversand wird die Standardadresse des Verkaufsteams verwendet"
|
||||
"Für den E-Mail-Versand wird die Standardadresse des Verkaufsteams verwendet."
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,partner_address_name:0
|
||||
msgid "Partner Contact Name"
|
||||
msgstr "Partner Kontakt Name"
|
||||
msgstr "Partner Kontakt"
|
||||
|
||||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
msgid "Your phone number..."
|
||||
msgstr ""
|
||||
msgstr "Ihre Telefonnummer..."
|
||||
|
||||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
|
@ -465,7 +467,7 @@ msgstr "Schließen"
|
|||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,email_from:0
|
||||
msgid "Email address of the contact"
|
||||
msgstr "E-Mail Adresse des Kontakts"
|
||||
msgstr "E-Mail-Adresse des Kontakts"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,city:0
|
||||
|
@ -490,7 +492,7 @@ msgstr "Vermittelt durch"
|
|||
#. module: portal_crm
|
||||
#: selection:portal_crm.crm_contact_us,type:0
|
||||
msgid "Opportunity"
|
||||
msgstr "Opportunity"
|
||||
msgstr "Chance"
|
||||
|
||||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
|
@ -500,7 +502,7 @@ msgstr "Name"
|
|||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,country_id:0
|
||||
msgid "Country"
|
||||
msgstr "Land"
|
||||
msgstr "Staat"
|
||||
|
||||
#. module: portal_crm
|
||||
#: view:portal_crm.crm_contact_us:0
|
||||
|
@ -523,7 +525,7 @@ msgstr ""
|
|||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,message_ids:0
|
||||
msgid "Messages and communication history"
|
||||
msgstr "Nachrichten- und Kommunikations-Historie"
|
||||
msgstr "Nachrichten- und Kommunikationsverlauf"
|
||||
|
||||
#. module: portal_crm
|
||||
#: help:portal_crm.crm_contact_us,type_id:0
|
||||
|
@ -542,7 +544,7 @@ msgstr "Hoch"
|
|||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,section_id:0
|
||||
msgid "Sales Team"
|
||||
msgstr "Verkaufsteam"
|
||||
msgstr "Vertriebsteam"
|
||||
|
||||
#. module: portal_crm
|
||||
#: field:portal_crm.crm_contact_us,street:0
|
||||
|
@ -557,7 +559,7 @@ msgstr "Letzte Aktion"
|
|||
#. module: portal_crm
|
||||
#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
|
||||
msgid "Contact form for the portal"
|
||||
msgstr "Kontakt Formular für das Portal"
|
||||
msgstr "Kontaktformular für das Portal"
|
||||
|
||||
#~ msgid "Geo Latitude"
|
||||
#~ msgstr "Längengrad"
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2013-03-10 20:30+0000\n"
|
||||
"Last-Translator: krnkris <Unknown>\n"
|
||||
"PO-Revision-Date: 2013-09-03 12:29+0000\n"
|
||||
"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
|
||||
"Language-Team: Hungarian <hu@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 06:14+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: portal_hr_employees
|
||||
#: view:hr.employee:0
|
||||
|
@ -46,7 +46,7 @@ msgstr "Vállalat"
|
|||
#. module: portal_hr_employees
|
||||
#: view:hr.employee:0
|
||||
msgid "Mobile:"
|
||||
msgstr ""
|
||||
msgstr "Mobil:"
|
||||
|
||||
#. module: portal_hr_employees
|
||||
#: selection:hr.employee,visibility:0
|
||||
|
@ -114,4 +114,4 @@ msgstr ""
|
|||
#. module: portal_hr_employees
|
||||
#: view:hr.employee:0
|
||||
msgid "Tel:"
|
||||
msgstr ""
|
||||
msgstr "Tel:"
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2013-04-14 11:56+0000\n"
|
||||
"PO-Revision-Date: 2013-09-02 10:41+0000\n"
|
||||
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
|
||||
"Language-Team: Dutch <nl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 06:14+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: portal_sale
|
||||
#: model:ir.model,name:portal_sale.model_account_config_settings
|
||||
|
@ -193,8 +193,8 @@ msgstr ""
|
|||
"\n"
|
||||
" <p>Hallo ${object.partner_id.name},</p>\n"
|
||||
" \n"
|
||||
" <p>Hier is uw ${object.state in ('draft', 'sent') and 'quotation' or "
|
||||
"'order confirmation'} van ${object.company_id.name}: </p>\n"
|
||||
" <p>Hier is uw ${object.state in ('draft', 'sent') and 'offerte' or "
|
||||
"'orderbevestiging'} van ${object.company_id.name}: </p>\n"
|
||||
"\n"
|
||||
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
|
||||
" <strong>REFERENTIES</strong><br />\n"
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2013-07-18 21:01+0000\n"
|
||||
"Last-Translator: Claudio de Araujo Santos <Unknown>\n"
|
||||
"PO-Revision-Date: 2013-09-03 18:25+0000\n"
|
||||
"Last-Translator: Luis Felipe Miléo <Unknown>\n"
|
||||
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-19 06:36+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: product
|
||||
#: field:product.packaging,rows:0
|
||||
|
@ -2027,7 +2027,7 @@ msgstr "Mensagens"
|
|||
#. module: product
|
||||
#: model:product.uom,name:product.product_uom_unit
|
||||
msgid "Unit(s)"
|
||||
msgstr "Unidade(s)"
|
||||
msgstr "UN"
|
||||
|
||||
#. module: product
|
||||
#: code:addons/product/product.py:176
|
||||
|
|
|
@ -95,6 +95,7 @@ class product_pricelist(osv.osv):
|
|||
|
||||
_name = "product.pricelist"
|
||||
_description = "Pricelist"
|
||||
_order = 'name'
|
||||
_columns = {
|
||||
'name': fields.char('Pricelist Name',size=64, required=True, translate=True),
|
||||
'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the pricelist without removing it."),
|
||||
|
@ -113,6 +114,27 @@ class product_pricelist(osv.osv):
|
|||
result.append((pl.id,name))
|
||||
return result
|
||||
|
||||
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
|
||||
if name and operator == '=' and not args:
|
||||
# search on the name of the pricelist and its currency, opposite of name_get(),
|
||||
# Used by the magic context filter in the product search view.
|
||||
query_args = {'name': name, 'limit': limit}
|
||||
query = """SELECT p.id
|
||||
FROM product_pricelist p JOIN
|
||||
res_currency c ON (p.currency_id = c.id)
|
||||
WHERE p.name || ' (' || c.name || ')' = %(name)s
|
||||
ORDER BY p.name"""
|
||||
if limit:
|
||||
query += " LIMIT %(limit)s"
|
||||
cr.execute(query, query_args)
|
||||
ids = [r[0] for r in cr.fetchall()]
|
||||
# regular search() to apply ACLs - may limit results below limit in some cases
|
||||
ids = self.search(cr, uid, [('id', 'in', ids)], limit=limit, context=context)
|
||||
if ids:
|
||||
return self.name_get(cr, uid, ids, context)
|
||||
return super(product_pricelist, self).name_search(
|
||||
cr, uid, name, args, operator=operator, context=context, limit=limit)
|
||||
|
||||
|
||||
def _get_currency(self, cr, uid, ctx):
|
||||
comp = self.pool.get('res.users').browse(cr, uid, uid).company_id
|
||||
|
|
|
@ -420,6 +420,11 @@ class product_product(osv.osv):
|
|||
pricelist = context.get('pricelist', False)
|
||||
partner = context.get('partner', False)
|
||||
if pricelist:
|
||||
# Support context pricelists specified as display_name or ID for compatibility
|
||||
if isinstance(pricelist, basestring):
|
||||
pricelist_ids = self.pool.get('product.pricelist').name_search(
|
||||
cr, uid, pricelist, operator='=', context=context, limit=1)
|
||||
pricelist = pricelist_ids[0][0] if pricelist_ids else pricelist
|
||||
for id in ids:
|
||||
try:
|
||||
price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist], id, quantity, partner=partner, context=context)[pricelist]
|
||||
|
@ -751,7 +756,7 @@ class product_product(osv.osv):
|
|||
context = {}
|
||||
if context and context.get('search_default_categ_id', False):
|
||||
args.append((('categ_id', 'child_of', context['search_default_categ_id'])))
|
||||
return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False)
|
||||
return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
|
||||
|
||||
product_product()
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
|
||||
<field name="categ_id"/>
|
||||
<group expand="0" string="Context...">
|
||||
<field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
|
||||
<field name="pricelist_id" context="{'pricelist': self}" filter_domain="[]" groups="product.group_sale_pricelist"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<group expand='0' string='Group by...'>
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-08-08 10:20+0000\n"
|
||||
"PO-Revision-Date: 2013-09-04 06:51+0000\n"
|
||||
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
|
||||
"Language-Team: Dutch <nl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-08-09 05:35+0000\n"
|
||||
"X-Generator: Launchpad (build 16723)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-05 05:18+0000\n"
|
||||
"X-Generator: Launchpad (build 16758)\n"
|
||||
|
||||
#. module: project
|
||||
#: view:project.project:0
|
||||
|
@ -1322,7 +1322,7 @@ msgstr "%s (kopie)"
|
|||
#. module: project
|
||||
#: model:mail.message.subtype,name:project.mt_project_task_stage
|
||||
msgid "Task Stage Changed"
|
||||
msgstr "Taakstadium gewijzigd"
|
||||
msgstr "Fase taak gewijzigd"
|
||||
|
||||
#. module: project
|
||||
#: view:project.task:0
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-04-28 07:41+0000\n"
|
||||
"PO-Revision-Date: 2013-09-09 12:30+0000\n"
|
||||
"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
|
||||
"Language-Team: Turkish <tr@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 06:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-10 05:23+0000\n"
|
||||
"X-Generator: Launchpad (build 16761)\n"
|
||||
|
||||
#. module: project
|
||||
#: view:project.project:0
|
||||
|
@ -1962,7 +1962,7 @@ msgstr "Projeler"
|
|||
#. module: project
|
||||
#: model:res.groups,name:project.group_tasks_work_on_tasks
|
||||
msgid "Task's Work on Tasks"
|
||||
msgstr ""
|
||||
msgstr "Görevlerdeki Görev İşleri"
|
||||
|
||||
#. module: project
|
||||
#: help:project.task.delegate,name:0
|
||||
|
|
|
@ -736,6 +736,16 @@ class task(base_stage, osv.osv):
|
|||
new_name = _("%s (copy)") % (default.get('name', ''))
|
||||
default.update({'name':new_name})
|
||||
return super(task, self).copy_data(cr, uid, id, default, context)
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if default is None:
|
||||
default = {}
|
||||
stage = self._get_default_stage_id(cr, uid, context=context)
|
||||
if stage:
|
||||
default['stage_id'] = stage
|
||||
return super(task, self).copy(cr, uid, id, default, context)
|
||||
|
||||
def _is_template(self, cr, uid, ids, field_name, arg, context=None):
|
||||
res = {}
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
<field eval=""""Procurement Task"""" name="name"/>
|
||||
<field eval=""""if product type is 'service' then it creates the task."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
|
||||
<field model="process.node" name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
|
||||
<field model="process.node" name="source_node_id" ref="mrp.process_node_productionorder0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_createtask0" model="process.transition">
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-04-30 16:28+0000\n"
|
||||
"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
|
||||
"PO-Revision-Date: 2013-09-04 08:24+0000\n"
|
||||
"Last-Translator: Eimis <eimislap@gmail.com>\n"
|
||||
"Language-Team: Lithuanian <lt@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 06:19+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-05 05:18+0000\n"
|
||||
"X-Generator: Launchpad (build 16758)\n"
|
||||
|
||||
#. module: purchase
|
||||
#: model:res.groups,name:purchase.group_analytic_accounting
|
||||
|
@ -25,7 +25,7 @@ msgstr "Pirkimų analitinė apskaita"
|
|||
#. module: purchase
|
||||
#: model:ir.model,name:purchase.model_account_config_settings
|
||||
msgid "account.config.settings"
|
||||
msgstr ""
|
||||
msgstr "account.config.settings"
|
||||
|
||||
#. module: purchase
|
||||
#: view:board.board:0
|
||||
|
@ -134,7 +134,7 @@ msgstr "Pirkimo kaina-Savikaina"
|
|||
#: code:addons/purchase/purchase.py:1037
|
||||
#, python-format
|
||||
msgid "No supplier defined for this product !"
|
||||
msgstr ""
|
||||
msgstr "Šiam produktui nenustatytas tiekėjas!"
|
||||
|
||||
#. module: purchase
|
||||
#: help:res.company,po_lead:0
|
||||
|
|
|
@ -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: 2013-08-30 05:24+0000\n"
|
||||
"X-Launchpad-Export-Date: 2013-08-31 05:28+0000\n"
|
||||
"X-Generator: Launchpad (build 16750)\n"
|
||||
|
||||
#. module: sale
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-06-20 12:15+0000\n"
|
||||
"PO-Revision-Date: 2013-09-02 10:40+0000\n"
|
||||
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
|
||||
"Language-Team: Dutch <nl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 06:21+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: sale
|
||||
#: model:ir.model,name:sale.model_account_config_settings
|
||||
|
@ -1658,8 +1658,8 @@ msgstr ""
|
|||
"\n"
|
||||
" <p>Hallo ${object.partner_id.name},</p>\n"
|
||||
" \n"
|
||||
" <p>Hier is uw ${object.state in ('draft', 'sent') and 'quotation' or "
|
||||
"'order confirmation'} van ${object.company_id.name}: </p>\n"
|
||||
" <p>Hier is uw ${object.state in ('draft', 'sent') and 'offerte' or "
|
||||
"'orderbevestiging'} van ${object.company_id.name}: </p>\n"
|
||||
"\n"
|
||||
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
|
||||
" <strong>REFERENTIE</strong><br />\n"
|
||||
|
|
|
@ -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: 2013-08-30 05:24+0000\n"
|
||||
"X-Launchpad-Export-Date: 2013-08-31 05:28+0000\n"
|
||||
"X-Generator: Launchpad (build 16750)\n"
|
||||
|
||||
#. module: sale
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:36+0000\n"
|
||||
"PO-Revision-Date: 2013-08-29 00:53+0000\n"
|
||||
"PO-Revision-Date: 2013-09-07 07:19+0000\n"
|
||||
"Last-Translator: youring <youring@gmail.com>\n"
|
||||
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-08-30 05:24+0000\n"
|
||||
"X-Generator: Launchpad (build 16750)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-08 05:03+0000\n"
|
||||
"X-Generator: Launchpad (build 16760)\n"
|
||||
|
||||
#. module: sale
|
||||
#: model:ir.model,name:sale.model_account_config_settings
|
||||
|
@ -265,7 +265,7 @@ msgstr "折扣(%)"
|
|||
#. module: sale
|
||||
#: view:sale.order.line.make.invoice:0
|
||||
msgid "Create & View Invoice"
|
||||
msgstr "创建和查看发票"
|
||||
msgstr "生成并查看发票"
|
||||
|
||||
#. module: sale
|
||||
#: view:board.board:0
|
||||
|
@ -774,7 +774,7 @@ msgstr "已送货"
|
|||
#. module: sale
|
||||
#: view:sale.advance.payment.inv:0
|
||||
msgid "Create and View Invoice"
|
||||
msgstr "创建和查看发票"
|
||||
msgstr "生成并查看发票"
|
||||
|
||||
#. module: sale
|
||||
#: report:sale.order:0
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2013-08-14 01:39+0000\n"
|
||||
"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
|
||||
"PO-Revision-Date: 2013-09-07 07:15+0000\n"
|
||||
"Last-Translator: youring <youring@gmail.com>\n"
|
||||
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-08-15 05:51+0000\n"
|
||||
"X-Generator: Launchpad (build 16723)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-08 05:03+0000\n"
|
||||
"X-Generator: Launchpad (build 16760)\n"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,group_invoice_deli_orders:0
|
||||
|
@ -219,7 +219,7 @@ msgstr "转移给客户的单据"
|
|||
#. module: sale_stock
|
||||
#: view:sale.order:0
|
||||
msgid "View Delivery Order"
|
||||
msgstr "发运单视图"
|
||||
msgstr "查看出货单"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.order.line,move_ids:0
|
||||
|
|
|
@ -2063,7 +2063,10 @@ class stock_move(osv.osv):
|
|||
ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
|
||||
if picking:
|
||||
# name of new picking according to its type
|
||||
new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype)
|
||||
if ptype == 'internal':
|
||||
new_pick_name = seq_obj.get(cr, uid,'stock.picking')
|
||||
else :
|
||||
new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype)
|
||||
pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context)
|
||||
# Need to check name of old picking because it always considers picking as "OUT" when created from Sales Order
|
||||
old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id)
|
||||
|
@ -2955,8 +2958,8 @@ class stock_warehouse(osv.osv):
|
|||
|
||||
def _default_lot_output_id(self, cr, uid, context=None):
|
||||
try:
|
||||
lot_input_stock_model, lot_input_stock_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_output')
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [lot_input_stock_id], 'read', context=context)
|
||||
lot_output_model, lot_output_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_output')
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [lot_output_id], 'read', context=context)
|
||||
except (ValueError, orm.except_orm):
|
||||
# the user does not have read access on the location or it does not exists
|
||||
lot_output_id = False
|
||||
|
@ -3009,6 +3012,14 @@ class stock_picking_in(osv.osv):
|
|||
"""Post the message on stock.picking to be able to see it in the form view when using the chatter"""
|
||||
return self.pool.get('stock.picking').message_post(*args, **kwargs)
|
||||
|
||||
def message_subscribe(self, *args, **kwargs):
|
||||
"""Send the subscribe action on stock.picking model as it uses _name in request"""
|
||||
return self.pool.get('stock.picking').message_subscribe(*args, **kwargs)
|
||||
|
||||
def message_unsubscribe(self, *args, **kwargs):
|
||||
"""Send the unsubscribe action on stock.picking model to match with subscribe"""
|
||||
return self.pool.get('stock.picking').message_unsubscribe(*args, **kwargs)
|
||||
|
||||
_columns = {
|
||||
'backorder_id': fields.many2one('stock.picking.in', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
|
||||
'state': fields.selection(
|
||||
|
@ -3064,6 +3075,14 @@ class stock_picking_out(osv.osv):
|
|||
"""Post the message on stock.picking to be able to see it in the form view when using the chatter"""
|
||||
return self.pool.get('stock.picking').message_post(*args, **kwargs)
|
||||
|
||||
def message_subscribe(self, *args, **kwargs):
|
||||
"""Send the subscribe action on stock.picking model as it uses _name in request"""
|
||||
return self.pool.get('stock.picking').message_subscribe(*args, **kwargs)
|
||||
|
||||
def message_unsubscribe(self, *args, **kwargs):
|
||||
"""Send the unsubscribe action on stock.picking model to match with subscribe"""
|
||||
return self.pool.get('stock.picking').message_unsubscribe(*args, **kwargs)
|
||||
|
||||
_columns = {
|
||||
'backorder_id': fields.many2one('stock.picking.out', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
|
||||
'state': fields.selection(
|
||||
|
|
|
@ -162,13 +162,15 @@ class stock_return_picking(osv.osv_memory):
|
|||
returned_lines = 0
|
||||
|
||||
# Create new picking for returned products
|
||||
|
||||
seq_obj_name = 'stock.picking'
|
||||
new_type = 'internal'
|
||||
if pick.type =='out':
|
||||
new_type = 'in'
|
||||
seq_obj_name = 'stock.picking.in'
|
||||
elif pick.type =='in':
|
||||
new_type = 'out'
|
||||
else:
|
||||
new_type = 'internal'
|
||||
seq_obj_name = 'stock.picking.' + new_type
|
||||
seq_obj_name = 'stock.picking.out'
|
||||
new_pick_name = self.pool.get('ir.sequence').get(cr, uid, seq_obj_name)
|
||||
new_picking = pick_obj.copy(cr, uid, pick.id, {
|
||||
'name': _('%s-%s-return') % (new_pick_name, pick.name),
|
||||
|
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2013-06-07 19:37+0000\n"
|
||||
"PO-Revision-Date: 2013-06-26 12:59+0000\n"
|
||||
"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
|
||||
"PO-Revision-Date: 2013-09-03 21:29+0000\n"
|
||||
"Last-Translator: Ronald Portier (Therp) <ronald@therp.nl>\n"
|
||||
"Language-Team: Dutch <nl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-07-11 06:25+0000\n"
|
||||
"X-Generator: Launchpad (build 16696)\n"
|
||||
"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n"
|
||||
"X-Generator: Launchpad (build 16753)\n"
|
||||
|
||||
#. module: survey
|
||||
#: view:survey.response.line:0
|
||||
|
@ -439,9 +439,9 @@ msgstr ""
|
|||
"U kunt naar de enquête gaan met de volgende parameters:\n"
|
||||
"URL: %s\n"
|
||||
"\n"
|
||||
" Uw login ID: %%(login)\n"
|
||||
" Uw login ID: %%(login)s\n"
|
||||
"\n"
|
||||
" Uw wachtwoord: %%(passwd)\n"
|
||||
" Uw wachtwoord: %%(passwd)s\n"
|
||||
"\n"
|
||||
"\n"
|
||||
"\n"
|
||||
|
|
Loading…
Reference in New Issue