[MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130531054741-r32kszp0mqvw474x
This commit is contained in:
Paramjit Singh Sahota
commit
2d5d0b116d
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
|
||||
"PO-Revision-Date: 2013-03-14 06:41+0000\n"
|
||||
"PO-Revision-Date: 2013-05-29 13:04+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-03-16 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-30 05:45+0000\n"
|
||||
"X-Generator: Launchpad (build 16652)\n"
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
|
||||
|
|
@ -7386,7 +7386,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
|
||||
|
|
@ -7415,7 +7415,7 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account.action_invoice_tree1
|
||||
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
|
||||
msgid "Customer Invoices"
|
||||
msgstr "Счета клиенту"
|
||||
msgstr "Счета заказчику"
|
||||
|
||||
#. module: account
|
||||
#: view:account.tax:0
|
||||
|
|
@ -10543,7 +10543,7 @@ msgstr "Состояние счета - сделано"
|
|||
#. module: account
|
||||
#: field:account.config.settings,module_account_followup:0
|
||||
msgid "Manage customer payment follow-ups"
|
||||
msgstr ""
|
||||
msgstr "Управление напоминаниями заказчикам об оплатах"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_report_account_sales
|
||||
|
|
@ -11037,7 +11037,7 @@ msgstr "Счет расходов по шаблону ТМЦ"
|
|||
#. module: account
|
||||
#: field:res.partner,property_payment_term:0
|
||||
msgid "Customer Payment Term"
|
||||
msgstr ""
|
||||
msgstr "Срок платежа заказчика"
|
||||
|
||||
#. module: account
|
||||
#: help:accounting.report,label_filter:0
|
||||
|
|
|
|||
|
|
@ -338,4 +338,10 @@ class account_config_settings(osv.osv_memory):
|
|||
dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')
|
||||
dp.write({'digits': config.decimal_precision})
|
||||
|
||||
def onchange_analytic_accounting(self, cr, uid, ids, analytic_accounting, context=None):
|
||||
if analytic_accounting:
|
||||
return {'value': {
|
||||
'module_account_accountant': True,
|
||||
}}
|
||||
return {}
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
<label for="module_account_accountant"/>
|
||||
</div>
|
||||
<div>
|
||||
<field name="group_analytic_accounting" class="oe_inline"/>
|
||||
<field name="group_analytic_accounting" class="oe_inline" on_change="onchange_analytic_accounting(group_analytic_accounting, context)"/>
|
||||
<label for="group_analytic_accounting"/>
|
||||
</div>
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -478,7 +478,7 @@ class account_analytic_account(osv.osv):
|
|||
'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
|
||||
help="Computed using the formula: Maximum Time - Total Worked Time"),
|
||||
'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time',
|
||||
help="Computed using the formula: Maximum Time - Total Invoiced Time"),
|
||||
help="Computed using the formula: Expected on timesheets - Total invoiced on timesheets"),
|
||||
'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time',
|
||||
help="Sum of quotations for this contract."),
|
||||
'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time',
|
||||
|
|
|
|||
|
|
@ -7,24 +7,24 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
|
||||
"PO-Revision-Date: 2012-05-10 17:46+0000\n"
|
||||
"PO-Revision-Date: 2013-05-29 13:17+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-03-16 05:33+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-30 05:45+0000\n"
|
||||
"X-Generator: Launchpad (build 16652)\n"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.bank.statement.line,voucher_id:0
|
||||
msgid "Reconciliation"
|
||||
msgstr ""
|
||||
msgstr "Сверка"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_config_settings
|
||||
msgid "account.config.settings"
|
||||
msgstr ""
|
||||
msgstr "account.config.settings"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:369
|
||||
|
|
@ -45,7 +45,7 @@ msgstr "Общая сумма"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Customer Journal Entries"
|
||||
msgstr ""
|
||||
msgstr "Открыть записи журнала по заказчику"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -63,7 +63,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "(Update)"
|
||||
msgstr ""
|
||||
msgstr "(Обновить)"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -90,7 +90,7 @@ msgstr "Март"
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,message_unread:0
|
||||
msgid "Unread Messages"
|
||||
msgstr ""
|
||||
msgstr "Непрочитанные"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -115,13 +115,13 @@ msgstr "Номер транзакции."
|
|||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
msgid "Group by year of Invoice Date"
|
||||
msgstr ""
|
||||
msgstr "Группировать по году в дате счета"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,user_id:0
|
||||
msgid "Salesperson"
|
||||
msgstr ""
|
||||
msgstr "Продавец"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -135,6 +135,8 @@ msgid ""
|
|||
"You can not change the journal as you already reconciled some statement "
|
||||
"lines!"
|
||||
msgstr ""
|
||||
"Вы не можете изменить журнал, так как вы уже сверили некоторые позиции "
|
||||
"документа!"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -145,7 +147,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
|
||||
|
|
@ -167,7 +169,7 @@ msgstr "Искать ваучеры"
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,writeoff_acc_id:0
|
||||
msgid "Counterpart Account"
|
||||
msgstr ""
|
||||
msgstr "Корреспондирующий счет"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,account_id:0
|
||||
|
|
@ -189,7 +191,7 @@ msgstr "OK"
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher.line,reconcile:0
|
||||
msgid "Full Reconcile"
|
||||
msgstr ""
|
||||
msgstr "Полная сверка"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,date_due:0
|
||||
|
|
@ -207,7 +209,7 @@ msgstr "Примечания"
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,message_ids:0
|
||||
msgid "Messages"
|
||||
msgstr ""
|
||||
msgstr "Сообщения"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
|
||||
|
|
@ -225,7 +227,7 @@ msgstr "Элемент журнала"
|
|||
#: code:addons/account_voucher/account_voucher.py:981
|
||||
#, python-format
|
||||
msgid "Error!"
|
||||
msgstr ""
|
||||
msgstr "Ошибка!"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,amount:0
|
||||
|
|
@ -235,7 +237,7 @@ msgstr "Суммма"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Options"
|
||||
msgstr ""
|
||||
msgstr "Варианты оплаты"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -254,6 +256,8 @@ msgstr "Отменено"
|
|||
msgid ""
|
||||
"You have to configure account base code and account tax code on the '%s' tax!"
|
||||
msgstr ""
|
||||
"Вы должны настроить код базового счета и код налогового счета для налога "
|
||||
"'%s'!"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
|
||||
|
|
@ -271,7 +275,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: help:account.voucher,message_unread:0
|
||||
msgid "If checked new messages require your attention."
|
||||
msgstr ""
|
||||
msgstr "Если отмечено, новые сообщения требуют вашего внимания."
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_bank_statement_line
|
||||
|
|
@ -294,12 +298,12 @@ msgstr "Налог"
|
|||
#: code:addons/account_voucher/account_voucher.py:879
|
||||
#, python-format
|
||||
msgid "Invalid Action!"
|
||||
msgstr ""
|
||||
msgstr "Неверное действие!"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,comment:0
|
||||
msgid "Counterpart Comment"
|
||||
msgstr ""
|
||||
msgstr "Корреспондирующий коментарий"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,account_analytic_id:0
|
||||
|
|
@ -312,6 +316,8 @@ msgid ""
|
|||
"Holds the Chatter summary (number of messages, ...). This summary is "
|
||||
"directly in html format in order to be inserted in kanban views."
|
||||
msgstr ""
|
||||
"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
|
||||
"html для возможности использования в канбан виде"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -326,7 +332,7 @@ msgstr "Информация о платеже"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "(update)"
|
||||
msgstr ""
|
||||
msgstr "(обновить)"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -395,7 +401,7 @@ msgstr "Ваучер поставщика"
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,message_follower_ids:0
|
||||
msgid "Followers"
|
||||
msgstr ""
|
||||
msgstr "Подписчики"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher.line,type:0
|
||||
|
|
@ -406,7 +412,7 @@ msgstr "Дебет"
|
|||
#: code:addons/account_voucher/account_voucher.py:1547
|
||||
#, python-format
|
||||
msgid "Unable to change journal !"
|
||||
msgstr ""
|
||||
msgstr "Невозможно изменить журнал!"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
|
|
@ -446,7 +452,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
msgstr "Открыть журнал проводок по поставщику"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
|
||||
|
|
@ -461,7 +467,7 @@ msgstr "Памятка"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Are you sure to unreconcile and cancel this record ?"
|
||||
msgstr ""
|
||||
msgstr "Вы уверены, что надо отменить сверку и саму запись ?"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,is_multi_currency:0
|
||||
|
|
@ -494,13 +500,13 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,writeoff_amount:0
|
||||
msgid "Difference Amount"
|
||||
msgstr ""
|
||||
msgstr "Сумма разницы"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
#: field:sale.receipt.report,due_delay:0
|
||||
msgid "Avg. Due Delay"
|
||||
msgstr ""
|
||||
msgstr "Средн. задержка"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/invoice.py:34
|
||||
|
|
@ -554,7 +560,7 @@ msgstr "Оплаченная сумма"
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,payment_option:0
|
||||
msgid "Payment Difference"
|
||||
msgstr ""
|
||||
msgstr "Оплата разницы"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -568,7 +574,7 @@ msgstr "Для проверки"
|
|||
#: code:addons/account_voucher/account_voucher.py:1194
|
||||
#, python-format
|
||||
msgid "change"
|
||||
msgstr ""
|
||||
msgstr "изменить"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:1014
|
||||
|
|
@ -599,7 +605,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.invoice:0
|
||||
msgid "Register Payment"
|
||||
msgstr ""
|
||||
msgstr "Регистрация оплаты"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.statement.from.invoice.lines,line_ids:0
|
||||
|
|
@ -614,7 +620,7 @@ msgstr "декабрём"
|
|||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
msgid "Group by month of Invoice Date"
|
||||
msgstr ""
|
||||
msgstr "Группировать по месяцу даты счета"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
|
|
@ -647,7 +653,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Are you sure to unreconcile this record?"
|
||||
msgstr ""
|
||||
msgstr "Вы уверены в отмене сверки"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,company_id:0
|
||||
|
|
@ -665,13 +671,13 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: selection:account.voucher,payment_option:0
|
||||
msgid "Reconcile Payment Balance"
|
||||
msgstr ""
|
||||
msgstr "Сверка платежного баланса"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:975
|
||||
#, python-format
|
||||
msgid "Configuration Error !"
|
||||
msgstr ""
|
||||
msgstr "Ошибка конфигурации !"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -695,18 +701,18 @@ msgstr ""
|
|||
#: field:account.voucher,state:0
|
||||
#: view:sale.receipt.report:0
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
msgstr "Статус"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Allocation"
|
||||
msgstr ""
|
||||
msgstr "Распределение"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice.lines:0
|
||||
#: view:account.voucher:0
|
||||
msgid "or"
|
||||
msgstr ""
|
||||
msgstr "или"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
|
|
@ -716,7 +722,7 @@ msgstr "Август"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Validate Payment"
|
||||
msgstr ""
|
||||
msgstr "Утвердить оплату"
|
||||
|
||||
#. module: account_voucher
|
||||
#: help:account.voucher,audit:0
|
||||
|
|
@ -724,6 +730,8 @@ msgid ""
|
|||
"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."
|
||||
msgstr ""
|
||||
"Отметьте, если вы не уверены в этой проводке журнала и хотите отметить её "
|
||||
"\"для проверки\" опытному бухгалтеру."
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
|
|
@ -734,7 +742,7 @@ msgstr "Октябрь"
|
|||
#: code:addons/account_voucher/account_voucher.py:976
|
||||
#, python-format
|
||||
msgid "Please activate the sequence of selected journal !"
|
||||
msgstr ""
|
||||
msgstr "Пожалуйста, включите нумерацию выбранного журнала!"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
|
|
@ -749,7 +757,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,paid:0
|
||||
msgid "Paid"
|
||||
msgstr ""
|
||||
msgstr "Оплачено"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
|
||||
|
|
@ -760,7 +768,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,message_is_follower:0
|
||||
msgid "Is a Follower"
|
||||
msgstr ""
|
||||
msgstr "Подписан"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,analytic_id:0
|
||||
|
|
@ -787,7 +795,7 @@ msgstr "Расширенные фильтры..."
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,paid_amount_in_company_currency:0
|
||||
msgid "Paid Amount in Company Currency"
|
||||
msgstr ""
|
||||
msgstr "Оплаченная сумма в валюте компании"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.bank.statement.line,amount_reconciled:0
|
||||
|
|
@ -814,7 +822,7 @@ msgstr "Предыдущие платежи ?"
|
|||
#: code:addons/account_voucher/account_voucher.py:1112
|
||||
#, python-format
|
||||
msgid "The invoice you are willing to pay is not valid anymore."
|
||||
msgstr ""
|
||||
msgstr "Счет, который вы готовы платить, уже не актуален ."
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:sale.receipt.report,month:0
|
||||
|
|
@ -830,30 +838,30 @@ msgstr "Журнал ваучеров"
|
|||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_res_company
|
||||
msgid "Companies"
|
||||
msgstr ""
|
||||
msgstr "Компании"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,message_summary:0
|
||||
msgid "Summary"
|
||||
msgstr ""
|
||||
msgstr "Итог"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,active:0
|
||||
msgid "Active"
|
||||
msgstr ""
|
||||
msgstr "Активно"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:982
|
||||
#, python-format
|
||||
msgid "Please define a sequence on the journal."
|
||||
msgstr ""
|
||||
msgstr "Пожалуйста, определите нумерацию журнала."
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
|
||||
#: 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
|
||||
|
|
@ -865,7 +873,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:sale.receipt.report:0
|
||||
msgid "Group by Invoice Date"
|
||||
msgstr ""
|
||||
msgstr "Группировать по дате счета"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ from openerp.tools import mute_logger
|
|||
# Validation Library https://pypi.python.org/pypi/validate_email/1.1
|
||||
from .validate_email import validate_email
|
||||
|
||||
import openerp
|
||||
from openerp.osv import osv, orm
|
||||
from openerp.osv import fields
|
||||
from openerp.osv.orm import browse_record
|
||||
|
|
@ -101,14 +102,26 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
'current_line_id': fields.many2one('base.partner.merge.line', 'Current Line'),
|
||||
'line_ids': fields.one2many('base.partner.merge.line', 'wizard_id', 'Lines'),
|
||||
'partner_ids': fields.many2many('res.partner', string='Contacts'),
|
||||
'dst_partner_id': fields.many2one('res.partner', string='Destination Contact'),
|
||||
|
||||
'exclude_contact': fields.boolean('A user associated to the contact'),
|
||||
'exclude_journal_item': fields.boolean('Journal Items associated to the contact'),
|
||||
'maximum_group': fields.integer("Maximum of Group of Contacts"),
|
||||
}
|
||||
|
||||
def default_get(self, cr, uid, fields, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
res = super(MergePartnerAutomatic, self).default_get(cr, uid, fields, context)
|
||||
if context.get('active_model') == 'res.partner' and context.get('active_ids'):
|
||||
partner_ids = context['active_ids']
|
||||
res['state'] = 'selection'
|
||||
res['partner_ids'] = partner_ids
|
||||
res['dst_partner_id'] = self._get_ordered_partner(cr, uid, partner_ids, context=context)[-1].id
|
||||
return res
|
||||
|
||||
_defaults = {
|
||||
'state': 'option',
|
||||
'state': 'option'
|
||||
}
|
||||
|
||||
def get_fk_on(self, cr, table):
|
||||
|
|
@ -204,8 +217,8 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
if proxy is None:
|
||||
return
|
||||
domain = [(field_model, '=', 'res.partner'), (field_id, '=', src.id)]
|
||||
ids = proxy.search(cr, uid, domain, context=context)
|
||||
return proxy.write(cr, uid, ids, {field_id: dst_partner.id}, context=context)
|
||||
ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
|
||||
return proxy.write(cr, openerp.SUPERUSER_ID, ids, {field_id: dst_partner.id}, context=context)
|
||||
|
||||
update_records = functools.partial(update_records, context=context)
|
||||
|
||||
|
|
@ -219,9 +232,9 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
|
||||
proxy = self.pool['ir.model.fields']
|
||||
domain = [('ttype', '=', 'reference')]
|
||||
record_ids = proxy.search(cr, uid, domain, context=context)
|
||||
record_ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
|
||||
|
||||
for record in proxy.browse(cr, uid, record_ids, context=context):
|
||||
for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context):
|
||||
proxy_model = self.pool[record.model]
|
||||
|
||||
field_type = proxy_model._columns.get(record.name).__class__._type
|
||||
|
|
@ -233,11 +246,11 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
domain = [
|
||||
(record.name, '=', 'res.partner,%d' % partner.id)
|
||||
]
|
||||
model_ids = proxy_model.search(cr, uid, domain, context=context)
|
||||
model_ids = proxy_model.search(cr, openerp.SUPERUSER_ID, domain, context=context)
|
||||
values = {
|
||||
record.name: 'res.partner,%d' % dst_partner.id,
|
||||
}
|
||||
proxy_model.write(cr, uid, model_ids, values, context=context)
|
||||
proxy_model.write(cr, openerp.SUPERUSER_ID, model_ids, values, context=context)
|
||||
|
||||
def _update_values(self, cr, uid, src_partners, dst_partner, context=None):
|
||||
_logger.debug('_update_values for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
|
||||
|
|
@ -266,22 +279,31 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
_logger.info('Skip recursive partner hierarchies for parent_id %s of partner: %s', parent_id, dst_partner.id)
|
||||
|
||||
@mute_logger('openerp.osv.expression', 'openerp.osv.orm')
|
||||
def _merge(self, cr, uid, partner_ids, context=None):
|
||||
def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None):
|
||||
proxy = self.pool.get('res.partner')
|
||||
|
||||
partner_ids = proxy.exists(cr, uid, list(partner_ids), context=context)
|
||||
if len(partner_ids) < 2:
|
||||
return
|
||||
|
||||
partners = proxy.browse(cr, uid, list(partner_ids), context=context)
|
||||
ordered_partners = sorted(sorted(partners,
|
||||
key=operator.attrgetter('create_date'), reverse=True),
|
||||
key=operator.attrgetter('active'), reverse=True)
|
||||
if len(partner_ids) > 3:
|
||||
raise osv.except_osv(_('Error'), _("For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."))
|
||||
|
||||
dst_partner = ordered_partners[-1]
|
||||
src_partners = ordered_partners[:-1]
|
||||
if openerp.SUPERUSER_ID != uid and len(set(partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context))) > 1:
|
||||
raise osv.except_osv(_('Error'), _("All contacts must have the same email. Only the Administrator can merge contacts with different emails."))
|
||||
|
||||
if dst_partner and dst_partner.id in partner_ids:
|
||||
src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context)
|
||||
else:
|
||||
ordered_partners = self._get_ordered_partner(cr, uid, partner_ids, context)
|
||||
dst_partner = ordered_partners[-1]
|
||||
src_partners = ordered_partners[:-1]
|
||||
_logger.info("dst_partner: %s", dst_partner.id)
|
||||
|
||||
if openerp.SUPERUSER_ID != uid and self._model_is_installed(cr, uid, 'account.move.line', context=context) and \
|
||||
self.pool.get('account.move.line').search(cr, openerp.SUPERUSER_ID, [('partner_id', 'in', [partner.id for partner in src_partners])], context=context):
|
||||
raise osv.except_osv(_('Error'), _("Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."))
|
||||
|
||||
call_it = lambda function: function(cr, uid, src_partners, dst_partner,
|
||||
context=context)
|
||||
|
||||
|
|
@ -289,12 +311,12 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
call_it(self._update_reference_fields)
|
||||
call_it(self._update_values)
|
||||
|
||||
_logger.info("---merged---")
|
||||
|
||||
_logger.info('(uid = %s) merged the partners %r with %s', uid, list(map(operator.attrgetter('id'), src_partners)), dst_partner.id)
|
||||
dst_partner.message_post(body='%s %s'%(_("Merged with the following partners:"), ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id) for p in src_partners)))
|
||||
|
||||
for partner in src_partners:
|
||||
partner.unlink()
|
||||
|
||||
|
||||
def clean_emails(self, cr, uid, context=None):
|
||||
"""
|
||||
Clean the email address of the partner, if there is an email field with
|
||||
|
|
@ -414,9 +436,16 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
this = self.browse(cr, uid, ids[0], context=context)
|
||||
if this.current_line_id:
|
||||
this.current_line_id.unlink()
|
||||
return self._next_screen(this)
|
||||
return self._next_screen(cr, uid, this, context)
|
||||
|
||||
def _next_screen(self, this):
|
||||
def _get_ordered_partner(self, cr, uid, partner_ids, context=None):
|
||||
partners = self.pool.get('res.partner').browse(cr, uid, list(partner_ids), context=context)
|
||||
ordered_partners = sorted(sorted(partners,
|
||||
key=operator.attrgetter('create_date'), reverse=True),
|
||||
key=operator.attrgetter('active'), reverse=True)
|
||||
return ordered_partners
|
||||
|
||||
def _next_screen(self, cr, uid, this, context=None):
|
||||
this.refresh()
|
||||
values = {}
|
||||
if this.line_ids:
|
||||
|
|
@ -426,6 +455,7 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
values.update({
|
||||
'current_line_id': current_line.id,
|
||||
'partner_ids': [(6, 0, current_partner_ids)],
|
||||
'dst_partner_id': self._get_ordered_partner(cr, uid, current_partner_ids, context)[-1].id,
|
||||
'state': 'selection',
|
||||
})
|
||||
else:
|
||||
|
|
@ -525,7 +555,7 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
query = self._generate_query(groups, this.maximum_group)
|
||||
self._process_query(cr, uid, ids, query, context=context)
|
||||
|
||||
return self._next_screen(this)
|
||||
return self._next_screen(cr, uid, this, context)
|
||||
|
||||
def automatic_process_cb(self, cr, uid, ids, context=None):
|
||||
assert is_integer_list(ids)
|
||||
|
|
@ -666,7 +696,7 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
# p1.parent_id = p1.id
|
||||
# """)
|
||||
|
||||
return self._next_screen(this)
|
||||
return self._next_screen(cr, uid, this, context)
|
||||
|
||||
def merge_cb(self, cr, uid, ids, context=None):
|
||||
assert is_integer_list(ids)
|
||||
|
|
@ -685,33 +715,12 @@ class MergePartnerAutomatic(osv.TransientModel):
|
|||
'target': 'new',
|
||||
}
|
||||
|
||||
self._merge(cr, uid, partner_ids, context=context)
|
||||
self._merge(cr, uid, partner_ids, this.dst_partner_id, context=context)
|
||||
|
||||
this.current_line_id.unlink()
|
||||
if this.current_line_id:
|
||||
this.current_line_id.unlink()
|
||||
|
||||
return self._next_screen(this)
|
||||
|
||||
def merge_multi(self, cr, uid, ids, context=None):
|
||||
|
||||
active_model = context.get('active_model')
|
||||
if active_model != 'res.partner':
|
||||
raise osv.except_osv(
|
||||
_('Error'),
|
||||
_('This wizard can only used with the Partners')
|
||||
)
|
||||
|
||||
partner_ids = context.get('active_ids', [])
|
||||
|
||||
MINIMAL_NUMBER = 2
|
||||
if len(partner_ids) < MINIMAL_NUMBER:
|
||||
raise osv.except_osv(
|
||||
_('Error'),
|
||||
_("You can't use this wizard with only one Partner")
|
||||
)
|
||||
|
||||
self._merge(cr, uid, partner_ids, context=context)
|
||||
|
||||
return True
|
||||
return self._next_screen(cr, uid, this, context)
|
||||
|
||||
def auto_set_parent_id(self, cr, uid, ids, context=None):
|
||||
assert is_integer_list(ids)
|
||||
|
|
|
|||
|
|
@ -68,9 +68,9 @@
|
|||
OpenERP will propose you to merge only those having
|
||||
all these fields in common. (not one of the fields).
|
||||
</p>
|
||||
<group attrs="{'invisible': [('state', 'not in', ('selection', 'finished'))]}">
|
||||
<group attrs="{'invisible': ['|', ('state', 'not in', ('selection', 'finished')), ('number_group', '=', 0)]}">
|
||||
<field name="state" invisible="1" />
|
||||
<field name="number_group" invisible="0" />
|
||||
<field name="number_group"/>
|
||||
</group>
|
||||
<group string="Search duplicates based on duplicated data in"
|
||||
attrs="{'invisible': [('state', 'not in', ('option',))]}">
|
||||
|
|
@ -98,15 +98,15 @@
|
|||
redirected to the aggregated contact. You can remove
|
||||
contacts from this list to avoid merging them.
|
||||
</p>
|
||||
<field name="dst_partner_id" domain="[('id', 'in', partner_ids and partner_ids[0] and partner_ids[0][2] or False)]" attrs="{'required': [('state', '=', 'selection')]}"/>
|
||||
<field name="partner_ids" nolabel="1">
|
||||
<tree string="Partners">
|
||||
<field name="id" />
|
||||
<field name="name" />
|
||||
<field name="display_name" />
|
||||
<field name="email" />
|
||||
<field name="is_company" />
|
||||
<field name="vat" />
|
||||
<field name="country_id" />
|
||||
<field name="parent_id" />
|
||||
</tree>
|
||||
</field>
|
||||
</group>
|
||||
|
|
@ -114,24 +114,9 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.server"
|
||||
id="ir_actions_server_merge_automatic">
|
||||
<field name="code">pool.get('base.partner.merge.automatic.wizard').merge_multi(cr, uid, None, context)</field>
|
||||
<field name="condition">True</field>
|
||||
<field name="model_id" ref="base.model_res_partner" />
|
||||
<field name="name">Automatic Merge</field>
|
||||
<field name="sequence" eval="5" />
|
||||
<field name="state">code</field>
|
||||
<field name="type">ir.actions.server</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.values" id="ir_open_merge_automatic">
|
||||
<field name="key2" eval="'client_action_multi'" />
|
||||
<field name="model">res.partner</field>
|
||||
<field name="name">Automatic Merge</field>
|
||||
<field name="value" eval="'ir.actions.server,%d' % ir_actions_server_merge_automatic" />
|
||||
</record>
|
||||
|
||||
<act_window id="action_partner_merge" res_model="base.partner.merge.automatic.wizard" src_model="res.partner"
|
||||
target="new" multi="True" key2="client_action_multi" view_mode="form" name="Automatic Merge"/>
|
||||
|
||||
</data>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
|
||||
"PO-Revision-Date: 2013-05-27 12:19+0000\n"
|
||||
"Last-Translator: leksei <lirgus@gmail.com>\n"
|
||||
"PO-Revision-Date: 2013-05-30 13:52+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
|
||||
"X-Generator: Launchpad (build 16640)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead.report:0
|
||||
|
|
@ -1108,7 +1108,7 @@ msgstr "Удалить"
|
|||
#. module: crm
|
||||
#: model:mail.message.subtype,description:crm.mt_lead_create
|
||||
msgid "Opportunity created"
|
||||
msgstr ""
|
||||
msgstr "Предложение создано"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
|
|
@ -1397,7 +1397,7 @@ msgstr "Сделать"
|
|||
#. module: crm
|
||||
#: model:mail.message.subtype,description:crm.mt_lead_lost
|
||||
msgid "Opportunity lost"
|
||||
msgstr ""
|
||||
msgstr "Предложение отклонено"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead2opportunity.partner,action:0
|
||||
|
|
@ -1446,7 +1446,7 @@ msgstr "Пользователи"
|
|||
#. module: crm
|
||||
#: model:mail.message.subtype,name:crm.mt_lead_stage
|
||||
msgid "Stage Changed"
|
||||
msgstr ""
|
||||
msgstr "Стадия изменена"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.case.stage,section_ids:0
|
||||
|
|
@ -1759,7 +1759,7 @@ msgstr "Способ оплаты"
|
|||
#. module: crm
|
||||
#: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
|
||||
msgid "Mass Lead To Opportunity Partner"
|
||||
msgstr "Массовое проведение предложений партнёру"
|
||||
msgstr "Массовое преобразование кандидатов в предложения"
|
||||
|
||||
#. module: crm
|
||||
#: view:sale.config.settings:0
|
||||
|
|
@ -1917,7 +1917,7 @@ msgstr "Сделать"
|
|||
#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
|
||||
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
|
||||
msgid "Lead to Opportunity"
|
||||
msgstr ""
|
||||
msgstr "Кандидат в предложение"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead,user_email:0
|
||||
|
|
@ -2126,7 +2126,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
msgid "Address"
|
||||
msgstr ""
|
||||
msgstr "Адрес"
|
||||
|
||||
#. module: crm
|
||||
#: help:crm.case.section,alias_id:0
|
||||
|
|
@ -2134,6 +2134,8 @@ msgid ""
|
|||
"The email address associated with this team. New emails received will "
|
||||
"automatically create new leads assigned to the team."
|
||||
msgstr ""
|
||||
"Адрес эл. почты связанный с этой командой. Новая полученная эл. почта будет "
|
||||
"автоматически создавать новые кандидаты связанные с командой."
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
|
|
@ -2192,7 +2194,7 @@ msgstr "Продолжение процесса"
|
|||
#: selection:crm.lead2opportunity.partner.mass,name:0
|
||||
#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
|
||||
msgid "Convert to opportunity"
|
||||
msgstr "Преобразовать в возможность"
|
||||
msgstr "Преобразовать в предложение"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.opportunity2phonecall,user_id:0
|
||||
|
|
@ -2234,6 +2236,8 @@ msgid ""
|
|||
"This stage is not visible, for example in status bar or kanban view, when "
|
||||
"there are no records in that stage to display."
|
||||
msgstr ""
|
||||
"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
|
||||
"записей этой стадии для отображения."
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead.report,nbr:0
|
||||
|
|
@ -2249,7 +2253,7 @@ msgstr "Отдел продаж, которому принадлежит воп
|
|||
#. module: crm
|
||||
#: model:crm.case.resource.type,name:crm.type_lead6
|
||||
msgid "Banner Ads"
|
||||
msgstr ""
|
||||
msgstr "Баннер"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.merge.opportunity,opportunity_ids:0
|
||||
|
|
@ -2279,7 +2283,7 @@ msgstr "Выполняется"
|
|||
#. module: crm
|
||||
#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
|
||||
msgid "Lead converted into an opportunity"
|
||||
msgstr ""
|
||||
msgstr "Кандидат превращенный в предложение"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
|
|
@ -2289,7 +2293,7 @@ msgstr "Нераспределенные кандидаты"
|
|||
#. module: crm
|
||||
#: model:mail.message.subtype,description:crm.mt_lead_won
|
||||
msgid "Opportunity won"
|
||||
msgstr ""
|
||||
msgstr "Предложение принято"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.case.categ,object_id:0
|
||||
|
|
@ -2364,7 +2368,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: field:crm.case.stage,state:0
|
||||
msgid "Related Status"
|
||||
msgstr ""
|
||||
msgstr "Связанный статус"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.phonecall,name:0
|
||||
|
|
@ -2410,7 +2414,7 @@ msgstr "Подтвердить"
|
|||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
msgid "Unread messages"
|
||||
msgstr ""
|
||||
msgstr "Непрочитанные сообщения"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.phonecall.report,section_id:0
|
||||
|
|
@ -2501,7 +2505,7 @@ msgstr "Создание предложений из кандидатов"
|
|||
#. module: crm
|
||||
#: model:crm.case.resource.type,name:crm.type_lead3
|
||||
msgid "Email Campaign - Products"
|
||||
msgstr ""
|
||||
msgstr "Кампания эл. почты - Продукция"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
|
||||
|
|
@ -2578,7 +2582,7 @@ msgstr "Август"
|
|||
#: model:mail.message.subtype,name:crm.mt_lead_lost
|
||||
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
|
||||
msgid "Opportunity Lost"
|
||||
msgstr ""
|
||||
msgstr "Предложение отклонено"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead.report,deadline_month:0
|
||||
|
|
@ -2644,7 +2648,7 @@ msgstr "Сотрудники отдела"
|
|||
#: view:crm.opportunity2phonecall:0
|
||||
#: view:crm.phonecall2phonecall:0
|
||||
msgid "Schedule/Log a Call"
|
||||
msgstr ""
|
||||
msgstr "Запланировать/Описать звонок"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead,planned_cost:0
|
||||
|
|
@ -2654,7 +2658,7 @@ msgstr "Планируемые затраты"
|
|||
#. module: crm
|
||||
#: help:crm.lead,date_deadline:0
|
||||
msgid "Estimate of the date on which the opportunity will be won."
|
||||
msgstr ""
|
||||
msgstr "Оценка даты на которую это предложение будет принято."
|
||||
|
||||
#. module: crm
|
||||
#: help:crm.lead,email_cc:0
|
||||
|
|
@ -2676,7 +2680,7 @@ msgstr "Описанные звонки"
|
|||
#: model:mail.message.subtype,name:crm.mt_lead_won
|
||||
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
|
||||
msgid "Opportunity Won"
|
||||
msgstr ""
|
||||
msgstr "Предложение принято"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
|
||||
|
|
@ -2895,7 +2899,7 @@ msgstr ""
|
|||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
msgid "Internal Notes"
|
||||
msgstr ""
|
||||
msgstr "Внутренние заметки"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
|
|
@ -2960,6 +2964,7 @@ msgstr "Проиграно"
|
|||
#, python-format
|
||||
msgid "Closed/Cancelled leads cannot be converted into opportunities."
|
||||
msgstr ""
|
||||
"Закрытые/Отмененные кандидаты не могут быть конвертированы в возможности."
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
|
|
@ -3050,7 +3055,7 @@ msgstr "Рассылка"
|
|||
#. module: crm
|
||||
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
|
||||
msgid "Opportunity Stage Changed"
|
||||
msgstr ""
|
||||
msgstr "Этап предложения изменен"
|
||||
|
||||
#. module: crm
|
||||
#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2012-10-24 05:01+0000\n"
|
||||
"PO-Revision-Date: 2013-05-30 14:03+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: Russian <ru@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-03-16 05:44+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
|
||||
#. module: crm_claim
|
||||
#: help:crm.claim.stage,fold:0
|
||||
|
|
@ -23,6 +23,8 @@ msgid ""
|
|||
"This stage is not visible, for example in status bar or kanban view, when "
|
||||
"there are no records in that stage to display."
|
||||
msgstr ""
|
||||
"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
|
||||
"записей этой стадии для отображения."
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim.report,nbr:0
|
||||
|
|
@ -46,11 +48,13 @@ msgid ""
|
|||
"Allows you to configure your incoming mail server, and create claims from "
|
||||
"incoming emails."
|
||||
msgstr ""
|
||||
"Позволяет настроить сервер входящей почты и создавать претензии из входящих "
|
||||
"эл. писем."
|
||||
|
||||
#. module: crm_claim
|
||||
#: model:ir.model,name:crm_claim.model_crm_claim_stage
|
||||
msgid "Claim stages"
|
||||
msgstr ""
|
||||
msgstr "Этапы претензии"
|
||||
|
||||
#. module: crm_claim
|
||||
#: selection:crm.claim.report,month:0
|
||||
|
|
@ -65,7 +69,7 @@ msgstr "Задержка закрытия"
|
|||
#. module: crm_claim
|
||||
#: field:crm.claim,message_unread:0
|
||||
msgid "Unread Messages"
|
||||
msgstr ""
|
||||
msgstr "Непрочитанные"
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim,resolution:0
|
||||
|
|
@ -100,12 +104,12 @@ msgstr "# претензий"
|
|||
#. module: crm_claim
|
||||
#: field:crm.claim.stage,name:0
|
||||
msgid "Stage Name"
|
||||
msgstr ""
|
||||
msgstr "Название этапа"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:crm.claim.report:0
|
||||
msgid "Salesperson"
|
||||
msgstr ""
|
||||
msgstr "Продавец"
|
||||
|
||||
#. module: crm_claim
|
||||
#: selection:crm.claim,priority:0
|
||||
|
|
@ -149,7 +153,7 @@ msgstr "Предупредительная мера"
|
|||
#. module: crm_claim
|
||||
#: help:crm.claim,message_unread:0
|
||||
msgid "If checked new messages require your attention."
|
||||
msgstr ""
|
||||
msgstr "Если отмечено, новые сообщения требуют вашего внимания."
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim.report,date_closed:0
|
||||
|
|
@ -182,6 +186,8 @@ msgid ""
|
|||
"Holds the Chatter summary (number of messages, ...). This summary is "
|
||||
"directly in html format in order to be inserted in kanban views."
|
||||
msgstr ""
|
||||
"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
|
||||
"html для возможности использования в канбан виде"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:crm.claim:0
|
||||
|
|
@ -235,12 +241,12 @@ msgstr "Важность"
|
|||
#. module: crm_claim
|
||||
#: field:crm.claim.stage,fold:0
|
||||
msgid "Hide in Views when Empty"
|
||||
msgstr ""
|
||||
msgstr "Скрыть вид, если пусто"
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim,message_follower_ids:0
|
||||
msgid "Followers"
|
||||
msgstr ""
|
||||
msgstr "Подписчики"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:crm.claim:0
|
||||
|
|
@ -254,7 +260,7 @@ msgstr "Новый"
|
|||
#. module: crm_claim
|
||||
#: field:crm.claim.stage,section_ids:0
|
||||
msgid "Sections"
|
||||
msgstr ""
|
||||
msgstr "Секции"
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim,email_from:0
|
||||
|
|
@ -290,7 +296,7 @@ msgstr "Предмет претензии"
|
|||
#. module: crm_claim
|
||||
#: model:crm.claim.stage,name:crm_claim.stage_claim3
|
||||
msgid "Rejected"
|
||||
msgstr ""
|
||||
msgstr "Отклонено"
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim,date_action_next:0
|
||||
|
|
@ -344,7 +350,7 @@ msgstr ""
|
|||
#: code:addons/crm_claim/crm_claim.py:194
|
||||
#, python-format
|
||||
msgid "No Subject"
|
||||
msgstr ""
|
||||
msgstr "Без темы"
|
||||
|
||||
#. module: crm_claim
|
||||
#: help:crm.claim.stage,state:0
|
||||
|
|
@ -358,7 +364,7 @@ msgstr ""
|
|||
#. module: crm_claim
|
||||
#: view:crm.claim:0
|
||||
msgid "Settle"
|
||||
msgstr ""
|
||||
msgstr "Решать"
|
||||
|
||||
#. module: crm_claim
|
||||
#: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
|
||||
|
|
@ -384,7 +390,7 @@ msgstr "Отчет о претензиях"
|
|||
#. module: crm_claim
|
||||
#: view:sale.config.settings:0
|
||||
msgid "Configure"
|
||||
msgstr ""
|
||||
msgstr "Настроить"
|
||||
|
||||
#. module: crm_claim
|
||||
#: model:crm.case.resource.type,name:crm_claim.type_claim1
|
||||
|
|
@ -430,6 +436,8 @@ msgid ""
|
|||
"If you check this field, this stage will be proposed by default on each "
|
||||
"sales team. It will not assign this stage to existing teams."
|
||||
msgstr ""
|
||||
"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому "
|
||||
"отделу продаж. Этот этап не будет назначен существующим отделам."
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim,categ_id:0
|
||||
|
|
@ -485,7 +493,7 @@ msgstr "Закрыто"
|
|||
#. module: crm_claim
|
||||
#: view:crm.claim:0
|
||||
msgid "Reject"
|
||||
msgstr ""
|
||||
msgstr "Отклонить"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:res.partner:0
|
||||
|
|
@ -495,7 +503,7 @@ msgstr "Претензии партнера"
|
|||
#. module: crm_claim
|
||||
#: view:crm.claim.stage:0
|
||||
msgid "Claim Stage"
|
||||
msgstr ""
|
||||
msgstr "Этап претензии"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:crm.claim:0
|
||||
|
|
@ -513,7 +521,7 @@ msgstr "Отложено"
|
|||
#: field:crm.claim.report,state:0
|
||||
#: field:crm.claim.stage,state:0
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
msgstr "Статус"
|
||||
|
||||
#. module: crm_claim
|
||||
#: selection:crm.claim.report,month:0
|
||||
|
|
@ -529,7 +537,7 @@ msgstr "Обычный"
|
|||
#. module: crm_claim
|
||||
#: help:crm.claim.stage,sequence:0
|
||||
msgid "Used to order stages. Lower is better."
|
||||
msgstr ""
|
||||
msgstr "Используется для упорядочивания этапов. Меньше - лучше."
|
||||
|
||||
#. module: crm_claim
|
||||
#: selection:crm.claim.report,month:0
|
||||
|
|
@ -549,7 +557,7 @@ msgstr "Телефон"
|
|||
#. module: crm_claim
|
||||
#: field:crm.claim,message_is_follower:0
|
||||
msgid "Is a Follower"
|
||||
msgstr ""
|
||||
msgstr "Подписан"
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim.report,user_id:0
|
||||
|
|
@ -581,6 +589,10 @@ msgid ""
|
|||
"the case needs to be reviewed then the status is set "
|
||||
"to 'Pending'."
|
||||
msgstr ""
|
||||
"Статус устанавливается в \"Черновик\", при создании дела. Если дело в "
|
||||
"процессе, то статус - «Открыт». Когда дело закончено, устанавливается статус "
|
||||
"\"Готово\". Если дело должно быть пересмотрено то статус установлен в "
|
||||
"'Ожидание'."
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim,active:0
|
||||
|
|
@ -628,7 +640,7 @@ msgstr "Дата претензии"
|
|||
#. module: crm_claim
|
||||
#: field:crm.claim,message_summary:0
|
||||
msgid "Summary"
|
||||
msgstr ""
|
||||
msgstr "Итог"
|
||||
|
||||
#. module: crm_claim
|
||||
#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
|
||||
|
|
@ -638,7 +650,7 @@ msgstr "Категории претензий"
|
|||
#. module: crm_claim
|
||||
#: field:crm.claim.stage,case_default:0
|
||||
msgid "Common to All Teams"
|
||||
msgstr ""
|
||||
msgstr "Общее для всех отделов"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:crm.claim:0
|
||||
|
|
@ -677,7 +689,7 @@ msgstr "Претензия"
|
|||
#. module: crm_claim
|
||||
#: view:crm.claim.report:0
|
||||
msgid "My Company"
|
||||
msgstr ""
|
||||
msgstr "Моя компания"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:crm.claim.report:0
|
||||
|
|
@ -807,7 +819,7 @@ msgstr "Февраль"
|
|||
#. module: crm_claim
|
||||
#: model:ir.model,name:crm_claim.model_sale_config_settings
|
||||
msgid "sale.config.settings"
|
||||
msgstr ""
|
||||
msgstr "sale.config.settings"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:crm.claim.report:0
|
||||
|
|
@ -833,22 +845,22 @@ msgstr "Мои дела"
|
|||
#. module: crm_claim
|
||||
#: model:crm.claim.stage,name:crm_claim.stage_claim2
|
||||
msgid "Settled"
|
||||
msgstr ""
|
||||
msgstr "Решено"
|
||||
|
||||
#. module: crm_claim
|
||||
#: help:crm.claim,message_ids:0
|
||||
msgid "Messages and communication history"
|
||||
msgstr ""
|
||||
msgstr "Сообщения и история общения"
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:sale.config.settings,fetchmail_claim:0
|
||||
msgid "Create claims from incoming mails"
|
||||
msgstr ""
|
||||
msgstr "Создать претензии из входящей почты"
|
||||
|
||||
#. module: crm_claim
|
||||
#: field:crm.claim.stage,sequence:0
|
||||
msgid "Sequence"
|
||||
msgstr ""
|
||||
msgstr "Нумерация"
|
||||
|
||||
#. module: crm_claim
|
||||
#: view:crm.claim:0
|
||||
|
|
@ -883,6 +895,8 @@ msgid ""
|
|||
"Link between stages and sales teams. When set, this limitate the current "
|
||||
"stage to the selected sales teams."
|
||||
msgstr ""
|
||||
"Связь между этапами и отделами продаж. При установке, ограничивает этап для "
|
||||
"выбранного отдела продаж."
|
||||
|
||||
#. module: crm_claim
|
||||
#: help:crm.claim.stage,case_refused:0
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2012-10-24 05:08+0000\n"
|
||||
"PO-Revision-Date: 2013-05-30 14:09+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: Russian <ru@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-03-16 05:46+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: field:crm.helpdesk.report,delay_close:0
|
||||
|
|
@ -46,7 +46,7 @@ msgstr "Март"
|
|||
#. module: crm_helpdesk
|
||||
#: field:crm.helpdesk,message_unread:0
|
||||
msgid "Unread Messages"
|
||||
msgstr ""
|
||||
msgstr "Непрочитанные"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: field:crm.helpdesk,company_id:0
|
||||
|
|
@ -63,7 +63,7 @@ msgstr "Адреса наблюдателей"
|
|||
#. module: crm_helpdesk
|
||||
#: view:crm.helpdesk.report:0
|
||||
msgid "Salesperson"
|
||||
msgstr ""
|
||||
msgstr "Продавец"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: selection:crm.helpdesk,priority:0
|
||||
|
|
@ -106,7 +106,7 @@ msgstr "Отменено"
|
|||
#. module: crm_helpdesk
|
||||
#: help:crm.helpdesk,message_unread:0
|
||||
msgid "If checked new messages require your attention."
|
||||
msgstr ""
|
||||
msgstr "Если отмечено, новые сообщения требуют вашего внимания."
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
|
||||
|
|
@ -136,6 +136,8 @@ msgid ""
|
|||
"Holds the Chatter summary (number of messages, ...). This summary is "
|
||||
"directly in html format in order to be inserted in kanban views."
|
||||
msgstr ""
|
||||
"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
|
||||
"html для возможности использования в канбан виде"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: view:crm.helpdesk:0
|
||||
|
|
@ -176,7 +178,7 @@ msgstr "Приоритет"
|
|||
#. module: crm_helpdesk
|
||||
#: field:crm.helpdesk,message_follower_ids:0
|
||||
msgid "Followers"
|
||||
msgstr ""
|
||||
msgstr "Подписчики"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: view:crm.helpdesk:0
|
||||
|
|
@ -400,7 +402,7 @@ msgstr "В ожидании"
|
|||
#: view:crm.helpdesk.report:0
|
||||
#: field:crm.helpdesk.report,state:0
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
msgstr "Статус"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: selection:crm.helpdesk.report,month:0
|
||||
|
|
@ -454,7 +456,7 @@ msgstr "Планируемая выручка"
|
|||
#. module: crm_helpdesk
|
||||
#: field:crm.helpdesk,message_is_follower:0
|
||||
msgid "Is a Follower"
|
||||
msgstr ""
|
||||
msgstr "Подписан"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: field:crm.helpdesk.report,user_id:0
|
||||
|
|
@ -501,7 +503,7 @@ msgstr "Январь"
|
|||
#. module: crm_helpdesk
|
||||
#: field:crm.helpdesk,message_summary:0
|
||||
msgid "Summary"
|
||||
msgstr ""
|
||||
msgstr "Итог"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: view:crm.helpdesk:0
|
||||
|
|
@ -517,7 +519,7 @@ msgstr "Прочее"
|
|||
#. module: crm_helpdesk
|
||||
#: view:crm.helpdesk.report:0
|
||||
msgid "My Company"
|
||||
msgstr ""
|
||||
msgstr "Моя компания"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: view:crm.helpdesk:0
|
||||
|
|
@ -666,7 +668,7 @@ msgstr ""
|
|||
#. module: crm_helpdesk
|
||||
#: help:crm.helpdesk,message_ids:0
|
||||
msgid "Messages and communication history"
|
||||
msgstr ""
|
||||
msgstr "Сообщения и история общения"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2011-03-23 13:46+0000\n"
|
||||
"PO-Revision-Date: 2013-05-30 14:10+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: Russian <ru@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-03-16 05:47+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.report.assign,delay_close:0
|
||||
|
|
@ -25,7 +25,7 @@ msgstr "Задержка закрытия"
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,author_id:0
|
||||
msgid "Author"
|
||||
msgstr ""
|
||||
msgstr "Автор"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.report.assign,planned_revenue:0
|
||||
|
|
@ -38,6 +38,9 @@ msgid ""
|
|||
"Message type: email for email message, notification for system message, "
|
||||
"comment for other messages such as user replies"
|
||||
msgstr ""
|
||||
"Тип сообщения: эл. почта - для эл. почты, уведомление - для системных "
|
||||
"сообщений, комментарий - для остальных сообщений таких как сообщения "
|
||||
"пользователя"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.report.assign,nbr:0
|
||||
|
|
@ -53,7 +56,7 @@ msgstr "Группировать по ..."
|
|||
#. module: crm_partner_assign
|
||||
#: help:crm.lead.forward.to.partner,body:0
|
||||
msgid "Automatically sanitized HTML contents"
|
||||
msgstr ""
|
||||
msgstr "Автоматически обработанное HTML содержимое"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: view:crm.lead:0
|
||||
|
|
@ -68,7 +71,7 @@ msgstr "Геолоцировать"
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,starred:0
|
||||
msgid "Starred"
|
||||
msgstr ""
|
||||
msgstr "Отмеченные"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: view:crm.lead.forward.to.partner:0
|
||||
|
|
@ -81,6 +84,8 @@ msgid ""
|
|||
"Email address of the sender. This field is set when no matching partner is "
|
||||
"found for incoming emails."
|
||||
msgstr ""
|
||||
"Адрес эл. почты отправителя. Это поле устанавливается когда партнер не "
|
||||
"определен для входящих писем."
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: view:crm.partner.report.assign:0
|
||||
|
|
@ -111,7 +116,7 @@ msgstr "Компания"
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,notification_ids:0
|
||||
msgid "Notifications"
|
||||
msgstr ""
|
||||
msgstr "Уведомления"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.report.assign,date_assign:0
|
||||
|
|
@ -123,7 +128,7 @@ msgstr "Дата партнера"
|
|||
#: view:crm.partner.report.assign:0
|
||||
#: view:res.partner:0
|
||||
msgid "Salesperson"
|
||||
msgstr ""
|
||||
msgstr "Продавец"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: selection:crm.lead.report.assign,priority:0
|
||||
|
|
@ -170,12 +175,12 @@ msgstr "Географическое назначение"
|
|||
#. module: crm_partner_assign
|
||||
#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
|
||||
msgid "Email composition wizard"
|
||||
msgstr ""
|
||||
msgstr "Мастер составления эл. почты"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.partner.report.assign,turnover:0
|
||||
msgid "Turnover"
|
||||
msgstr ""
|
||||
msgstr "Оборот"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.report.assign,date_closed:0
|
||||
|
|
@ -199,7 +204,7 @@ msgstr ""
|
|||
#. module: crm_partner_assign
|
||||
#: selection:crm.lead.forward.to.partner,type:0
|
||||
msgid "System notification"
|
||||
msgstr ""
|
||||
msgstr "Системное уведомление"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
|
||||
|
|
@ -271,7 +276,7 @@ msgstr "Тип"
|
|||
#. module: crm_partner_assign
|
||||
#: selection:crm.lead.forward.to.partner,type:0
|
||||
msgid "Email"
|
||||
msgstr ""
|
||||
msgstr "Эл. почта"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: help:crm.lead,partner_assigned_id:0
|
||||
|
|
@ -286,7 +291,7 @@ msgstr "Низший"
|
|||
#. module: crm_partner_assign
|
||||
#: view:crm.partner.report.assign:0
|
||||
msgid "Date Invoice"
|
||||
msgstr ""
|
||||
msgstr "Дата счета"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,template_id:0
|
||||
|
|
@ -311,12 +316,12 @@ msgstr "Дата создания"
|
|||
#. module: crm_partner_assign
|
||||
#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
|
||||
msgid "res.partner.activation"
|
||||
msgstr ""
|
||||
msgstr "res.partner.activation"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,parent_id:0
|
||||
msgid "Parent Message"
|
||||
msgstr ""
|
||||
msgstr "Родительское сообщение"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,res_id:0
|
||||
|
|
@ -358,12 +363,12 @@ msgstr "Этап"
|
|||
#: view:crm.lead.report.assign:0
|
||||
#: field:crm.lead.report.assign,state:0
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
msgstr "Статус"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,to_read:0
|
||||
msgid "To read"
|
||||
msgstr ""
|
||||
msgstr "Прочитать"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
|
||||
|
|
@ -418,12 +423,12 @@ msgstr "Количество дней, для закрытия вопроса"
|
|||
#: help:crm.lead.forward.to.partner,notified_partner_ids:0
|
||||
msgid ""
|
||||
"Partners that have a notification pushing this message in their mailboxes"
|
||||
msgstr ""
|
||||
msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: selection:crm.lead.forward.to.partner,type:0
|
||||
msgid "Comment"
|
||||
msgstr ""
|
||||
msgstr "Комментарий"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:res.partner,partner_weight:0
|
||||
|
|
@ -451,7 +456,7 @@ msgstr "Декабрь"
|
|||
#. module: crm_partner_assign
|
||||
#: help:crm.lead.forward.to.partner,vote_user_ids:0
|
||||
msgid "Users that voted for this message"
|
||||
msgstr ""
|
||||
msgstr "Пользователи, которые проголосовали за это сообщение"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: view:crm.lead.report.assign:0
|
||||
|
|
@ -467,7 +472,7 @@ msgstr "Дата открытия"
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,child_ids:0
|
||||
msgid "Child Messages"
|
||||
msgstr ""
|
||||
msgstr "Связанные сообщения"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.partner.report.assign,date_review:0
|
||||
|
|
@ -483,17 +488,17 @@ msgstr "Тема"
|
|||
#. module: crm_partner_assign
|
||||
#: view:crm.lead.forward.to.partner:0
|
||||
msgid "or"
|
||||
msgstr ""
|
||||
msgstr "или"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,body:0
|
||||
msgid "Contents"
|
||||
msgstr ""
|
||||
msgstr "Содержимое"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,vote_user_ids:0
|
||||
msgid "Votes"
|
||||
msgstr ""
|
||||
msgstr "Голоса"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: view:crm.lead.report.assign:0
|
||||
|
|
@ -504,6 +509,8 @@ msgstr "# Предложений"
|
|||
#: help:crm.lead.forward.to.partner,starred:0
|
||||
msgid "Current user has a starred notification linked to this message"
|
||||
msgstr ""
|
||||
"Текущий пользователь имеет отмеченное уведомление, связанное с этим "
|
||||
"сообщением"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.partner.report.assign,date_partnership:0
|
||||
|
|
@ -561,7 +568,7 @@ msgstr "Август"
|
|||
#. module: crm_partner_assign
|
||||
#: help:crm.lead.forward.to.partner,record_name:0
|
||||
msgid "Name get of the related document."
|
||||
msgstr ""
|
||||
msgstr "Название связанного документа."
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: selection:crm.lead.report.assign,priority:0
|
||||
|
|
@ -684,7 +691,7 @@ msgstr "Вложения"
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,record_name:0
|
||||
msgid "Message Record Name"
|
||||
msgstr ""
|
||||
msgstr "Название записи сообщения"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:res.partner.activation,sequence:0
|
||||
|
|
@ -724,7 +731,7 @@ msgstr "Открыто"
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,subtype_id:0
|
||||
msgid "Subtype"
|
||||
msgstr ""
|
||||
msgstr "Подтип"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:res.partner,date_localization:0
|
||||
|
|
@ -739,12 +746,12 @@ msgstr "Текущий"
|
|||
#. module: crm_partner_assign
|
||||
#: model:ir.model,name:crm_partner_assign.model_crm_lead
|
||||
msgid "Lead/Opportunity"
|
||||
msgstr ""
|
||||
msgstr "Кандидат/Предложение"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,notified_partner_ids:0
|
||||
msgid "Notified partners"
|
||||
msgstr ""
|
||||
msgstr "Уведомленные партнеры"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: view:crm.lead.forward.to.partner:0
|
||||
|
|
@ -775,7 +782,7 @@ msgstr "Вероятная выручка"
|
|||
#: field:res.partner,activation:0
|
||||
#: view:res.partner.activation:0
|
||||
msgid "Activation"
|
||||
msgstr ""
|
||||
msgstr "Активация"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: view:crm.lead:0
|
||||
|
|
@ -792,6 +799,8 @@ msgstr ""
|
|||
#: help:crm.lead.forward.to.partner,to_read:0
|
||||
msgid "Current user has an unread notification linked to this message"
|
||||
msgstr ""
|
||||
"Текущий пользователь имеет непрочитанные уведомления, связанные с этим "
|
||||
"сообщением"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: selection:crm.lead.report.assign,type:0
|
||||
|
|
@ -860,6 +869,8 @@ msgid ""
|
|||
"Technical field holding the message notifications. Use notified_partner_ids "
|
||||
"to access notified partners."
|
||||
msgstr ""
|
||||
"Техническое поле, содержащее уведомления. Используйте notified_partner_ids "
|
||||
"для доступа к оповещаемым партнерам."
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: view:crm.partner.report.assign:0
|
||||
|
|
@ -874,12 +885,12 @@ msgstr "CRM - отчет по кандидатам"
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,composition_mode:0
|
||||
msgid "Composition mode"
|
||||
msgstr ""
|
||||
msgstr "Режим составления"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,model:0
|
||||
msgid "Related Document Model"
|
||||
msgstr ""
|
||||
msgstr "Модель связанного документа"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: selection:crm.lead.forward.to.partner,history_mode:0
|
||||
|
|
@ -892,6 +903,8 @@ msgid ""
|
|||
"Author of the message. If not set, email_from may hold an email address that "
|
||||
"did not match any partner."
|
||||
msgstr ""
|
||||
"Автор сообщения. Если не установлен, email_from может содержать адрес почты, "
|
||||
"который не соответствует ни одному партнеру."
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
|
||||
|
|
@ -906,12 +919,12 @@ msgstr "Высокий"
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.forward.to.partner,partner_ids:0
|
||||
msgid "Additional contacts"
|
||||
msgstr ""
|
||||
msgstr "Дополнительные контакты"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: help:crm.lead.forward.to.partner,parent_id:0
|
||||
msgid "Initial thread message."
|
||||
msgstr ""
|
||||
msgstr "Первое сообщение цепочки."
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.report.assign,create_date:0
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2012-05-10 17:51+0000\n"
|
||||
"PO-Revision-Date: 2013-05-30 14:05+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-03-16 05:32+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
|
||||
#. module: crm_profiling
|
||||
#: view:crm_profiling.questionnaire:0
|
||||
|
|
@ -151,7 +151,7 @@ msgstr "Используйте правила профилирования"
|
|||
#. module: crm_profiling
|
||||
#: constraint:crm.segmentation:0
|
||||
msgid "Error ! You cannot create recursive profiles."
|
||||
msgstr ""
|
||||
msgstr "Ошибка ! Нельзя создать рекурсивный профиль."
|
||||
|
||||
#. module: crm_profiling
|
||||
#: field:crm.segmentation,answer_yes:0
|
||||
|
|
@ -200,7 +200,7 @@ msgstr "Сохранить данные"
|
|||
#. module: crm_profiling
|
||||
#: view:open.questionnaire:0
|
||||
msgid "or"
|
||||
msgstr ""
|
||||
msgstr "или"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "The Object name must start with x_ and not contain any special character !"
|
||||
|
|
|
|||
|
|
@ -8,35 +8,35 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2012-09-10 15:12+0000\n"
|
||||
"PO-Revision-Date: 2013-05-30 13:32+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: Russian <ru@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-03-16 05:50+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
|
||||
#. module: edi
|
||||
#. openerp-web
|
||||
#: code:addons/edi/static/src/js/edi.js:67
|
||||
#, python-format
|
||||
msgid "Reason:"
|
||||
msgstr ""
|
||||
msgstr "Причина:"
|
||||
|
||||
#. module: edi
|
||||
#. openerp-web
|
||||
#: code:addons/edi/static/src/js/edi.js:60
|
||||
#, python-format
|
||||
msgid "The document has been successfully imported!"
|
||||
msgstr ""
|
||||
msgstr "Документ был успешно импортирован!"
|
||||
|
||||
#. module: edi
|
||||
#. openerp-web
|
||||
#: code:addons/edi/static/src/js/edi.js:65
|
||||
#, python-format
|
||||
msgid "Sorry, the document could not be imported."
|
||||
msgstr ""
|
||||
msgstr "Извините, документ не может быть импортирован."
|
||||
|
||||
#. module: edi
|
||||
#: model:ir.model,name:edi.model_res_company
|
||||
|
|
@ -53,13 +53,13 @@ msgstr "Валюта"
|
|||
#: code:addons/edi/static/src/js/edi.js:71
|
||||
#, python-format
|
||||
msgid "Document Import Notification"
|
||||
msgstr ""
|
||||
msgstr "Уведомление об импорте документа"
|
||||
|
||||
#. module: edi
|
||||
#: code:addons/edi/models/edi.py:130
|
||||
#, python-format
|
||||
msgid "Missing application."
|
||||
msgstr ""
|
||||
msgstr "Отсутствующее приложение."
|
||||
|
||||
#. module: edi
|
||||
#: code:addons/edi/models/edi.py:131
|
||||
|
|
@ -69,12 +69,15 @@ msgid ""
|
|||
"You can install it by connecting as the administrator and opening the "
|
||||
"configuration assistant."
|
||||
msgstr ""
|
||||
"Документу, который вы пытаетесь импортировать, необходимо OpenERP приложение "
|
||||
"'%s'. Вы можете установить его, выполнив вход под администратором и открыв "
|
||||
"настройки."
|
||||
|
||||
#. module: edi
|
||||
#: code:addons/edi/models/edi.py:47
|
||||
#, python-format
|
||||
msgid "'%s' is an invalid external ID"
|
||||
msgstr ""
|
||||
msgstr "'%s' это неверный внешний идентификатор"
|
||||
|
||||
#. module: edi
|
||||
#: model:ir.model,name:edi.model_res_partner
|
||||
|
|
@ -84,7 +87,7 @@ msgstr "Контрагент"
|
|||
#. module: edi
|
||||
#: model:ir.model,name:edi.model_edi_edi
|
||||
msgid "EDI Subsystem"
|
||||
msgstr ""
|
||||
msgstr "Подсистема электронного документооборота"
|
||||
|
||||
#~ msgid "The currency code must be unique per company!"
|
||||
#~ msgstr "Код валюты должен быть уникальным в компании!"
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2012-12-25 12:16+0000\n"
|
||||
"Last-Translator: Olga <chikiro.spam@gmail.com>\n"
|
||||
"PO-Revision-Date: 2013-05-30 13:33+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: Russian <ru@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-03-16 05:42+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
|
||||
#. module: email_template
|
||||
#: field:email.template,email_from:0
|
||||
|
|
@ -37,7 +37,7 @@ msgstr "Кнопка боковой панели для открытия дей
|
|||
#. module: email_template
|
||||
#: field:res.partner,opt_out:0
|
||||
msgid "Opt-Out"
|
||||
msgstr ""
|
||||
msgstr "Без уведомлений"
|
||||
|
||||
#. module: email_template
|
||||
#: field:email.template,email_to:0
|
||||
|
|
@ -510,7 +510,7 @@ msgstr ""
|
|||
#. module: email_template
|
||||
#: view:email.template:0
|
||||
msgid "Contents"
|
||||
msgstr ""
|
||||
msgstr "Содержимое"
|
||||
|
||||
#. module: email_template
|
||||
#: field:email.template,subject:0
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<field name="res_model">event.registration</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="name">Registrations</field>
|
||||
<field name="view_mode">calendar,tree,form,graph</field>
|
||||
<field name="view_mode">tree,form,calendar,graph</field>
|
||||
<field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
|
||||
</record>
|
||||
|
||||
|
|
@ -93,6 +93,7 @@
|
|||
</div>
|
||||
</group>
|
||||
<group>
|
||||
<field name="user_id"/>
|
||||
<field name="type" on_change="onchange_event_type(type,context)" />
|
||||
<field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
|
||||
<field name="date_end"/>
|
||||
|
|
@ -100,19 +101,13 @@
|
|||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Email Configuration" groups="base.group_no_one">
|
||||
<group>
|
||||
<page string="Event Details" groups="base.group_no_one">
|
||||
<group colspan="4">
|
||||
<field name="reply_to"/>
|
||||
<group>
|
||||
<field name="email_registration_id"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="email_confirmation_id"/>
|
||||
</group>
|
||||
<field name="email_registration_id"/>
|
||||
<field name="email_confirmation_id"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Event Description">
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
<field name="note" nolabel="1" placeholder="Event Description..."/>
|
||||
</page>
|
||||
<page string="Registrations">
|
||||
<group>
|
||||
|
|
|
|||
|
|
@ -70,6 +70,8 @@ class sale_order_line(osv.osv):
|
|||
'''
|
||||
create registration with sales order
|
||||
'''
|
||||
if context is None:
|
||||
context = {}
|
||||
registration_obj = self.pool.get('event.registration')
|
||||
sale_obj = self.pool.get('sale.order')
|
||||
for order_line in self.browse(cr, uid, ids, context=context):
|
||||
|
|
@ -83,7 +85,8 @@ class sale_order_line(osv.osv):
|
|||
'origin': order_line.order_id.name,
|
||||
'event_id': order_line.event_id.id,
|
||||
}
|
||||
message = _("The registration has been created for event <i>%s</i> from the Sale Order %s. ") % (order_line.event_id.name, order_line.order_id.name)
|
||||
context.update({'mail_create_nolog': True, 'message': message })
|
||||
registration_id = registration_obj.create(cr, uid, dic, context=context)
|
||||
message = _("The registration %s has been created from the Sales Order %s.") % (registration_id, order_line.order_id.name)
|
||||
registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
|
||||
return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
|
||||
|
|
|
|||
|
|
@ -57,9 +57,9 @@ You can define the different phases of interviews and easily rate the applicant
|
|||
'board_hr_recruitment_statistical_view.xml',
|
||||
'hr_recruitment_installer_view.xml',
|
||||
'res_config_view.xml',
|
||||
'hr_recruitment_data.xml'
|
||||
'hr_recruitment_data.xml',
|
||||
],
|
||||
'demo': ['hr_recruitment_demo.yml'],
|
||||
'demo': ['hr_recruitment_demo.xml'],
|
||||
'test': ['test/recruitment_process.yml'],
|
||||
'installable': True,
|
||||
'auto_install': False,
|
||||
|
|
|
|||
|
|
@ -355,10 +355,12 @@ class hr_applicant(base_stage, osv.Model):
|
|||
This override updates the document according to the email.
|
||||
"""
|
||||
if custom_values is None: custom_values = {}
|
||||
val = msg.get('from').split('<')[0]
|
||||
desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
|
||||
defaults = {
|
||||
'name': msg.get('subject') or _("No Subject"),
|
||||
'description': desc,
|
||||
'partner_name':val,
|
||||
'email_from': msg.get('from'),
|
||||
'email_cc': msg.get('cc'),
|
||||
'user_id': False,
|
||||
|
|
|
|||
|
|
@ -485,6 +485,18 @@
|
|||
<field name="default" eval="False"/>
|
||||
<field name="description">Applicant refused</field>
|
||||
</record>
|
||||
|
||||
<!-- Applicant Categories(Tag) -->
|
||||
<record id="tag_applicant_reserve" model="hr.applicant_category">
|
||||
<field name="name">Reserve</field>
|
||||
</record>
|
||||
<record id="tag_applicant_manager" model="hr.applicant_category">
|
||||
<field name="name">Manager</field>
|
||||
</record>
|
||||
<record id="tag_applicant_it" model="hr.applicant_category">
|
||||
<field name="name">IT</field>
|
||||
</record>
|
||||
<record id="tag_applicant_sales" model="hr.applicant_category">
|
||||
<field name="name">Sales</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,129 @@
|
|||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
<record id="hr_case_salesman0" model="hr.applicant">
|
||||
<field name="name">Salesperson</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_graduate"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
|
||||
<field eval= "time.strftime('%Y-%m-01 10:35:50')" name="date"/>
|
||||
<field name="priority">2</field>
|
||||
<field name="partner_name">Enrique Jones</field>
|
||||
<field name="partner_mobile">9963214587</field>
|
||||
<field name="stage_id" ref="stage_job1"/>
|
||||
<field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Send mail regarding our interview</field>
|
||||
</record>
|
||||
<record id="hr_case_traineemca0" model="hr.applicant">
|
||||
<field name="name">Trainee - MCA</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_bac5"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
|
||||
<field name="user_id" ref="base.user_demo"/>
|
||||
<field name="priority">3</field>
|
||||
<field name="partner_name">Marie Justine</field>
|
||||
<field name="partner_mobile">9988774455</field>
|
||||
<field name="stage_id" ref="stage_job4"/>
|
||||
<field name="partner_phone">6633225</field>
|
||||
<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Call to define real needs about training</field>
|
||||
</record>
|
||||
<record id="hr_case_fresher0" model="hr.applicant">
|
||||
<field name="name">Fresher</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_licenced"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
|
||||
<field name="user_id" ref="base.user_root"/>
|
||||
<field name="priority">1</field>
|
||||
<field name="partner_name">Jose</field>
|
||||
<field name="stage_id" ref="stage_job3"/>
|
||||
<field name="partner_phone">999666735</field>
|
||||
<field eval="time.strftime('%Y-%m-5 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Send mail regarding our interview</field>
|
||||
</record>
|
||||
<record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
|
||||
<field name="name">Marketing Job</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_bac5"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
|
||||
<field name="user_id" ref="base.user_root"/>
|
||||
<field name="partner_name">John Bruno</field>
|
||||
<field name="stage_id" ref="stage_job5"/>
|
||||
<field eval="time.strftime('%Y-%m-24 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Call to define real needs about training</field>
|
||||
</record>
|
||||
<record id="hr_case_marketingjob0" model="hr.applicant">
|
||||
<field name="name">More than 5 yrs Experience in PHP</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_licenced"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
|
||||
<field name="user_id" ref="base.user_demo"/>
|
||||
<field name="partner_name">Sandra Elvis</field>
|
||||
<field name="stage_id" ref="stage_job6"/>
|
||||
<field eval="time.strftime('%Y-%m-20 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Send mail regarding our interview</field>
|
||||
</record>
|
||||
<record id="hr_case_financejob0" model="hr.applicant">
|
||||
<field name="name">Finance Job</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_licenced"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
|
||||
<field name="user_id" ref="base.user_root"/>
|
||||
<field name="priority">4</field>
|
||||
<field name="partner_name">David Armstrong</field>
|
||||
<field name="stage_id" ref="stage_job2"/>
|
||||
<field name="partner_phone">33968745</field>
|
||||
<field eval="time.strftime('%Y-%m-18 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Send mail regarding our interview</field>
|
||||
</record>
|
||||
<record id="hr_case_traineemca1" model="hr.applicant">
|
||||
<field name="name">Trainee - MCA</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_bac5"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
|
||||
<field name="partner_name">Tina Augustie</field>
|
||||
<field name="partner_mobile">9898745745</field>
|
||||
<field name="stage_id" ref="stage_job4"/>
|
||||
<field name="partner_phone">6630125</field>
|
||||
<field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Send mail regarding our interview</field>
|
||||
</record>
|
||||
<record id="hr_case_programmer" model="hr.applicant">
|
||||
<field name="name">Programmer</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_bac5"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
|
||||
<field name="partner_name">Shane Williams</field>
|
||||
<field name="partner_mobile">9812398524</field>
|
||||
<field name="stage_id" ref="stage_job4"/>
|
||||
<field name="partner_phone">6630125</field>
|
||||
<field name="salary_expected">11000.0</field>
|
||||
<field eval="time.strftime('%Y-%m-24 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Send mail regarding our interview</field>
|
||||
</record>
|
||||
<record id="hr_case_advertisement" model="hr.applicant">
|
||||
<field name="name">Advertisement</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="type_id" ref="degree_licenced"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
|
||||
<field name="partner_name">David Armstrong</field>
|
||||
<field name="partner_mobile">9988774455</field>
|
||||
<field name="stage_id" ref="stage_job2"/>
|
||||
<field name="salary_expected">11000.0</field>
|
||||
<field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
|
||||
<field name="title_action">Send mail regarding our interview</field>
|
||||
</record>
|
||||
|
||||
<record id="hr.job_developer" model="hr.job">
|
||||
<field name="survey_id" ref="survey_job_0"/>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
-
|
||||
!record {model: hr.applicant, id: hr_case_salesman0}:
|
||||
date: !eval time.strftime('%Y-%m-01 10:35:50')
|
||||
type_id: degree_graduate
|
||||
priority: '2'
|
||||
partner_name: 'Enrique Jones'
|
||||
partner_mobile: '9963214587'
|
||||
job_id: hr.job_developer
|
||||
stage_id: stage_job1
|
||||
name: 'Salesperson'
|
||||
partner_phone: '1236547890'
|
||||
|
||||
-
|
||||
!record {model: hr.applicant, id: hr_case_traineemca0}:
|
||||
date: !eval time.strftime('%Y-%m-10 18:15:00')
|
||||
type_id: degree_bac5
|
||||
priority: '3'
|
||||
user_id: base.user_demo
|
||||
partner_name: 'Marie Justine'
|
||||
partner_mobile: '9988774455'
|
||||
job_id: hr.job_developer
|
||||
stage_id: stage_job4
|
||||
name: 'Trainee - MCA'
|
||||
partner_phone: '6633225'
|
||||
-
|
||||
!record {model: hr.applicant, id: hr_case_fresher0}:
|
||||
date: !eval time.strftime('%Y-%m-15 16:10:00')
|
||||
type_id: degree_licenced
|
||||
priority: '1'
|
||||
user_id: base.user_root
|
||||
partner_name: 'Jose'
|
||||
job_id: hr.job_developer
|
||||
stage_id: stage_job3
|
||||
name: 'Fresher'
|
||||
partner_phone: '999666735'
|
||||
-
|
||||
!record {model: hr.applicant, id: hr_case_yrsexperienceinphp0}:
|
||||
date: !eval time.strftime('%Y-%m-25 16:25:52')
|
||||
job_id: hr.job_developer
|
||||
type_id: degree_bac5
|
||||
user_id: base.user_root
|
||||
partner_name: 'Sandra Elvis'
|
||||
stage_id: stage_job6
|
||||
name: 'More than 5 yrs Experience in PHP'
|
||||
-
|
||||
!record {model: hr.applicant, id: hr_case_marketingjob0}:
|
||||
date: !eval time.strftime('%Y-%m-26 17:15:32')
|
||||
type_id: degree_licenced
|
||||
user_id: base.user_demo
|
||||
partner_name: 'John Bruno'
|
||||
job_id: hr.job_developer
|
||||
color: 5
|
||||
stage_id: stage_job5
|
||||
name: 'Marketing Job'
|
||||
-
|
||||
!record {model: hr.applicant, id: hr_case_financejob0}:
|
||||
date: !eval time.strftime('%Y-%m-26 17:39:42')
|
||||
type_id: degree_licenced
|
||||
priority: '4'
|
||||
partner_name: 'David Armstrong'
|
||||
partner_mobile: '9966332214'
|
||||
job_id: hr.job_developer
|
||||
stage_id: stage_job2
|
||||
name: 'Finance Job'
|
||||
partner_phone: '33968745'
|
||||
-
|
||||
!record {model: hr.applicant, id: hr_case_traineemca1}:
|
||||
date: !eval time.strftime('%Y-%m-12 17:49:19')
|
||||
type_id: degree_bac5
|
||||
partner_name: 'Tina Augustie'
|
||||
partner_mobile: '9898745745'
|
||||
job_id: hr.job_developer
|
||||
stage_id: stage_job4
|
||||
name: 'Trainee - MCA'
|
||||
partner_phone: '6630125'
|
||||
|
||||
-
|
||||
!record {model: hr.applicant, id: hr_case_programmer}:
|
||||
date: !eval time.strftime('%Y-%m-12 17:49:19')
|
||||
type_id: degree_bac5
|
||||
partner_name: 'Shane Williams'
|
||||
partner_mobile: '9812398524'
|
||||
stage_id: stage_job4
|
||||
name: 'Programmer'
|
||||
partner_phone: '6630125'
|
||||
job_id: hr.job_developer
|
||||
department_id: hr.dep_rd
|
||||
salary_expected: 11000.0
|
||||
|
||||
-
|
||||
!record {model: hr.applicant, id: hr_case_advertisement}:
|
||||
date: !eval time.strftime('%Y-%m-26 17:39:42')
|
||||
type_id: degree_licenced
|
||||
partner_name: 'David Armstrong'
|
||||
job_id: hr.job_developer
|
||||
stage_id: stage_job2
|
||||
color: 4
|
||||
name: 'Advertisement'
|
||||
salary_expected: 11000.0
|
||||
-
|
||||
!record {model: hr.job, id: hr.job_developer}:
|
||||
survey_id: hr_recruitment.survey_job_0
|
||||
|
|
@ -263,9 +263,14 @@
|
|||
<i><field name="name"/></i><br/>
|
||||
<field name="job_id"/><br/>
|
||||
<t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
|
||||
<t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
|
||||
<field name="date_action"/>
|
||||
</div>
|
||||
<div style="padding-left: 0.5em">
|
||||
<t t-if="record.date_action.raw_value and record.date_action.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
|
||||
<span t-attf-class="#{red || ''}"><field name="date_action"/></span>
|
||||
<t t-if="record.date_action.raw_value"> : </t>
|
||||
<field name="title_action"/>
|
||||
</div>
|
||||
<div style="width:240px"><field name="categ_ids"/></div>
|
||||
<div class="oe_kanban_right">
|
||||
<t t-set="priority" t-value="record.priority.raw_value || 5"/>
|
||||
<a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
|
||||
|
|
@ -285,7 +290,6 @@
|
|||
</div>
|
||||
<div class="oe_kanban_footer_left" style="margin-top:5px;">
|
||||
<t t-raw="record.message_summary.raw_value"/>
|
||||
<field name="categ_ids"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="oe_clear"></div>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
|
||||
{
|
||||
'name': 'Timesheets',
|
||||
'name': 'Time Tracking',
|
||||
'version': '1.0',
|
||||
'category': 'Human Resources',
|
||||
'sequence': 23,
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
<field name="model">mail.mail</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Email message" version="7.0">
|
||||
<header>
|
||||
<button name="send" string="Send Now" type="object" states='outgoing' class="oe_highlight"/>
|
||||
<button name="mark_outgoing" string="Retry" type="object" states='exception,cancel'/>
|
||||
<button name="cancel" string="Cancel" type="object" states='outgoing'/>
|
||||
</header>
|
||||
<sheet>
|
||||
<label for="subject" class="oe_edit_only"/>
|
||||
<h2><field name="subject"/></h2>
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">kanban,tree,form</field>
|
||||
<field name="search_view_id" ref="view_note_note_filter"/>
|
||||
<field name="context">{'search_default_open_true':True}</field>
|
||||
<field name="context">{}</field>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to add a personal note.
|
||||
|
|
|
|||
Loading…
Reference in New Issue