[MERGE] Merged lp:openobject-addons
bzr revid: psa@tinyerp.com-20130610131953-psfzlhcuzhv7chcx
This commit is contained in:
Paramjit Singh Sahota
commit
e5f8d73bce
|
|
@ -2317,7 +2317,7 @@ class account_model(osv.osv):
|
|||
try:
|
||||
entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
|
||||
except:
|
||||
raise osv.except_osv(_('Wrong model !'), _('You have a wrong expression "%(...)s" in your model !'))
|
||||
raise osv.except_osv(_('Wrong Model!'), _('You have a wrong expression "%(...)s" in your model!'))
|
||||
move_id = account_move_obj.create(cr, uid, {
|
||||
'ref': entry['name'],
|
||||
'period_id': period_id,
|
||||
|
|
|
|||
|
|
@ -630,7 +630,7 @@ class account_invoice(osv.osv):
|
|||
obj_l = account_obj.browse(cr, uid, inv_line[2]['account_id'])
|
||||
if obj_l.company_id.id != company_id:
|
||||
raise osv.except_osv(_('Configuration Error!'),
|
||||
_('Invoice line account\'s company and invoice\'s compnay does not match.'))
|
||||
_('Invoice line account\'s company and invoice\'s company does not match.'))
|
||||
else:
|
||||
continue
|
||||
if company_id and type:
|
||||
|
|
@ -933,7 +933,7 @@ class account_invoice(osv.osv):
|
|||
group_check_total = self.pool.get('res.groups').browse(cr, uid, group_check_total_id, context=context)
|
||||
if group_check_total and uid in [x.id for x in group_check_total.users]:
|
||||
if (inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0)):
|
||||
raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe encoded total does not match the computed total.'))
|
||||
raise osv.except_osv(_('Bad Total!'), _('Please verify the price of the invoice!\nThe encoded total does not match the computed total.'))
|
||||
|
||||
if inv.payment_term:
|
||||
total_fixed = total_percent = 0
|
||||
|
|
|
|||
|
|
@ -1181,7 +1181,7 @@ class account_move_line(osv.osv):
|
|||
move_id = move_obj.create(cr, uid, v, context)
|
||||
vals['move_id'] = move_id
|
||||
else:
|
||||
raise osv.except_osv(_('No piece number !'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
|
||||
raise osv.except_osv(_('No Piece Number!'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
|
||||
ok = not (journal.type_control_ids or journal.account_control_ids)
|
||||
if ('account_id' in vals):
|
||||
account = account_obj.browse(cr, uid, vals['account_id'], context=context)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -111,7 +111,7 @@ class account_installer(osv.osv_memory):
|
|||
def check_unconfigured_cmp(self, cr, uid, context=None):
|
||||
""" check if there are still unconfigured companies """
|
||||
if not self.get_unconfigured_cmp(cr, uid, context=context):
|
||||
raise osv.except_osv(_('No unconfigured company !'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
|
||||
raise osv.except_osv(_('No Unconfigured Company!'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
|
||||
|
||||
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
|
||||
if context is None: context = {}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ class validate_account_move_lines(osv.osv_memory):
|
|||
move_ids.append(line.move_id.id)
|
||||
move_ids = list(set(move_ids))
|
||||
if not move_ids:
|
||||
raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move enties in draft state.'))
|
||||
raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move entries in draft state.'))
|
||||
obj_move.button_validate(cr, uid, move_ids, context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
|
|
|
|||
|
|
@ -1622,7 +1622,7 @@ class account_bank_statement(osv.osv):
|
|||
for bk_st in self.browse(cr, uid, ids, context=context):
|
||||
if vals.get('journal_id') and bk_st.line_ids:
|
||||
if any([x.voucher_id and True or False for x in bk_st.line_ids]):
|
||||
raise osv.except_osv(_('Unable to change journal !'), _('You can not change the journal as you already reconciled some statement lines!'))
|
||||
raise osv.except_osv(_('Unable to Change Journal!'), _('You can not change the journal as you already reconciled some statement lines!'))
|
||||
return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ class account_analytic_account(osv.osv):
|
|||
for account in self.browse(cr, uid, ids, context=context):
|
||||
if account.company_id:
|
||||
if account.company_id.currency_id.id != value:
|
||||
raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example."))
|
||||
raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really useful for consolidation purposes of several companies charts with different currencies, for example."))
|
||||
if value:
|
||||
return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, ))
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class hr_analytic_timesheet(osv.osv):
|
|||
a = r.product_id.categ_id.property_account_expense_categ.id
|
||||
if not a:
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('There is no expense account define ' \
|
||||
_('There is no expense account defined ' \
|
||||
'for this product: "%s" (id:%d)') % \
|
||||
(r.product_id.name, r.product_id.id,))
|
||||
# Compute based on pricetype
|
||||
|
|
@ -133,7 +133,7 @@ class hr_analytic_timesheet(osv.osv):
|
|||
a = r.product_id.categ_id.property_account_expense_categ.id
|
||||
if not a:
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_('There is no expense account define ' \
|
||||
_('There is no expense account defined ' \
|
||||
'for this product: "%s" (id:%d)') % \
|
||||
(r.product_id.name, r.product_id.id,))
|
||||
# Compute based on pricetype
|
||||
|
|
|
|||
|
|
@ -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-30 13:52+0000\n"
|
||||
"PO-Revision-Date: 2013-06-06 09:56+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-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
|
||||
"X-Generator: Launchpad (build 16667)\n"
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.lead.report:0
|
||||
|
|
@ -56,6 +56,11 @@ msgid ""
|
|||
"Description: [[object.description]]\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"Внимание, необработанный кандидат создан более 5 дней назад.\n"
|
||||
"Название: [[object.name ]]\n"
|
||||
"Идентификатор: [[object.id ]]\n"
|
||||
"Описание: [[object.description]]\n"
|
||||
" "
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.opportunity2phonecall,action:0
|
||||
|
|
@ -953,7 +958,7 @@ msgstr "Следующее действие"
|
|||
#: code:addons/crm/crm_lead.py:763
|
||||
#, python-format
|
||||
msgid "<b>Partner</b> set to <em>%s</em>."
|
||||
msgstr ""
|
||||
msgstr "<b>Партнер</b> установлен как <em>%s</em>."
|
||||
|
||||
#. module: crm
|
||||
#: selection:crm.lead.report,state:0
|
||||
|
|
@ -1894,7 +1899,7 @@ msgstr "Кандидаты"
|
|||
#: code:addons/crm/crm_lead.py:563
|
||||
#, python-format
|
||||
msgid "Merged leads"
|
||||
msgstr ""
|
||||
msgstr "Объединенные кандидаты"
|
||||
|
||||
#. module: crm
|
||||
#: model:crm.case.categ,name:crm.categ_oppor5
|
||||
|
|
@ -2721,7 +2726,7 @@ msgstr "Улица (2-я строка)"
|
|||
#. module: crm
|
||||
#: field:sale.config.settings,module_crm_helpdesk:0
|
||||
msgid "Manage Helpdesk and Support"
|
||||
msgstr ""
|
||||
msgstr "Управление поддержкой"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.lead.report,delay_open:0
|
||||
|
|
@ -2830,7 +2835,7 @@ msgstr "Дата создания"
|
|||
#. module: crm
|
||||
#: view:crm.lead:0
|
||||
msgid "at"
|
||||
msgstr ""
|
||||
msgstr "в"
|
||||
|
||||
#. module: crm
|
||||
#: model:crm.case.stage,name:crm.stage_lead1
|
||||
|
|
|
|||
|
|
@ -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-14 13:33+0000\n"
|
||||
"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
|
||||
"PO-Revision-Date: 2013-06-07 05:02+0000\n"
|
||||
"Last-Translator: PeterGao <306739889@qq.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-03-16 05:46+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-06-08 05:52+0000\n"
|
||||
"X-Generator: Launchpad (build 16667)\n"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: field:crm.helpdesk.report,delay_close:0
|
||||
|
|
@ -656,6 +656,12 @@ msgid ""
|
|||
" \n"
|
||||
"If the case needs to be reviewed then the status is set to 'Pending'."
|
||||
msgstr ""
|
||||
"当一个“case(事件)\"被新创建后，这个“case(事件)\"的状态为“草稿”状态。 "
|
||||
" \n"
|
||||
"若这个“case(事件)\"正在处理中，这个“case(事件)\"的状态为“开启”状态。\n"
|
||||
"若这个“case(事件)\"已处理完结，这个“case(事件)\"的状态为“结单”状态。 "
|
||||
" \n"
|
||||
"若这个“case(事件)\"需暂停再议，这个“case(事件)\"的状态为“挂起”状态。"
|
||||
|
||||
#. module: crm_helpdesk
|
||||
#: help:crm.helpdesk,message_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: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2013-05-30 14:10+0000\n"
|
||||
"PO-Revision-Date: 2013-06-06 10:24+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-05-31 05:38+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
|
||||
"X-Generator: Launchpad (build 16667)\n"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: field:crm.lead.report.assign,delay_close:0
|
||||
|
|
@ -670,7 +670,7 @@ msgstr ""
|
|||
#. module: crm_partner_assign
|
||||
#: field:crm.partner.report.assign,period_id:0
|
||||
msgid "Invoice Period"
|
||||
msgstr ""
|
||||
msgstr "Период счета"
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
|
||||
|
|
@ -706,6 +706,8 @@ msgid ""
|
|||
"Cannot contact geolocation servers. Please make sure that your internet "
|
||||
"connection is up and running (%s)."
|
||||
msgstr ""
|
||||
"Не удается связаться с сервером геолокации. Пожалуйста, убедитесь, что ваше "
|
||||
"подключение к интернету работает (%s)."
|
||||
|
||||
#. module: crm_partner_assign
|
||||
#: selection:crm.lead.report.assign,month:0
|
||||
|
|
|
|||
|
|
@ -51,10 +51,10 @@ class sale_order(osv.osv):
|
|||
for order in self.browse(cr, uid, ids, context=context):
|
||||
grid_id = carrier_obj.grid_get(cr, uid, [order.carrier_id.id], order.partner_shipping_id.id)
|
||||
if not grid_id:
|
||||
raise osv.except_osv(_('No grid available !'), _('No grid matching for this carrier !'))
|
||||
raise osv.except_osv(_('No Grid Available!'), _('No grid matching for this carrier!'))
|
||||
|
||||
if not order.state in ('draft'):
|
||||
raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
|
||||
raise osv.except_osv(_('Order not in Draft State!'), _('The order state have to be draft to add delivery lines.'))
|
||||
|
||||
grid = grid_obj.browse(cr, uid, grid_id, context=context)
|
||||
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ class edi(osv.AbstractModel):
|
|||
module = edi_document.get('__import_module') or edi_document.get('__module')
|
||||
assert module, 'a `__module` or `__import_module` attribute is required in each EDI document.'
|
||||
if module != 'base' and not ir_module.search(cr, uid, [('name','=',module),('state','=','installed')]):
|
||||
raise osv.except_osv(_('Missing application.'),
|
||||
raise osv.except_osv(_('Missing Application.'),
|
||||
_("The document you are trying to import requires the OpenERP `%s` application. "
|
||||
"You can install it by connecting as the administrator and opening the configuration assistant.")%(module,))
|
||||
model = edi_document.get('__import_model') or edi_document.get('__model')
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ class account_analytic_line(osv.osv):
|
|||
for account in analytic_account_obj.browse(cr, uid, list(account_ids), context=context):
|
||||
partner = account.partner_id
|
||||
if (not partner) or not (account.pricelist_id):
|
||||
raise osv.except_osv(_('Analytic Account incomplete !'),
|
||||
raise osv.except_osv(_('Analytic Account Incomplete!'),
|
||||
_('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
|
||||
|
||||
date_due = False
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
|
|||
obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
|
||||
vat_no = obj_company.partner_id.vat
|
||||
if not vat_no:
|
||||
raise osv.except_osv(_('insufficient data!'), _('No VAT number associated with your company.'))
|
||||
raise osv.except_osv(_('Insufficient Data!'), _('No VAT number associated with your company.'))
|
||||
vat_no = vat_no.replace(' ','').upper()
|
||||
vat = vat_no[2:]
|
||||
|
||||
|
|
|
|||
|
|
@ -60,12 +60,12 @@ class partner_vat(osv.osv_memory):
|
|||
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
|
||||
period_ids = obj_period.search(cr, uid, [('date_start' ,'>=', date_start), ('date_stop','<=',date_stop), ('company_id','=',company_id)])
|
||||
if not period_ids:
|
||||
raise osv.except_osv(_('insufficient data!'), _('No data for the selected year.'))
|
||||
raise osv.except_osv(_('Insufficient Data!'), _('No data for the selected year.'))
|
||||
|
||||
partners = []
|
||||
partner_ids = obj_partner.search(cr, uid, [('vat_subjected', '!=', False), ('vat','ilike','BE%')], context=context)
|
||||
if not partner_ids:
|
||||
raise osv.except_osv(_('Error'),_('No belgian contact with a VAT number in your database.'))
|
||||
raise osv.except_osv(_('Error'),_('No belgium contact with a VAT number in your database.'))
|
||||
cr.execute("""SELECT sub1.partner_id, sub1.name, sub1.vat, sub1.turnover, sub2.vat_amount
|
||||
FROM (SELECT l.partner_id, p.name, p.vat, SUM(CASE WHEN c.code ='49' THEN -l.tax_amount ELSE l.tax_amount END) as turnover
|
||||
FROM account_move_line l
|
||||
|
|
@ -90,7 +90,7 @@ class partner_vat(osv.osv_memory):
|
|||
partners.append(id_client)
|
||||
|
||||
if not partners:
|
||||
raise osv.except_osv(_('insufficient data!'), _('No data found for the selected year.'))
|
||||
raise osv.except_osv(_('Insufficient Data!'), _('No data found for the selected year.'))
|
||||
context.update({'partner_ids': partners, 'year': data['year'], 'limit_amount': data['limit_amount']})
|
||||
model_data_ids = obj_model_data.search(cr, uid, [('model','=','ir.ui.view'), ('name','=','view_vat_listing')])
|
||||
resource_id = obj_model_data.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ class partner_vat_intra(osv.osv_memory):
|
|||
# Get Company vat
|
||||
company_vat = data_company.partner_id.vat
|
||||
if not company_vat:
|
||||
raise osv.except_osv(_('insufficient data!'),_('No VAT number associated with your company.'))
|
||||
raise osv.except_osv(_('Insufficient Data!'),_('No VAT number associated with your company.'))
|
||||
company_vat = company_vat.replace(' ','').upper()
|
||||
issued_by = company_vat[:2]
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ class partner_vat_intra(osv.osv_memory):
|
|||
|
||||
p_id_list = obj_partner.search(cr, uid, [('vat','!=',False)], context=context)
|
||||
if not p_id_list:
|
||||
raise osv.except_osv(_('Insufficient Data!'),_('No partner has a VAT number asociated with him.'))
|
||||
raise osv.except_osv(_('Insufficient Data!'),_('No partner has a VAT number associated with him.'))
|
||||
|
||||
seq_declarantnum = obj_sequence.get(cr, uid, 'declarantnum')
|
||||
dnum = company_vat[2:] + seq_declarantnum[-4:]
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ class report_custom(report_int):
|
|||
self.obj.render()
|
||||
return (self.obj.pdf, 'pdf')
|
||||
except Exception:
|
||||
raise osv.except_osv(_('pdf not created !'), _('Please check if package pdftk is installed!'))
|
||||
raise osv.except_osv(_('PDF Not Created!'), _('Please check if package pdftk is installed!'))
|
||||
|
||||
report_custom('report.l10n_lu.tax.report.print')
|
||||
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ class mrp_production_workcenter_line(osv.osv):
|
|||
elif prod_obj.state =='in_production':
|
||||
return
|
||||
else:
|
||||
raise osv.except_osv(_('Error!'),_('Manufacturing order cannot start in state "%s"!') % (prod_obj.state,))
|
||||
raise osv.except_osv(_('Error!'),_('Manufacturing order cannot be started in state "%s"!') % (prod_obj.state,))
|
||||
else:
|
||||
oper_ids = self.search(cr,uid,[('production_id','=',prod_obj.id)])
|
||||
obj = self.browse(cr,uid,oper_ids)
|
||||
|
|
|
|||
|
|
@ -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-08-17 11:09+0000\n"
|
||||
"PO-Revision-Date: 2013-06-06 10:25+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:36+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
|
||||
"X-Generator: Launchpad (build 16667)\n"
|
||||
|
||||
#. module: multi_company
|
||||
#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
|
||||
|
|
@ -45,6 +45,16 @@ msgid ""
|
|||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Уважаемые господа,\n"
|
||||
"\n"
|
||||
"Наши записи зафиксировали что некоторые платежи остаются неоплаченными. "
|
||||
"Пожалуйста ознакомьтесь с подробностями ниже.\n"
|
||||
"Если сумма уже была оплачена, пожалуйста проигнорируйте это оповещение. В "
|
||||
"ином случае, пожалуйста перечислите нам всю сумму отображенную ниже.\n"
|
||||
"Если у вас есть какие-либо замечания, пожалуйста свяжитесь с нами.\n"
|
||||
"\n"
|
||||
"Заранее благодарим за сотрудничество.\n"
|
||||
"С наилучшими пожеланиями,"
|
||||
|
||||
#. module: multi_company
|
||||
#: view:multi_company.default:0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,286 @@
|
|||
# Russian 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: 2012-12-21 17:04+0000\n"
|
||||
"PO-Revision-Date: 2013-06-06 10:35+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-06-07 05:48+0000\n"
|
||||
"X-Generator: Launchpad (build 16667)\n"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,memo:0
|
||||
msgid "Note Content"
|
||||
msgstr "Содержание заметки"
|
||||
|
||||
#. module: note
|
||||
#: view:note.stage:0
|
||||
msgid "Stages of Notes"
|
||||
msgstr "Этапы заметок"
|
||||
|
||||
#. module: note
|
||||
#: model:note.stage,name:note.demo_note_stage_04
|
||||
#: model:note.stage,name:note.note_stage_02
|
||||
msgid "This Week"
|
||||
msgstr "Эта неделя"
|
||||
|
||||
#. module: note
|
||||
#: model:ir.model,name:note.model_base_config_settings
|
||||
msgid "base.config.settings"
|
||||
msgstr "base.config.settings"
|
||||
|
||||
#. module: note
|
||||
#: model:ir.model,name:note.model_note_tag
|
||||
msgid "Note Tag"
|
||||
msgstr "Тег заметки"
|
||||
|
||||
#. module: note
|
||||
#: model:res.groups,name:note.group_note_fancy
|
||||
msgid "Notes / Fancy mode"
|
||||
msgstr ""
|
||||
|
||||
#. module: note
|
||||
#: model:ir.model,name:note.model_note_note
|
||||
#: view:note.note:0
|
||||
msgid "Note"
|
||||
msgstr "Заметка"
|
||||
|
||||
#. module: note
|
||||
#: view:note.note:0
|
||||
msgid "Group By..."
|
||||
msgstr "Группировать по ..."
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,message_follower_ids:0
|
||||
msgid "Followers"
|
||||
msgstr "Подписчики"
|
||||
|
||||
#. module: note
|
||||
#: model:ir.actions.act_window,help:note.action_note_note
|
||||
msgid ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Click to add a personal note.\n"
|
||||
" </p><p>\n"
|
||||
" Use notes to organize personal tasks or notes. All\n"
|
||||
" notes are private; no one else will be able to see them. "
|
||||
"However\n"
|
||||
" you can share some notes with other people by inviting "
|
||||
"followers\n"
|
||||
" on the note. (Useful for meeting minutes, especially if\n"
|
||||
" you activate the pad feature for collaborative writings).\n"
|
||||
" </p><p>\n"
|
||||
" You can customize how you process your notes/tasks by adding,\n"
|
||||
" removing or modifying columns.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
|
||||
#. module: note
|
||||
#: model:note.stage,name:note.demo_note_stage_01
|
||||
#: model:note.stage,name:note.note_stage_01
|
||||
msgid "Today"
|
||||
msgstr "Сегодня"
|
||||
|
||||
#. module: note
|
||||
#: model:ir.model,name:note.model_res_users
|
||||
msgid "Users"
|
||||
msgstr "Пользователи"
|
||||
|
||||
#. module: note
|
||||
#: view:note.note:0
|
||||
msgid "í"
|
||||
msgstr ""
|
||||
|
||||
#. module: note
|
||||
#: view:note.stage:0
|
||||
msgid "Stage of Notes"
|
||||
msgstr "Этап заметок"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,message_unread:0
|
||||
msgid "Unread Messages"
|
||||
msgstr "Непрочитанные"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,current_partner_id:0
|
||||
msgid "unknown"
|
||||
msgstr "неизвестно"
|
||||
|
||||
#. module: note
|
||||
#: view:note.note:0
|
||||
msgid "By sticky note Category"
|
||||
msgstr ""
|
||||
|
||||
#. module: note
|
||||
#: help:note.note,message_unread:0
|
||||
msgid "If checked new messages require your attention."
|
||||
msgstr "Если отмечено, новые сообщения требуют вашего внимания."
|
||||
|
||||
#. module: note
|
||||
#: field:note.stage,name:0
|
||||
msgid "Stage Name"
|
||||
msgstr "Название этапа"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,message_is_follower:0
|
||||
msgid "Is a Follower"
|
||||
msgstr "Подписан"
|
||||
|
||||
#. module: note
|
||||
#: model:note.stage,name:note.demo_note_stage_02
|
||||
msgid "Tomorrow"
|
||||
msgstr "Завтра"
|
||||
|
||||
#. module: note
|
||||
#: view:note.note:0
|
||||
#: field:note.note,open:0
|
||||
msgid "Active"
|
||||
msgstr "Активно"
|
||||
|
||||
#. module: note
|
||||
#: help:note.stage,user_id:0
|
||||
msgid "Owner of the note stage."
|
||||
msgstr "Владелец этапа заметки"
|
||||
|
||||
#. module: note
|
||||
#: model:ir.ui.menu,name:note.menu_notes_stage
|
||||
msgid "Categories"
|
||||
msgstr "Категории"
|
||||
|
||||
#. module: note
|
||||
#: view:note.note:0
|
||||
#: field:note.note,stage_id:0
|
||||
msgid "Stage"
|
||||
msgstr "Этап"
|
||||
|
||||
#. module: note
|
||||
#: field:note.tag,name:0
|
||||
msgid "Tag Name"
|
||||
msgstr "Название тега"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,message_ids:0
|
||||
msgid "Messages"
|
||||
msgstr "Сообщения"
|
||||
|
||||
#. module: note
|
||||
#: view:base.config.settings:0
|
||||
#: model:ir.actions.act_window,name:note.action_note_note
|
||||
#: model:ir.ui.menu,name:note.menu_note_notes
|
||||
#: view:note.note:0
|
||||
#: model:note.stage,name:note.note_stage_04
|
||||
msgid "Notes"
|
||||
msgstr "Заметки"
|
||||
|
||||
#. module: note
|
||||
#: model:note.stage,name:note.demo_note_stage_03
|
||||
#: model:note.stage,name:note.note_stage_03
|
||||
msgid "Later"
|
||||
msgstr "Позже"
|
||||
|
||||
#. module: note
|
||||
#: model:ir.model,name:note.model_note_stage
|
||||
msgid "Note Stage"
|
||||
msgstr "Этап заметки"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,message_summary:0
|
||||
msgid "Summary"
|
||||
msgstr "Итог"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,stage_ids:0
|
||||
msgid "Stages of Users"
|
||||
msgstr "Этапы пользователей"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,name:0
|
||||
msgid "Note Summary"
|
||||
msgstr "Заметка - кратко"
|
||||
|
||||
#. module: note
|
||||
#: model:ir.actions.act_window,name:note.action_note_stage
|
||||
#: view:note.note:0
|
||||
msgid "Stages"
|
||||
msgstr "Этапы"
|
||||
|
||||
#. module: note
|
||||
#: help:note.note,message_ids:0
|
||||
msgid "Messages and communication history"
|
||||
msgstr "Сообщения и история общения"
|
||||
|
||||
#. module: note
|
||||
#: view:note.note:0
|
||||
msgid "Delete"
|
||||
msgstr "Удалить"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,color:0
|
||||
msgid "Color Index"
|
||||
msgstr "Цветовая палитра"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,sequence:0
|
||||
#: field:note.stage,sequence:0
|
||||
msgid "Sequence"
|
||||
msgstr "Нумерация"
|
||||
|
||||
#. module: note
|
||||
#: view:note.note:0
|
||||
#: field:note.note,tag_ids:0
|
||||
msgid "Tags"
|
||||
msgstr "Теги"
|
||||
|
||||
#. module: note
|
||||
#: view:note.note:0
|
||||
msgid "Archive"
|
||||
msgstr "Архив"
|
||||
|
||||
#. module: note
|
||||
#: field:base.config.settings,module_note_pad:0
|
||||
msgid "Use collaborative pads (etherpad)"
|
||||
msgstr "Используйте совместный планшет (etherpad)"
|
||||
|
||||
#. module: note
|
||||
#: help:note.note,message_summary:0
|
||||
msgid ""
|
||||
"Holds the Chatter summary (number of messages, ...). This summary is "
|
||||
"directly in html format in order to be inserted in kanban views."
|
||||
msgstr ""
|
||||
"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
|
||||
"html для возможности использования в канбан виде"
|
||||
|
||||
#. module: note
|
||||
#: field:base.config.settings,group_note_fancy:0
|
||||
msgid "Use fancy layouts for notes"
|
||||
msgstr ""
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,current_partner_id:0
|
||||
#: field:note.stage,user_id:0
|
||||
msgid "Owner"
|
||||
msgstr "Владелец"
|
||||
|
||||
#. module: note
|
||||
#: help:note.stage,sequence:0
|
||||
msgid "Used to order the note stages"
|
||||
msgstr "Используется для сортировки этапов заметок"
|
||||
|
||||
#. module: note
|
||||
#: field:note.note,date_done:0
|
||||
msgid "Date done"
|
||||
msgstr "Дата выполнения"
|
||||
|
||||
#. module: note
|
||||
#: field:note.stage,fold:0
|
||||
msgid "Folded by Default"
|
||||
msgstr "Свернуто по умолчанию"
|
||||
|
|
@ -407,7 +407,7 @@ class pos_session(osv.osv):
|
|||
# The pos manager can close statements with maximums.
|
||||
if not self.pool.get('ir.model.access').check_groups(cr, uid, "point_of_sale.group_pos_manager"):
|
||||
raise osv.except_osv( _('Error!'),
|
||||
_("Your ending balance is too different from the theorical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it.") % (st.difference, st.journal_id.amount_authorized_diff))
|
||||
_("Your ending balance is too different from the theoretical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it.") % (st.difference, st.journal_id.amount_authorized_diff))
|
||||
if (st.journal_id.type not in ['bank', 'cash']):
|
||||
raise osv.except_osv(_('Error!'),
|
||||
_("The type of the journal for your payment method should be bank or cash "))
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ class wizard_user(osv.osv_memory):
|
|||
this_context = context
|
||||
this_user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context)
|
||||
if not this_user.email:
|
||||
raise osv.except_osv(_('Email required'),
|
||||
raise osv.except_osv(_('Email Required'),
|
||||
_('You must have an email address in your User Preferences to send emails.'))
|
||||
|
||||
# determine subject and body in the portal user's language
|
||||
|
|
|
|||
|
|
@ -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-06-03 07:54+0000\n"
|
||||
"PO-Revision-Date: 2013-06-06 11:38+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-06-04 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build 16660)\n"
|
||||
"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
|
||||
"X-Generator: Launchpad (build 16667)\n"
|
||||
|
||||
#. module: sale
|
||||
#: model:res.groups,name:sale.group_analytic_accounting
|
||||
|
|
@ -191,7 +191,7 @@ msgstr "Счет аналитики"
|
|||
#: field:sale.config.settings,module_sale_journal:0
|
||||
msgid "Allow batch invoicing of delivery orders through journals"
|
||||
msgstr ""
|
||||
"Разрешить групповое выставление счета из заказов на доставку через журналы"
|
||||
"Разрешить групповое выставление счетов из заказов доставки через журналы"
|
||||
|
||||
#. module: sale
|
||||
#: field:sale.order.line,price_subtotal:0
|
||||
|
|
@ -223,7 +223,7 @@ msgstr "Особенности склада"
|
|||
#. module: sale
|
||||
#: field:sale.config.settings,time_unit:0
|
||||
msgid "The default working time unit for services is"
|
||||
msgstr ""
|
||||
msgstr "Единица измерения времени для услуг"
|
||||
|
||||
#. module: sale
|
||||
#: field:sale.order.line,product_uom:0
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ class crm_make_sale(osv.osv_memory):
|
|||
['default', 'invoice', 'delivery', 'contact'])
|
||||
pricelist = partner.property_product_pricelist.id
|
||||
if False in partner_addr.values():
|
||||
raise osv.except_osv(_('Insufficient Data!'), _('No addresse(s) defined for this customer.'))
|
||||
raise osv.except_osv(_('Insufficient Data!'), _('No address(es) defined for this customer.'))
|
||||
|
||||
vals = {
|
||||
'origin': _('Opportunity: %s') % str(case.id),
|
||||
|
|
|
|||
|
|
@ -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:06+0000\n"
|
||||
"PO-Revision-Date: 2013-01-04 16:04+0000\n"
|
||||
"PO-Revision-Date: 2013-06-06 11:30+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:51+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
|
||||
"X-Generator: Launchpad (build 16667)\n"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,group_invoice_deli_orders:0
|
||||
|
|
@ -22,11 +22,13 @@ msgid ""
|
|||
"To allow your salesman to make invoices for Delivery Orders using the menu "
|
||||
"'Deliveries to Invoice'."
|
||||
msgstr ""
|
||||
"Позволяет вашему продавцу создавать счета для заказов доставки используя "
|
||||
"меню \"Доставки в счета\"."
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.node,name:sale_stock.process_node_deliveryorder0
|
||||
msgid "Delivery Order"
|
||||
msgstr "Заказ на доставку"
|
||||
msgstr "Заказ доставки"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
|
||||
|
|
@ -86,12 +88,12 @@ msgstr ""
|
|||
#. module: sale_stock
|
||||
#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
|
||||
msgid "Create Procurement Order"
|
||||
msgstr "Создать заказ на снабжение"
|
||||
msgstr "Создать заказ снабжения"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:stock.picking.out,sale_id:0
|
||||
msgid "Sale Order"
|
||||
msgstr "Заказ"
|
||||
msgstr "Заказ продажи"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
|
||||
|
|
@ -99,8 +101,8 @@ msgid ""
|
|||
"For every sales order line, a procurement order is created to supply the "
|
||||
"sold product."
|
||||
msgstr ""
|
||||
"Для каждой позиции заказа на продажу создается заказ на снабжение для "
|
||||
"поставки проданных ТМЦ."
|
||||
"Для каждой позиции заказа продаж создается заказ снабжения для поставки "
|
||||
"проданных ТМЦ."
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:615
|
||||
|
|
@ -129,8 +131,7 @@ msgstr "Магазин"
|
|||
#. module: sale_stock
|
||||
#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
|
||||
msgid "Drives procurement orders for every sales order line."
|
||||
msgstr ""
|
||||
"Управление заказами на снабжение для каждой позиции заказа на продажу."
|
||||
msgstr "Управление заказами снабжения для каждой позиции заказа продаж."
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_stock_move
|
||||
|
|
@ -151,7 +152,7 @@ msgstr "Табель проекта"
|
|||
#. module: sale_stock
|
||||
#: field:sale.config.settings,group_sale_delivery_address:0
|
||||
msgid "Allow a different address for delivery and invoicing "
|
||||
msgstr ""
|
||||
msgstr "Разрешить различные адреса для доставки и выставления счета "
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:546
|
||||
|
|
@ -163,18 +164,18 @@ msgstr "Ошибка конфигурации!"
|
|||
#. module: sale_stock
|
||||
#: model:process.node,name:sale_stock.process_node_saleprocurement0
|
||||
msgid "Procurement Order"
|
||||
msgstr "Заказ на закупку"
|
||||
msgstr "Заказ снабжения"
|
||||
|
||||
#. module: sale_stock
|
||||
#: selection:sale.config.settings,default_order_policy:0
|
||||
msgid "Invoice based on deliveries"
|
||||
msgstr "Счет основанный на отгрузке"
|
||||
msgstr "Счет основанный на доставках"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_sale_order
|
||||
#: field:stock.picking,sale_id:0
|
||||
msgid "Sales Order"
|
||||
msgstr "Заказ на продажу"
|
||||
msgstr "Заказ продаж"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_stock_picking_out
|
||||
|
|
@ -185,7 +186,7 @@ msgstr "Заказы доставки"
|
|||
#: model:ir.model,name:sale_stock.model_sale_order_line
|
||||
#: field:stock.move,sale_line_id:0
|
||||
msgid "Sales Order Line"
|
||||
msgstr "Позиция заказа на продажу"
|
||||
msgstr "Позиция заказа продаж"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.transition,note:sale_stock.process_transition_packing0
|
||||
|
|
@ -195,11 +196,11 @@ msgid ""
|
|||
"parts to the sales order. There is 1 pick list by sales order line which "
|
||||
"evolves with the availability of parts."
|
||||
msgstr ""
|
||||
"Форма комплектовочного листа создастся как только заказ на продажу будет "
|
||||
"подтвержден, в одно время с заказом на снабжение. Он представляет собой "
|
||||
"определение комплектующих для заказа на продажу. Один комплектовочный лист "
|
||||
"на позицию заказа на продажу, который будет меняться в соответствии с "
|
||||
"наличием комплектующих."
|
||||
"Форма комплектовочного листа создастся как только заказ продаж будет "
|
||||
"подтвержден, в одно время с заказом снабжения. Он представляет собой "
|
||||
"определение комплектующих для заказа продаж. Один комплектовочный лист на "
|
||||
"позицию заказа продаж, который будет меняться в соответствии с наличием "
|
||||
"комплектующих."
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:res.company,security_lead:0
|
||||
|
|
@ -240,7 +241,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
|
||||
|
|
@ -276,7 +277,7 @@ msgstr "Снабжение"
|
|||
#: field:sale.report,shipped:0
|
||||
#: field:sale.report,shipped_qty_1:0
|
||||
msgid "Shipped"
|
||||
msgstr "Доставлено"
|
||||
msgstr "Отправлено"
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:240
|
||||
|
|
@ -292,24 +293,24 @@ msgid ""
|
|||
"production of products regarding to the rules and to the sales order's "
|
||||
"parameters. "
|
||||
msgstr ""
|
||||
"Заказ на снабжение создастся автоматически как только заказ на продажу будет "
|
||||
"Заказ снабжения создастся автоматически как только заказ продаж будет "
|
||||
"подтвержден или счет будет оплачен. Он определяет закупку и производство ТМЦ "
|
||||
"по правилам и параметрам заказа на продажу. "
|
||||
"по правилам и параметрам заказа продаж. "
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,group_mrp_properties:0
|
||||
msgid "Allows you to tag sales order lines with properties."
|
||||
msgstr ""
|
||||
msgstr "Позволяет отмечать тегами позиции заказа продажи со свойствами"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.config.settings,group_invoice_deli_orders:0
|
||||
msgid "Generate invoices after and based on delivery orders"
|
||||
msgstr ""
|
||||
msgstr "Генерировать счета после и из заказов доставки"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.config.settings,module_delivery:0
|
||||
msgid "Allow adding shipping costs"
|
||||
msgstr ""
|
||||
msgstr "Позволяет добавлять стоимость доставки"
|
||||
|
||||
#. module: sale_stock
|
||||
#: view:sale.order:0
|
||||
|
|
@ -327,6 +328,8 @@ msgid ""
|
|||
"International Commercial Terms are a series of predefined commercial terms "
|
||||
"used in international transactions."
|
||||
msgstr ""
|
||||
"Международные правила по толкованию наиболее широко используемых торговых "
|
||||
"терминов в области внешней торговли."
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,module_delivery:0
|
||||
|
|
@ -345,7 +348,7 @@ msgstr "Доставка всего сразу, если все готово."
|
|||
#. module: sale_stock
|
||||
#: model:res.groups,name:sale_stock.group_invoice_deli_orders
|
||||
msgid "Enable Invoicing Delivery orders"
|
||||
msgstr ""
|
||||
msgstr "Разрешить выставлять счета на заказы доставки"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:res.company,security_lead:0
|
||||
|
|
@ -362,6 +365,8 @@ msgstr "Закупка проданного материала"
|
|||
msgid ""
|
||||
"Pick 'Deliver each product when available' if you allow partial delivery."
|
||||
msgstr ""
|
||||
"Выбрать \"Доставить каждый товар по готовности\" если вы разрешили частичную "
|
||||
"доставки"
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:206
|
||||
|
|
@ -380,7 +385,7 @@ msgid ""
|
|||
"It indicates that the sales order has been delivered. This field is updated "
|
||||
"only after the scheduler(s) have been launched."
|
||||
msgstr ""
|
||||
"Показывает, что заказ на продажу был доставлен. Это поле обновляется только "
|
||||
"Показывает, что заказ продаж был доставлен. Это поле обновляется только "
|
||||
"после запуска планировщика."
|
||||
|
||||
#. module: sale_stock
|
||||
|
|
@ -398,12 +403,12 @@ msgstr "Свойства изделия в позиции заказа"
|
|||
msgid ""
|
||||
"You can generate invoices based on sales orders or based on shippings."
|
||||
msgstr ""
|
||||
"Вы можете создать счет на основе заказов на продажу или на основе доставок."
|
||||
"Вы можете создать счет на основе заказов продаж или на основе доставок."
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_sale_report
|
||||
msgid "Sales Orders Statistics"
|
||||
msgstr "Статистика заказов на продажу"
|
||||
msgstr "Статистика заказов продаж"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_res_company
|
||||
|
|
@ -428,6 +433,8 @@ msgid ""
|
|||
"Allows you to specify different delivery and invoice addresses on a sales "
|
||||
"order."
|
||||
msgstr ""
|
||||
"Позволяет задавать разные адреса для доставки и выставления счета в заказе "
|
||||
"продажи."
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.node,note:sale_stock.process_node_saleprocurement0
|
||||
|
|
@ -435,7 +442,7 @@ msgid ""
|
|||
"One Procurement order for each sales order line and for each of the "
|
||||
"components."
|
||||
msgstr ""
|
||||
"Один заказ на снабжение для каждой позиции заказа на продажу и для каждого "
|
||||
"Один заказ снабжения для каждой позиции заказа продаж и для каждого "
|
||||
"компонента."
|
||||
|
||||
#. module: sale_stock
|
||||
|
|
@ -455,6 +462,7 @@ msgid ""
|
|||
"Number of days between the order confirmation and the shipping of the "
|
||||
"products to the customer"
|
||||
msgstr ""
|
||||
"Количество дней между подтверждением заказа и отгрузкой продукции заказчику"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,default_picking_policy:0
|
||||
|
|
@ -467,7 +475,7 @@ msgstr ""
|
|||
#. module: sale_stock
|
||||
#: selection:sale.config.settings,default_order_policy:0
|
||||
msgid "Invoice based on sales orders"
|
||||
msgstr ""
|
||||
msgstr "Счет основан на заказах продаж"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
|
||||
|
|
@ -487,6 +495,9 @@ msgid ""
|
|||
"In order to delete a confirmed sales order, you must cancel it.\n"
|
||||
"To do so, you must first cancel related picking for delivery orders."
|
||||
msgstr ""
|
||||
"Для того, чтобы удалить подтвержденный заказ, вы должны отменить его.\n"
|
||||
"Чтобы сделать это, Вы должны сначала отменить комплектование для заказов "
|
||||
"доставки."
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.order.line,number_packages:0
|
||||
|
|
@ -506,7 +517,7 @@ msgstr "Создать счет"
|
|||
#. module: sale_stock
|
||||
#: field:sale.config.settings,task_work:0
|
||||
msgid "Prepare invoices based on task's activities"
|
||||
msgstr ""
|
||||
msgstr "Подготовка счетов основанных на действиях по задачам"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
|
||||
|
|
@ -519,7 +530,7 @@ msgstr "Счет на авансовый платеж"
|
|||
msgid "You must first cancel stock moves attached to this sales order line."
|
||||
msgstr ""
|
||||
"Сначала вы должны отменить перемещения ТМЦ связанные с этой позицией заказа "
|
||||
"на продажу."
|
||||
"продаж."
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:535
|
||||
|
|
@ -536,7 +547,7 @@ msgstr "Инкотерм"
|
|||
#: code:addons/sale_stock/sale_stock.py:496
|
||||
#, python-format
|
||||
msgid "Cannot cancel sales order line!"
|
||||
msgstr ""
|
||||
msgstr "Нельзя отменить позицию заказа продаж!"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
|
||||
|
|
@ -551,7 +562,7 @@ msgstr "На основании отгруженного или заказанн
|
|||
#. module: sale_stock
|
||||
#: selection:sale.order,picking_policy:0
|
||||
msgid "Deliver all products at once"
|
||||
msgstr "Отгрузка всех товаров за раз"
|
||||
msgstr "Доставка всех товаров за раз"
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.order,picking_ids:0
|
||||
|
|
@ -561,7 +572,7 @@ msgstr "Связанное комплектование"
|
|||
#. module: sale_stock
|
||||
#: model:ir.model,name:sale_stock.model_sale_config_settings
|
||||
msgid "sale.config.settings"
|
||||
msgstr ""
|
||||
msgstr "sale.config.settings"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.order,picking_ids:0
|
||||
|
|
@ -569,21 +580,22 @@ msgid ""
|
|||
"This is a list of delivery orders that has been generated for this sales "
|
||||
"order."
|
||||
msgstr ""
|
||||
"Это список заказов доставки который был создан для этого заказа продажи."
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
|
||||
msgid "Sales Order Requisition"
|
||||
msgstr "Запрос заказа на продажу"
|
||||
msgstr "Запрос заказа продаж"
|
||||
|
||||
#. module: sale_stock
|
||||
#: model:process.transition,name:sale_stock.process_transition_deliver0
|
||||
msgid "Create Delivery Order"
|
||||
msgstr "Создать заказ на доставку"
|
||||
msgstr "Создать заказ доставки"
|
||||
|
||||
#. module: sale_stock
|
||||
#: view:sale.order:0
|
||||
msgid "Ignore Exception"
|
||||
msgstr "Игнорировать исключение"
|
||||
msgstr "Игнорировать исключительную ситуацию"
|
||||
|
||||
#. module: sale_stock
|
||||
#: code:addons/sale_stock/sale_stock.py:588
|
||||
|
|
@ -598,12 +610,12 @@ msgstr ""
|
|||
#. module: sale_stock
|
||||
#: view:sale.order:0
|
||||
msgid "Recreate Delivery Order"
|
||||
msgstr ""
|
||||
msgstr "Воссоздать заказ доставки"
|
||||
|
||||
#. module: sale_stock
|
||||
#: help:sale.config.settings,group_multiple_shops:0
|
||||
msgid "This allows to configure and use multiple shops."
|
||||
msgstr ""
|
||||
msgstr "Это позволяет настроить и использовать несколько магазинов."
|
||||
|
||||
#. module: sale_stock
|
||||
#: field:sale.order,picked_rate:0
|
||||
|
|
@ -628,5 +640,5 @@ msgid ""
|
|||
"automatically."
|
||||
msgstr ""
|
||||
"В зависимости от настройки исходящего места хранения, перемещение между "
|
||||
"зоной отгрузки и заказчиком выполняется с помощью заказа на доставку вручную "
|
||||
"зоной отгрузки и заказчиком выполняется с помощью заказа доставки вручную "
|
||||
"или автоматически."
|
||||
|
|
|
|||
|
|
@ -833,7 +833,7 @@ class share_wizard(osv.TransientModel):
|
|||
notification_obj = self.pool.get('mail.notification')
|
||||
user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
|
||||
if not user.email:
|
||||
raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
|
||||
raise osv.except_osv(_('Email Required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
|
||||
|
||||
# TODO: also send an HTML version of this mail
|
||||
for result_line in wizard_data.result_line_ids:
|
||||
|
|
@ -864,7 +864,7 @@ class share_wizard(osv.TransientModel):
|
|||
mail_mail = self.pool.get('mail.mail')
|
||||
user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
|
||||
if not user.email:
|
||||
raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
|
||||
raise osv.except_osv(_('Email Required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
|
||||
|
||||
# TODO: also send an HTML version of this mail
|
||||
mail_ids = []
|
||||
|
|
|
|||
|
|
@ -1764,7 +1764,7 @@ class stock_move(osv.osv):
|
|||
for move in self.browse(cr, uid, ids, context=context):
|
||||
if move.state == 'done':
|
||||
if frozen_fields.intersection(vals):
|
||||
raise osv.except_osv(_('Operation forbidden !'),
|
||||
raise osv.except_osv(_('Operation Forbidden!'),
|
||||
_('Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).'))
|
||||
return super(stock_move, self).write(cr, uid, ids, vals, context=context)
|
||||
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ class stock_partial_picking(osv.osv_memory):
|
|||
|
||||
if line_uom.factor and line_uom.factor <> 0:
|
||||
if float_compare(qty_in_line_uom, wizard_line.quantity, precision_rounding=line_uom.rounding) != 0:
|
||||
raise osv.except_osv(_('Warning!'), _('The unit of measure rounding does not allow you to ship "%s %s", only roundings of "%s %s" is accepted by the Unit of Measure.') % (wizard_line.quantity, line_uom.name, line_uom.rounding, line_uom.name))
|
||||
raise osv.except_osv(_('Warning!'), _('The unit of measure rounding does not allow you to ship "%s %s", only rounding of "%s %s" is accepted by the Unit of Measure.') % (wizard_line.quantity, line_uom.name, line_uom.rounding, line_uom.name))
|
||||
if move_id:
|
||||
#Check rounding Quantity.ex.
|
||||
#picking: 1kg, uom kg rounding = 0.01 (rounding to 10g),
|
||||
|
|
@ -189,7 +189,7 @@ class stock_partial_picking(osv.osv_memory):
|
|||
qty_in_initial_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, initial_uom.id)
|
||||
without_rounding_qty = (wizard_line.quantity / line_uom.factor) * initial_uom.factor
|
||||
if float_compare(qty_in_initial_uom, without_rounding_qty, precision_rounding=initial_uom.rounding) != 0:
|
||||
raise osv.except_osv(_('Warning!'), _('The rounding of the initial uom does not allow you to ship "%s %s", as it would let a quantity of "%s %s" to ship and only roundings of "%s %s" is accepted by the uom.') % (wizard_line.quantity, line_uom.name, wizard_line.move_id.product_qty - without_rounding_qty, initial_uom.name, initial_uom.rounding, initial_uom.name))
|
||||
raise osv.except_osv(_('Warning!'), _('The rounding of the initial uom does not allow you to ship "%s %s", as it would let a quantity of "%s %s" to ship and only rounding of "%s %s" is accepted by the uom.') % (wizard_line.quantity, line_uom.name, wizard_line.move_id.product_qty - without_rounding_qty, initial_uom.name, initial_uom.rounding, initial_uom.name))
|
||||
else:
|
||||
seq_obj_name = 'stock.picking.' + picking_type
|
||||
move_id = stock_move.create(cr,uid,{'name' : self.pool.get('ir.sequence').get(cr, uid, seq_obj_name),
|
||||
|
|
|
|||
Loading…
Reference in New Issue