pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: correct English mistakes

Browse Source 
From #20652 taking visible strings to 11.0
This commit is contained in:
Andrew Latham
2017-11-03 09:18:56 +01:00
committed by Martin Trigaux
parent b62bb5add2
commit 5aebc22722
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/account.pot
+7 -7
View File
@@ -1324,7 +1324,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_tax_cash_basis_account
#: model:ir.model.fields,help:account.field_account_tax_template_cash_basis_account
msgid "Account used as counterpart for the journal entry, for taxes exigible based on payments."
msgid "Account used as counterpart for the journal entry, for taxes eligible based on payments."
msgstr ""
#. module: account
@@ -1886,7 +1886,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_group_id
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
msgid "Apply only if delivery or invocing country match the group."
msgid "Apply only if delivery or invoicing country match the group."
msgstr ""
#. module: account
@@ -6122,7 +6122,7 @@ msgstr ""
#: model:ir.model.fields,help:account.field_account_journal_inbound_payment_method_ids
msgid "Manual: Get paid by cash, check or any other method outside of Odoo.\n"
"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
"Batch Deposit: Encash several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
"Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings."
msgstr ""
#. module: account
@@ -6132,7 +6132,7 @@ msgstr ""
msgid "Manual: Get paid by cash, check or any other method outside of Odoo.\n"
"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"
"Check: Pay bill by check and print it from Odoo.\n"
"Batch Deposit: Encash several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n"
"Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n"
"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed "
msgstr ""
@@ -6476,7 +6476,7 @@ msgstr ""
#. module: account
#: code:addons/account/models/company.py:274
#, python-format
msgid "No miscellanous journal could be found. Please create one before proceeding."
msgid "No miscellaneous journal could be found. Please create one before proceeding."
msgstr ""
#. module: account
@@ -7554,7 +7554,7 @@ msgstr ""
#. module: account
#: code:addons/account/models/account_payment.py:135
#, python-format
msgid "Programmation error: wizard action executed without active_ids in context."
msgid "Programming error: wizard action executed without active_ids in context."
msgstr ""
#. module: account
@@ -10495,7 +10495,7 @@ msgstr ""
#. module: account
#: code:addons/account/models/account.py:55
#, python-format
msgid "You cannot have a receivable/payable account that is not reconciliable. (account code: %s)"
msgid "You cannot have a receivable/payable account that is not reconcilable. (account code: %s)"
msgstr ""
#. module: account
addons/account/models/account.py
+3 -3
View File
@@ -52,7 +52,7 @@ class AccountAccount(models.Model):
def _check_reconcile(self):
for account in self:
if account.internal_type in ('receivable', 'payable') and account.reconcile == False:
raise ValidationError(_('You cannot have a receivable/payable account that is not reconciliable. (account code: %s)') % account.code)
raise ValidationError(_('You cannot have a receivable/payable account that is not reconcilable. (account code: %s)') % account.code)
name = fields.Char(required=True, index=True)
currency_id = fields.Many2one('res.currency', string='Account Currency',
@@ -364,7 +364,7 @@ class AccountJournal(models.Model):
domain=[('payment_type', '=', 'inbound')], string='Debit Methods', default=lambda self: self._default_inbound_payment_methods(),
help="Manual: Get paid by cash, check or any other method outside of Odoo.\n"\
"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"\
"Batch Deposit: Encash several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings.")
"Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo,you are suggested to reconcile the transaction with the batch deposit. Enable this option from the settings.")
outbound_payment_method_ids = fields.Many2many('account.payment.method', 'account_journal_outbound_payment_method_rel', 'journal_id', 'outbound_payment_method',
domain=[('payment_type', '=', 'outbound')], string='Payment Methods', default=lambda self: self._default_outbound_payment_methods(),
help="Manual:Pay bill by cash or any other method outside of Odoo.\n"\
@@ -764,7 +764,7 @@ class AccountTax(models.Model):
'account.account',
string='Tax Received Account',
domain=[('deprecated', '=', False)],
help='Account used as counterpart for the journal entry, for taxes exigible based on payments.')
help='Account used as counterpart for the journal entry, for taxes eligible based on payments.')
_sql_constraints = [
('name_company_uniq', 'unique(name, company_id, type_tax_use)', 'Tax names must be unique !'),
addons/account/models/account_payment.py
+2 -2
View File
@@ -35,7 +35,7 @@ class account_abstract_payment(models.AbstractModel):
help="Manual: Get paid by cash, check or any other method outside of Odoo.\n"\
"Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"\
"Check: Pay bill by check and print it from Odoo.\n"\
"Batch Deposit: Encash several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n"\
"Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit,module account_batch_deposit must be installed.\n"\
"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed ")
payment_method_code = fields.Char(related='payment_method_id.code',
help="Technical field used to adapt the interface to the payment type selected.", readonly=True)
@@ -132,7 +132,7 @@ class account_register_payments(models.TransientModel):
# Check for selected invoices ids
if not active_ids:
raise UserError(_("Programmation error: wizard action executed without active_ids in context."))
raise UserError(_("Programming error: wizard action executed without active_ids in context."))
invoices = self.env['account.invoice'].browse(active_ids)
addons/account/models/chart_template.py
+2 -2
View File
@@ -538,7 +538,7 @@ class AccountTaxTemplate(models.Model):
'account.account.template',
string='Tax Received Account',
domain=[('deprecated', '=', False)],
help='Account used as counterpart for the journal entry, for taxes exigible based on payments.')
help='Account used as counterpart for the journal entry, for taxes eligible based on payments.')
_sql_constraints = [
('name_company_uniq', 'unique(name, company_id, type_tax_use, chart_template_id)', 'Tax names must be unique !'),
@@ -634,7 +634,7 @@ class AccountFiscalPositionTemplate(models.Model):
country_id = fields.Many2one('res.country', string='Country',
help="Apply only if delivery or invoicing country match.")
country_group_id = fields.Many2one('res.country.group', string='Country Group',
help="Apply only if delivery or invocing country match the group.")
help="Apply only if delivery or invoicing country match the group.")
state_ids = fields.Many2many('res.country.state', string='Federal States')
zip_from = fields.Integer(string='Zip Range From', default=0)
zip_to = fields.Integer(string='Zip Range To', default=0)
addons/account/models/company.py
+1 -1
View File
@@ -271,7 +271,7 @@ Best Regards,''')
default_journal = self.env['account.journal'].search([('type', '=', 'general'), ('company_id', '=', self.id)], limit=1)
if not default_journal:
raise UserError(_("No miscellanous journal could be found. Please create one before proceeding."))
raise UserError(_("No miscellaneous journal could be found. Please create one before proceeding."))
self.account_opening_move_id = self.env['account.move'].create({
'name': _('Opening Journal Entry'),