Odoo update
Ahmed Aly
parent
14e786f74e
commit
dfbe2bad90
|
|
@ -917,6 +917,11 @@ file_filter = addons/website_sale_digital/i18n/<lang>.po
|
|||
source_file = addons/website_sale_digital/i18n/website_sale_digital.pot
|
||||
source_lang = en
|
||||
|
||||
[odoo-11.website_sale_management]
|
||||
file_filter = addons/website_sale_management/i18n/<lang>.po
|
||||
source_file = addons/website_sale_management/i18n/website_sale_management.pot
|
||||
source_lang = en
|
||||
|
||||
[odoo-11.website_sale_options]
|
||||
file_filter = addons/website_sale_options/i18n/<lang>.po
|
||||
source_file = addons/website_sale_options/i18n/website_sale_options.pot
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ TL;DR
|
|||
* If you [make a pull request](https://github.com/odoo/odoo/wiki/Contributing#making-pull-requests),
|
||||
do not create an issue! Use the PR description for that
|
||||
* Issues are handled with a much lower priority than pull requests
|
||||
* Use this [template](https://github.com/odoo/odoo/tree/10.0/.github/ISSUE_TEMPLATE.md)
|
||||
* Use this [template](https://github.com/odoo/odoo/tree/11.0/.github/ISSUE_TEMPLATE.md)
|
||||
when reporting issues. Please search for duplicates first!
|
||||
* Pull requests must be made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch)
|
||||
* There are restrictions on the kind of [changes allowed in stable series](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ include README.md
|
|||
recursive-include odoo *.css
|
||||
recursive-include odoo *.csv
|
||||
recursive-include odoo *.doc
|
||||
recursive-include odoo *.docx
|
||||
recursive-include odoo *.eml
|
||||
recursive-include odoo *.eot
|
||||
recursive-include odoo *.gif
|
||||
|
|
@ -16,6 +17,8 @@ recursive-include odoo *.less
|
|||
recursive-include odoo *.md
|
||||
recursive-include odoo *.mp3
|
||||
recursive-include odoo *.ogg
|
||||
recursive-include odoo *.ods
|
||||
recursive-include odoo *.odt
|
||||
recursive-include odoo *.otf
|
||||
recursive-include odoo *.pdf
|
||||
recursive-include odoo *.png
|
||||
|
|
@ -35,7 +38,11 @@ recursive-include odoo *.wsdl
|
|||
recursive-include odoo *.xls
|
||||
recursive-include odoo *.xsd
|
||||
recursive-include odoo *.xsl
|
||||
recursive-include odoo *.xlsx
|
||||
recursive-include odoo *.xml
|
||||
recursive-include odoo *.yml
|
||||
recursive-include odoo *.zip
|
||||
recursive-include odoo/addons/l10n_mx_edi *.xslt *.key *.cer *.txt
|
||||
recursive-include odoo/addons/l10n_mx_reports *.xslt
|
||||
recursive-exclude * *.py[co]
|
||||
recursive-exclude * *.hg*
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ from odoo.tools.misc import consteq
|
|||
|
||||
class MailController(MailController):
|
||||
|
||||
@classmethod
|
||||
def _redirect_to_record(cls, model, res_id, access_token=None):
|
||||
# If the current user doesn't have access to the invoice, but provided
|
||||
# a valid access token, redirect him to the front-end view.
|
||||
|
|
|
|||
|
|
@ -10,16 +10,18 @@ from odoo.tools import consteq
|
|||
|
||||
class PortalAccount(CustomerPortal):
|
||||
|
||||
def _prepare_portal_layout_values(self):
|
||||
values = super(PortalAccount, self)._prepare_portal_layout_values()
|
||||
def _get_account_invoice_domain(self):
|
||||
partner = request.env.user.partner_id
|
||||
|
||||
invoice_count = request.env['account.invoice'].search_count([
|
||||
domain = [
|
||||
('type', 'in', ['out_invoice', 'out_refund']),
|
||||
('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]),
|
||||
('state', 'in', ['open', 'paid', 'cancel'])
|
||||
])
|
||||
]
|
||||
return domain
|
||||
|
||||
def _prepare_portal_layout_values(self):
|
||||
values = super(PortalAccount, self)._prepare_portal_layout_values()
|
||||
invoice_count = request.env['account.invoice'].search_count(self._get_account_invoice_domain())
|
||||
values['invoice_count'] = invoice_count
|
||||
return values
|
||||
|
||||
|
|
@ -62,11 +64,7 @@ class PortalAccount(CustomerPortal):
|
|||
partner = request.env.user.partner_id
|
||||
AccountInvoice = request.env['account.invoice']
|
||||
|
||||
domain = [
|
||||
('type', 'in', ['out_invoice', 'out_refund']),
|
||||
('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]),
|
||||
('state', 'in', ['open', 'paid', 'cancelled'])
|
||||
]
|
||||
domain = self._get_account_invoice_domain()
|
||||
|
||||
searchbar_sortings = {
|
||||
'date': {'label': _('Invoice Date'), 'order': 'date_invoice desc'},
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ invoice
|
|||
% if object.origin:
|
||||
(with reference: ${object.origin})
|
||||
% endif
|
||||
amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>
|
||||
amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>
|
||||
from ${object.company_id.name}.
|
||||
</p>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<field name="lang">${object.partner_id.lang}</field>
|
||||
<field name="body_html" type="xml">
|
||||
<p>Dear ${object.partner_id.name},</p>
|
||||
<p>Thank you for your payment.<br />Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>
|
||||
<p>Thank you for your payment.<br />Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>
|
||||
<p>If you have any questions, please do not hesitate to contact us.</p>
|
||||
<p>Best regards,
|
||||
% if user and user.signature:
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -85,12 +85,6 @@ msgstr ""
|
|||
msgid "%s (copy)"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -162,7 +156,7 @@ msgstr ""
|
|||
#: model:mail.template,body_html:account.mail_template_data_payment_receipt
|
||||
msgid "<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -262,7 +256,7 @@ msgid "<div>\n"
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -1328,6 +1322,7 @@ msgid "Account used as counterpart for the journal entry, for taxes eligible bas
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr ""
|
||||
|
|
@ -1622,11 +1617,6 @@ msgstr ""
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1669,6 +1659,7 @@ msgstr ""
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -1885,6 +1876,10 @@ msgstr ""
|
|||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_group_id
|
||||
msgid "Apply only if delivery or invocing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
|
@ -1967,14 +1962,14 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2148,6 +2143,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -3643,6 +3644,19 @@ msgstr ""
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid "Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4121,11 +4135,6 @@ msgstr ""
|
|||
msgid "Enable Comparison"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4468,7 +4477,7 @@ msgid "Follow-up"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5276,12 +5285,6 @@ msgstr ""
|
|||
msgid "Invoice paid"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5354,6 +5357,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr ""
|
||||
|
|
@ -5609,6 +5613,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6473,12 +6484,6 @@ msgstr ""
|
|||
msgid "No detail"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid "No miscellaneous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7366,6 +7371,12 @@ msgstr ""
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid "Please install a chart of accounts or create a miscellaneous journal before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -7487,6 +7498,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -7800,7 +7812,7 @@ msgid "Ref."
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8074,7 +8086,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8097,13 +8109,6 @@ msgstr ""
|
|||
msgid "Sale Tax"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -8558,7 +8563,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -8959,7 +8964,7 @@ msgstr ""
|
|||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid "Technical field used to keep track of the tax cash basis reconciliation.This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too."
|
||||
msgid "Technical field used to keep track of the tax cash basis reconciliation. This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -9280,6 +9285,12 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid "The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -9844,19 +9855,13 @@ msgstr ""
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid "Unable to mix any taxes being price included with taxes affecting the base amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr ""
|
||||
|
|
@ -9990,11 +9995,6 @@ msgstr ""
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -10413,23 +10413,29 @@ msgid "You can set up here the format you want this record to be displayed. If y
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid "You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. Check the company settings or ask someone with the 'Adviser' role"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid "You cannot change the currency of the company since some journal items already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,21 @@
|
|||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * account
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr "Undefined"
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -5,9 +5,9 @@
|
|||
# Translators:
|
||||
# Hamed Mohammadi <hamed@dehongi.com>, 2017
|
||||
# arya sadeghy <aryasadeghy@gmail.com>, 2017
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Hamid Darabi <hamid.darabi@gmail.com>, 2017
|
||||
# ali alikhani <a.alikhani@gmail.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Hamid Darabi, 2017
|
||||
# Ali Alikhani <a.alikhani@gmail.com>, 2017
|
||||
# pfp pfp <pfpour@yahoo.com>, 2017
|
||||
# hamid hvbnet <hvbnet@yahoo.com>, 2017
|
||||
# Sahar Daraye <sahar.daraye.1369@gmail.com>, 2017
|
||||
|
|
@ -21,13 +21,15 @@
|
|||
# Zahed Alfak <tamass4116@gmail.com>, 2017
|
||||
# Sia Rezazadeh <siavash.rezazadeh@gmail.com>, 2017
|
||||
# Maziar Niaki <maziarmn@gmail.com>, 2017
|
||||
# mohammad azarbara <mohammadazarbara98@gmail.com>, 2017
|
||||
# Arash Sardari <arashss77@gmail.com>, 2018
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"Last-Translator: Maziar Niaki <maziarmn@gmail.com>, 2017\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: Arash Sardari <arashss77@gmail.com>, 2018\n"
|
||||
"Language-Team: Persian (https://www.transifex.com/odoo/teams/41243/fa/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -112,12 +114,6 @@ msgstr "%s (کپی)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (کپی)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -131,7 +127,7 @@ msgstr ",اگر حسابداری یا خریدی نصب شده باشد"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
|
||||
msgid "- First Number:"
|
||||
msgstr ""
|
||||
msgstr "- اولین شماره: "
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
|
|
@ -190,7 +186,7 @@ msgstr ": تراز آزمایشی"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -292,7 +288,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -556,7 +552,7 @@ msgstr "<span>اصلاح</span>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
|
||||
msgid "<span>Reporting</span>"
|
||||
msgstr ""
|
||||
msgstr "<span>گزارش</span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
|
||||
|
|
@ -640,7 +636,7 @@ msgstr ""
|
|||
#: model:ir.ui.view,arch_db:account.report_journal
|
||||
#: model:ir.ui.view,arch_db:account.report_partnerledger
|
||||
msgid "<strong>Company:</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>شرکت:</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -669,7 +665,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
msgid "<strong>Customer Address</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>آدرس مشتری</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
|
|
@ -680,7 +676,7 @@ msgstr "<strong>کد مشتری:</strong>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Customer: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>مشتری: </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -738,12 +734,12 @@ msgstr "<strong>هزینه ها<strong/>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
|
||||
msgid "<strong>Fiscal Year End</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>پایان سال مالی</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_tax
|
||||
msgid "<strong>From</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>از</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
|
|
@ -800,17 +796,17 @@ msgstr "<strong>شرکا:</strong>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Payment Amount: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>مجموع پرداختی: </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Payment Date: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>تاریخ پرداخت: </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Payment Method: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>روش پرداخت: </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
|
||||
|
|
@ -827,7 +823,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_tax
|
||||
msgid "<strong>Purchase</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>خرید</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -960,7 +956,7 @@ msgstr "مجموع"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_account_kanban
|
||||
msgid "<strong>Type: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>نوع: </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -972,7 +968,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Vendor: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>فروشنده: </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_tax
|
||||
|
|
@ -1201,7 +1197,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_group_tree
|
||||
msgid "Account Groups"
|
||||
msgstr ""
|
||||
msgstr "گروههای حساب"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_partner_bank_journal_id
|
||||
|
|
@ -1306,7 +1302,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.account_tag_action
|
||||
msgid "Account Tags"
|
||||
msgstr ""
|
||||
msgstr "کلمات کلیدی حساب"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_tax_form
|
||||
|
|
@ -1331,18 +1327,18 @@ msgstr ""
|
|||
#: model:ir.ui.view,arch_db:account.view_account_template_search
|
||||
#: model:ir.ui.view,arch_db:account.view_account_template_tree
|
||||
msgid "Account Template"
|
||||
msgstr ""
|
||||
msgstr "الگو حساب"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_valuation_account_id
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_property_stock_valuation_account_id
|
||||
msgid "Account Template for Stock Valuation"
|
||||
msgstr ""
|
||||
msgstr "الگو حساب جهت ارزیابی انبار"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_template_form
|
||||
msgid "Account Templates"
|
||||
msgstr ""
|
||||
msgstr "الگوهای حساب"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
|
||||
|
|
@ -1380,22 +1376,22 @@ msgstr "انواع حساب"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_type_control_ids
|
||||
msgid "Account Types Allowed"
|
||||
msgstr ""
|
||||
msgstr "انواع حساب مجاز"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_unreconcile
|
||||
msgid "Account Unreconcile"
|
||||
msgstr ""
|
||||
msgstr "حساب غیر قابل قبول"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_group_search
|
||||
msgid "Account group"
|
||||
msgstr ""
|
||||
msgstr "گروه حساب"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_group_search
|
||||
msgid "Account groups"
|
||||
msgstr ""
|
||||
msgstr "گروه های حساب"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_move_line_reconcile
|
||||
|
|
@ -1454,11 +1450,12 @@ msgstr ""
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "حسابداری"
|
||||
|
|
@ -1768,11 +1765,6 @@ msgstr ""
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "اجازه لغو داده ها"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1815,6 +1807,7 @@ msgstr "اجازه میدهد که از حسابداری تحلیلی استفا
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -1890,7 +1883,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile_amount_currency
|
||||
msgid "Amount in Currency"
|
||||
msgstr ""
|
||||
msgstr "مقدار به ارز"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
|
||||
|
|
@ -2034,10 +2027,14 @@ 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."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2116,14 +2113,14 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2300,6 +2297,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr "صورت حساب بانک"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -2633,7 +2636,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_tax_exigibility
|
||||
msgid "Cash Basis"
|
||||
msgstr ""
|
||||
msgstr "مبنای نقد"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_tax_cash_basis_journal_id
|
||||
|
|
@ -2651,7 +2654,7 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account.action_view_account_bnk_stmt_cashbox
|
||||
#, python-format
|
||||
msgid "Cash Control"
|
||||
msgstr ""
|
||||
msgstr "کنترل نقد"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_move_filter
|
||||
|
|
@ -3318,7 +3321,7 @@ msgstr "کشور"
|
|||
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_country_group_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Country Group"
|
||||
msgstr ""
|
||||
msgstr "گروه کشور"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_country_id
|
||||
|
|
@ -3830,6 +3833,20 @@ msgstr ""
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4316,11 +4333,6 @@ msgstr "ویزارد ایجاد ایمیل"
|
|||
msgid "Enable Comparison"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4624,13 +4636,13 @@ msgstr "سال مالی"
|
|||
#: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_day
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_day
|
||||
msgid "Fiscalyear Last Day"
|
||||
msgstr ""
|
||||
msgstr "آخرین روز سال مالی"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_month
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_month
|
||||
msgid "Fiscalyear Last Month"
|
||||
msgstr ""
|
||||
msgstr "آخرین ماه سال مالی"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.reconcile.model,amount_type:0
|
||||
|
|
@ -4668,7 +4680,7 @@ msgid "Follow-up"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5376,6 +5388,7 @@ msgid ""
|
|||
"Intermediary account used when moving money from a liquidity account to "
|
||||
"another"
|
||||
msgstr ""
|
||||
"حساب واسطه زمانی کاربرد دارد که از یک حساب نقدی به دیگری پول انتقال داده شود"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_narration
|
||||
|
|
@ -5544,12 +5557,6 @@ msgstr ""
|
|||
msgid "Invoice paid"
|
||||
msgstr "فاکتور پرداخت شد"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "فاکتور فرستاده شد"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5626,6 +5633,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "صدور فاکتور"
|
||||
|
|
@ -5894,6 +5902,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "روزنامه ها"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6308,7 +6323,7 @@ msgstr "تاریخ قفل شدن"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_period_lock_date
|
||||
msgid "Lock Date for Non-Advisers"
|
||||
msgstr ""
|
||||
msgstr "قفل کردن تاریخ برای غیر مشاوران"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -6419,7 +6434,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"
|
||||
"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
|
||||
|
|
@ -6430,7 +6445,7 @@ 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 ""
|
||||
|
||||
|
|
@ -6773,13 +6788,6 @@ msgstr ""
|
|||
msgid "No detail"
|
||||
msgstr "بدون جزئیات"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7693,6 +7701,14 @@ msgstr ""
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -7816,6 +7832,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -7884,7 +7901,7 @@ msgstr "سود و زیان"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8130,7 +8147,7 @@ msgid "Ref."
|
|||
msgstr "مرجع"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8411,7 +8428,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8434,13 +8451,6 @@ msgstr "فروش"
|
|||
msgid "Sale Tax"
|
||||
msgstr "مالیات فروش"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "روزنامه خرید / فروش"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -8914,7 +8924,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9336,8 +9346,8 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9709,6 +9719,13 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10297,7 +10314,7 @@ msgstr ""
|
|||
#: model:ir.model.fields,field_description:account.field_account_chart_template_transfer_account_id
|
||||
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_transfer_account_id
|
||||
msgid "Transfer Account"
|
||||
msgstr ""
|
||||
msgstr "انتقال حساب"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_payment_destination_journal_id
|
||||
|
|
@ -10358,21 +10375,13 @@ msgstr "نوع"
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr ""
|
||||
|
|
@ -10486,7 +10495,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "Use"
|
||||
msgstr ""
|
||||
msgstr "استفاده"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_use_anglo_saxon
|
||||
|
|
@ -10501,18 +10510,13 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_tax_exigibility
|
||||
msgid "Use Cash Basis"
|
||||
msgstr ""
|
||||
msgstr "استفاده از مبنای نقد"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa_direct_debit
|
||||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -10809,7 +10813,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "Welcome"
|
||||
msgstr ""
|
||||
msgstr "خوش آمدید"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -10955,14 +10959,14 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -10970,13 +10974,21 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
"unreconcile related payment entries first."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11058,7 +11070,7 @@ msgstr ""
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -11427,7 +11439,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_res_config_settings
|
||||
msgid "res.config.settings"
|
||||
msgstr ""
|
||||
msgstr "res.config.settings"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:236
|
||||
|
|
@ -11477,7 +11489,7 @@ msgstr "لیست محصولات"
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:158
|
||||
#, python-format
|
||||
msgid "there"
|
||||
msgstr ""
|
||||
msgstr "آنجا"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# Translators:
|
||||
# Kari Lindgren <kari.lindgren@emsystems.fi>, 2017
|
||||
# Tommi Rintala <tommi.rintala@gmail.com>, 2017
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2017
|
||||
# Eino Mäkitalo <eino.makitalo@netitbe.fi>, 2017
|
||||
# Tuomo Aura <tuomo.aura@web-veistamo.fi>, 2017
|
||||
|
|
@ -22,17 +22,18 @@
|
|||
# Melina Mantyla <melina.mantyla@web-veistamo.fi>, 2017
|
||||
# artol <arto.leskinen@tek.fi>, 2017
|
||||
# Pekko Tuomisto <pekko.tuomisto@web-veistamo.fi>, 2017
|
||||
# salmemik <salmemik@gmail.com>, 2017
|
||||
# Mikko Salmela <salmemik@gmail.com>, 2017
|
||||
# Sanna Edelman <direct@generare.com>, 2017
|
||||
# Marko Happonen <marko.happonen@sprintit.fi>, 2017
|
||||
# Jan-Erik Finlander <janerik.finlander@gmail.com>, 2017
|
||||
# Jan-Erik Finlander, 2017
|
||||
# Jukka Paulin <jukka.paulin@gmail.com>, 2017
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"Last-Translator: Jan-Erik Finlander <janerik.finlander@gmail.com>, 2017\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: Jukka Paulin <jukka.paulin@gmail.com>, 2017\n"
|
||||
"Language-Team: Finnish (https://www.transifex.com/odoo/teams/41243/fi/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -117,12 +118,6 @@ msgstr "%s (Kopio)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (kopio)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr "&nbsp;"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -195,7 +190,7 @@ msgstr "Koetase"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -297,7 +292,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -1501,11 +1496,12 @@ msgstr "Käytä tiliä"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Kirjanpito"
|
||||
|
|
@ -1817,11 +1813,6 @@ msgstr "Kaikki tilikirjaukset pitää käsitellä jotta voit sulkea tiliotteen."
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Salli peruutusviennit"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1864,6 +1855,7 @@ msgstr "Sallii kustannuspaikkojen käytön."
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -2089,10 +2081,14 @@ msgstr "Käytä automaattisesti tässä verokannassa."
|
|||
|
||||
#. 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."
|
||||
msgstr "Käytä vain jos toimitus- tai laskutusmaa täsmää ryhmään."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2171,14 +2167,14 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2355,6 +2351,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr "Pankin tiliote"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -3907,6 +3909,29 @@ msgstr "Päivää laskun päiväyksen jälkeen"
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Arvoisa asiakkaamme,\n"
|
||||
"\n"
|
||||
"Kirjanpitomme mukaan teillä on myöhässä olevia maksuja, joiden tarkemmat tiedot löydät alapuolelta.\n"
|
||||
"Jos puuttuvat laskut on jo maksettu, voitte jättää tämän maksuhuomautuksen huomioimatta. Muussa tapauksessa pyydämme maksamaan heti alla olevat puuttuvat suoritukset.\n"
|
||||
"Jos teillä on kysymyksiä liittyen maksuihinne, olkaa yhteydessä meihin.\n"
|
||||
"\n"
|
||||
"\n"
|
||||
"Kiitos yhteistyöstänne jo etukäteen.\n"
|
||||
"Parhain terveisin,"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4398,11 +4423,6 @@ msgstr "Sähköpostin ohjattu koostaminen"
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Salli vertailu"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr "Aktivoi maksuseuranta"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4755,7 +4775,7 @@ msgid "Follow-up"
|
|||
msgstr "Seuranta"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr "Jälkikäsittelyn tasot"
|
||||
|
||||
|
|
@ -4862,7 +4882,7 @@ msgstr "Tulevaisuudessa"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
msgid "Future Activities"
|
||||
msgstr ""
|
||||
msgstr "Tulevat toimenpiteet"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
|
|
@ -5545,7 +5565,7 @@ msgstr "Lasku"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_my_invoices
|
||||
msgid "Invoice #"
|
||||
msgstr ""
|
||||
msgstr "Lasku#"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:438
|
||||
|
|
@ -5652,12 +5672,6 @@ msgstr ""
|
|||
msgid "Invoice paid"
|
||||
msgstr "Lasku maksettu"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Lasku lähetetty"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5734,6 +5748,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Laskutus"
|
||||
|
|
@ -5784,7 +5799,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_invoice_sent
|
||||
msgid "It indicates that the invoice has been sent."
|
||||
msgstr ""
|
||||
msgstr "Merkitsee, että lasku on lähetetty."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:1039
|
||||
|
|
@ -6004,6 +6019,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Päiväkirjat"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6328,7 +6350,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
msgid "Late Activities"
|
||||
msgstr ""
|
||||
msgstr "Yliaikaiset toiminnot"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_last_time_entries_checked
|
||||
|
|
@ -6533,7 +6555,7 @@ msgstr "Manuaalinen täsmäytys"
|
|||
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
|
||||
|
|
@ -6544,7 +6566,7 @@ 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 ""
|
||||
|
||||
|
|
@ -6773,7 +6795,7 @@ msgstr "Monivaluutat"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
msgid "My Activities"
|
||||
msgstr ""
|
||||
msgstr "Omat toimintoni"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
|
|
@ -6847,7 +6869,7 @@ msgstr "Uusi tapahtuma"
|
|||
#: code:addons/account/models/account_move.py:1319
|
||||
#, python-format
|
||||
msgid "New expected payment date: "
|
||||
msgstr ""
|
||||
msgstr "Uusi oletettu maksupäivä:"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_sequence_number_next
|
||||
|
|
@ -6887,13 +6909,6 @@ msgstr ""
|
|||
msgid "No detail"
|
||||
msgstr "Ei tietoja"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7816,6 +7831,14 @@ msgstr "Määrittele päiväkirjaan järjestys."
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr "Määrittele tälle laskulle päiväkirjaan liittyvä järjestys."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -7941,6 +7964,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -8009,7 +8033,7 @@ msgstr "Tuloslaskelma"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8255,7 +8279,7 @@ msgid "Ref."
|
|||
msgstr "Viite"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8538,7 +8562,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8561,13 +8585,6 @@ msgstr "Myynti"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Myyntivero"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "Myynti-/ostopäiväkirja"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -9049,7 +9066,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9474,8 +9491,8 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9867,6 +9884,13 @@ msgstr "Kumppanin tulee olla sama kaikilla satavat- ja maksettavat tileillä."
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "Kumppanin viite tässä laskussa."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10527,21 +10551,13 @@ msgstr "Tyyppi"
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr ""
|
||||
|
|
@ -10677,11 +10693,6 @@ msgstr ""
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr "Käytä SEPA maksuja"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -11135,14 +11146,14 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -11150,7 +11161,7 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
|
|
@ -11159,6 +11170,14 @@ msgstr ""
|
|||
"Et voi peruuttaa laskua joka on osittain maksettu. Ennen sitä tulee laskuun "
|
||||
"liittyvät täsmäytykset peruuttaa."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11253,9 +11272,9 @@ msgstr ""
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr "Tulo/meno -tilin tulee olla kohdistettavissa (tili koodi: %s)"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -5,7 +5,7 @@
|
|||
# Translators:
|
||||
# Maxime Chambreuil <mchambreuil@ursainfosystems.com>, 2017
|
||||
# Fabien Pinckaers <fp@openerp.com>, 2017
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Melanie Bernard <mbe@odoo.com>, 2017
|
||||
# lap.odoo <lap@odoo.com>, 2017
|
||||
# Clo <clo@odoo.com>, 2017
|
||||
|
|
@ -21,20 +21,20 @@
|
|||
# Lamia Ishak <lamiaishak@hotmail.co.uk>, 2017
|
||||
# Sébastien Le Ray <sebastien-github@orniz.org>, 2017
|
||||
# Benjamin Delagoutte <ben@ampletus.fr>, 2017
|
||||
# Florian Hatat, 2017
|
||||
# Olivier Dony <odo@odoo.com>, 2017
|
||||
# Xavier Brochard <xavier@alternatif.org>, 2017
|
||||
# matthieu gaillet <matthieu.gaillet@lebrass.be>, 2017
|
||||
# Richard Mathot <rim@odoo.com>, 2017
|
||||
# Alexis de Lattre <alexis@via.ecp.fr>, 2017
|
||||
# Bertrand LATOUR <divoir@gmail.com>, 2017
|
||||
# Florian Hatat <mininet@wanadoo.fr>, 2017
|
||||
# nthnnl <nathan070@me.com>, 2017
|
||||
# Stéphane Bidoul (ACSONE) <stephane.bidoul@acsone.eu>, 2017
|
||||
# Stéphane Bidoul (ACSONE), 2017
|
||||
# Omar Mezga <omar.mezgrane@aldaway.com>, 2017
|
||||
# Alexandre Fayolle <alexandre.fayolle@camptocamp.com>, 2017
|
||||
# Xavier Belmere <Info@cartmeleon.com>, 2017
|
||||
# Nacim ABOURA <nacim.aboura@gmail.com>, 2017
|
||||
# Fabrice Henrion <fhe@odoo.com>, 2017
|
||||
# Fabrice Henrion, 2017
|
||||
# lucasdeliege <deliegelucas@gmail.com>, 2017
|
||||
# Ilone Math <ilonemail2@gmail.com>, 2017
|
||||
# Frédéric Clementi <frederic.clementi@camptocamp.com>, 2017
|
||||
|
|
@ -45,8 +45,8 @@
|
|||
# Benedicte HANET <hanetb@gmail.com>, 2017
|
||||
# Nicolas JEUDY <njeudy@panda-chi.io>, 2017
|
||||
# Daniel & Delphine <dd2013@leschoupinous.net>, 2017
|
||||
# Cédric Le Brouster <cedric.lebrouster@openfire.fr>, 2017
|
||||
# Hamid Darabi <hamid.darabi@gmail.com>, 2017
|
||||
# Cédric Le Brouster, 2017
|
||||
# Hamid Darabi, 2017
|
||||
# Quentin THEURET <odoo@kerpeo.com>, 2017
|
||||
# Jérémy Donas <LeDistordu@users.noreply.github.com>, 2017
|
||||
# Frédéric LIETART <stuff@tifred.fr>, 2017
|
||||
|
|
@ -56,13 +56,14 @@
|
|||
# Saad Thaifa <saad.thaifa@gmail.com>, 2017
|
||||
# leemannd <denis.leemann@camptocamp.com>, 2017
|
||||
# Nissar Chababy <funilrys@outlook.com>, 2017
|
||||
# Cécile Collart <cco@odoo.com>, 2017
|
||||
# Fabri Yohann <psn@fabri.pw>, 2017
|
||||
# Loic <loic.richard2@gmail.com>, 2017
|
||||
# Lionel Sausin <ls@numerigraphe.com>, 2017
|
||||
# Stanislas Sodonon <stanislas.sodonon@gmail.com>, 2017
|
||||
# Jeanjean Noname <monsieur.spock@gmail.com>, 2017
|
||||
# Paul-Hervé Meyer <paulherve.meyer@mail.novancia.fr>, 2017
|
||||
# Florent de Labarre <florent@iguanayachts.com>, 2017
|
||||
# Elliot DRAKE <monsieur.byte@gmail.com>, 2017
|
||||
# Jérôme Tanché <jerome.tanche@ouest-dsi.fr>, 2017
|
||||
# Davy <cottet_davy@yahoo.fr>, 2017
|
||||
# fr trans <e2ftrans1@yahoo.com>, 2017
|
||||
|
|
@ -70,13 +71,15 @@
|
|||
# FR R4 <e2ffr1111@hotmail.com>, 2017
|
||||
# fr rev <e2ffr04@hotmail.com>, 2017
|
||||
# Elias Alouane <e.alouane@ahktunis.org>, 2017
|
||||
# Florent de Labarre <florent@iguanayachts.com>, 2017
|
||||
# e2f <projects@e2f.com>, 2018
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"Last-Translator: Elias Alouane <e.alouane@ahktunis.org>, 2017\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: e2f <projects@e2f.com>, 2018\n"
|
||||
"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -95,7 +98,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"* L'état \"Brouillon\" est utilisé lorsqu'un utilisateur est en train de saisir ou de modifier une nouvelle facture non confirmée.\n"
|
||||
"* L'état \"Pro-forma\" est utilisé lorsque la facture n'a pas de numéro de facture.\n"
|
||||
"* L'état 'Ouvert' est utilisé lorsque l'utilisateur crée une facture, celle-ci a alors un numéro de facture. La facture reste dans ce statut \"Ouvert\" jusqu'à ce qu'elle soit payée.\n"
|
||||
"* L'état 'Ouvert' est utilisé lorsque l'utilisateur crée une facture, un numéro de facture est généré. La facture reste dans ce statut \"Ouvert\" jusqu'à ce qu'elle soit payée.\n"
|
||||
"* L'état 'Payé' est affecté automatiquement lorsque la facture est payée. Ses écritures dans les journaux connexes peuvent ou non être réconciliées.\n"
|
||||
"* L'état \"Annulé\" est utilisé lorsque l'utilisateur annule la facture."
|
||||
|
||||
|
|
@ -162,12 +165,6 @@ msgstr "%s (Copie)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (copie)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr "&nbsp;"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -233,14 +230,14 @@ msgstr ": Avoir"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_trialbalance
|
||||
msgid ": Trial Balance"
|
||||
msgstr ": Balance des comptes"
|
||||
msgstr ": Balance générale"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.template,body_html:account.mail_template_data_payment_receipt
|
||||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -319,6 +316,71 @@ msgid ""
|
|||
"</table>\n"
|
||||
"</div>"
|
||||
msgstr ""
|
||||
"<div>\n"
|
||||
"% set record = ctx.get('record')\n"
|
||||
"% set company = record and record.company_id or user.company_id\n"
|
||||
"<table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed; border-collapse:separate;\" summary=\"o_mail_notification\">\n"
|
||||
"<tbody>\n"
|
||||
" <!-- HEADER -->\n"
|
||||
" <tr>\n"
|
||||
" <td align=\"center\" style=\"min-width: 590px;\">\n"
|
||||
" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px; border-collapse:separate;\">\n"
|
||||
" <tr>\n"
|
||||
" <td valign=\"middle\">\n"
|
||||
" <span style=\"font-size:20px; color:white; font-weight: bold;\">\n"
|
||||
" Facture ${object.record_name}\n"
|
||||
" </span>\n"
|
||||
" </td>\n"
|
||||
" <td valign=\"middle\" align=\"right\">\n"
|
||||
" <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${company.name}\"/>\n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
" </table>\n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
" <!-- CONTENT -->\n"
|
||||
" <tr>\n"
|
||||
" <td align=\"center\" style=\"min-width: 590px;\">\n"
|
||||
" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px; border-collapse:separate;\">\n"
|
||||
" <tbody>\n"
|
||||
" <td valign=\"top\" style=\"font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;\">\n"
|
||||
" ${object.body | safe}\n"
|
||||
" </td>\n"
|
||||
" </tbody>\n"
|
||||
" </table>\n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
" <!-- FOOTER -->\n"
|
||||
" <tr>\n"
|
||||
" <td align=\"center\" style=\"min-width: 590px;\">\n"
|
||||
" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); padding: 20px; border-collapse:separate;\">\n"
|
||||
" <tr>\n"
|
||||
" <td valign=\"middle\" align=\"left\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
|
||||
" ${company.name}<br/>\n"
|
||||
" ${company.phone or ''}\n"
|
||||
" </td>\n"
|
||||
" <td valign=\"middle\" align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
|
||||
" % if company.email:\n"
|
||||
" <a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: white;\">${company.email}</a><br/>\n"
|
||||
" % endif\n"
|
||||
" % if company.website:\n"
|
||||
" <a href=\"${company.website}\" style=\"text-decoration:none; color: white;\">\n"
|
||||
" ${company.website}\n"
|
||||
" </a>\n"
|
||||
" % endif\n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
" </table>\n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
" <tr>\n"
|
||||
" <td align=\"center\">\n"
|
||||
" Fourni par <a target=\"_blank\" href=\"https://www.odoo.com\">Odoo</a>.\n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
"</tbody>\n"
|
||||
"</table>\n"
|
||||
"</div>"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.template,body_html:account.email_template_edi_invoice
|
||||
|
|
@ -342,7 +404,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -1598,13 +1660,14 @@ msgstr "Compte à utiliser à la place"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
"Compte utilisé comme contrepartie pour la pièce comptable, pour les taxes "
|
||||
"exigibles en fonction des paiements."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Comptabilité"
|
||||
|
|
@ -1612,7 +1675,7 @@ msgstr "Comptabilité"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_journal_form
|
||||
msgid "Accounting App Options"
|
||||
msgstr ""
|
||||
msgstr "Options de l'application Comptabilité"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_wizard_multi_chart
|
||||
|
|
@ -1931,11 +1994,6 @@ msgstr ""
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Autoriser l'annulation d'écriture"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr "Autoriser le taux de change en direct"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1959,7 +2017,7 @@ msgstr "Activer l'impression et le dépôt de chèques "
|
|||
#. module: account
|
||||
#: model:res.groups,name:account.group_cash_rounding
|
||||
msgid "Allow the cash rounding management"
|
||||
msgstr ""
|
||||
msgstr "Autoriser la gestion d'arrondis d'espèces"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
|
|
@ -1978,6 +2036,7 @@ msgstr "Vous permet d'utiliser la comptabilité analytique"
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -2209,12 +2268,18 @@ msgstr "Appliquer automatiquement cette position fiscale"
|
|||
|
||||
#. 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."
|
||||
msgstr ""
|
||||
"Appliquer seulement si le pays de livraison ou de facturation correspond au "
|
||||
"groupe."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
"Appliquer seulement si le pays de livraison ou de facturation correspond au "
|
||||
"groupe."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2299,14 +2364,14 @@ msgid "Automated Entries"
|
|||
msgstr "Génération automatique d'entrées comptables"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr "Ligne de solde automatique"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr "Taux de change automatiques"
|
||||
|
||||
|
|
@ -2487,6 +2552,12 @@ msgstr "Configuration de la banque marquée comme terminée"
|
|||
msgid "Bank Statement"
|
||||
msgstr "Relevé bancaire"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -3169,7 +3240,7 @@ msgstr "Cliquez pour saisir un nouveau relevé bancaire."
|
|||
#: model:ir.actions.act_window,help:account.action_account_payments
|
||||
#: model:ir.actions.act_window,help:account.action_account_payments_payable
|
||||
msgid "Click to register a payment"
|
||||
msgstr "Cliques pour enregistrer un paiement"
|
||||
msgstr "Cliquer pour enregistrer un règlement"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
@ -3898,7 +3969,7 @@ msgstr "Différence de taux de change"
|
|||
#: model:account.account.type,name:account.data_account_type_current_assets
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Current Assets"
|
||||
msgstr "Actifs actuels"
|
||||
msgstr "Actifs circulants"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.data_account_type_current_liabilities
|
||||
|
|
@ -4071,6 +4142,29 @@ msgstr "Jour(s) après la date de facturation"
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr "Désactiver la barre de configuration du tableau de bord"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Madame, Monsieur,\n"
|
||||
"\n"
|
||||
"D'après nos relevés, il semble que nous sommes encore en attente à ce jour de paiements de votre part, dont les détails sont indiqués ci-dessous.\n"
|
||||
"Si ces sommes ont déjà été réglées, vous pouvez ignorer ce rappel. Dans le cas contraire, nous vous remercions de bien vouloir nous faire parvenir votre règlement.\n"
|
||||
"Si vous avez d'autres questions concernant votre compte, vous pouvez nous contacter directement.\n"
|
||||
"\n"
|
||||
"En vous remerciant par avance.\n"
|
||||
"\n"
|
||||
"Cordialement,"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4570,11 +4664,6 @@ msgstr "Assistant de composition de email"
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Activer le comparatif"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr "Activer la gestion des relances de paiement"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4928,7 +5017,7 @@ msgid "Follow-up"
|
|||
msgstr "Suivi"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr "Niveaux de relances"
|
||||
|
||||
|
|
@ -5897,12 +5986,6 @@ msgstr "La facture doit être validée pour pouvoir y enregistrer un paiement."
|
|||
msgid "Invoice paid"
|
||||
msgstr "Facture payée"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Facture envoyée"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5914,8 +5997,8 @@ msgid ""
|
|||
"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
|
||||
"and 'draft' or ''}"
|
||||
msgstr ""
|
||||
"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
|
||||
"and 'draft' or ''}"
|
||||
"Facture_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
|
||||
"and 'brouillon' or ''}"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
|
||||
|
|
@ -5979,6 +6062,7 @@ msgstr "Factures sans paiement"
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Facturation"
|
||||
|
|
@ -6266,6 +6350,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Journaux"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr "Audit de journaux"
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6805,7 +6896,7 @@ msgstr "Lettrage manuel"
|
|||
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 ""
|
||||
"Paiement manuel : soyez payé en espèces, par chèque ou par tout autre moyen externe à Odoo.\n"
|
||||
"Paiement électronique : soyez payé automatiquement par un acquéreur en demandant une transaction sur une carte enregistrée par le client lors de l'achat ou de l'inscription en ligne (jeton de paiement).\n"
|
||||
|
|
@ -6819,14 +6910,14 @@ 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 ""
|
||||
"Paiement manuel : soyez payé en espèces, par chèque ou par tout autre moyen externe à Odoo.\n"
|
||||
"Paiement électronique : soyez payé automatiquement par un acquéreur en demandant une transaction sur une carte enregistrée par le client lors de l'achat ou de l'inscription en ligne (jeton de paiement).\n"
|
||||
"Paiement manuel : soyez payé en espèces, par chèque ou par tout autre moyen externe à Odoo.\n"
|
||||
"Paiement électronique : soyez payé automatiquement par un acquéreur en demandant une transaction sur une carte enregistrée par le client lors de l'achat ou de l'inscription en ligne (jeton de paiement).\n"
|
||||
"Chèque : payez par chèque en l'imprimant depuis Odoo.\n"
|
||||
"Dépôt groupé : encaissez plusieurs chèques clients à la fois en générant un dépôt groupé à envoyer à votre banque. Lors de l'encodage du relevé bancaire dans Odoo, vous pouvez rapprocher la transaction et le dépôt groupé. Pour activer le dépôt groupé, vous devez installer le module account_batch_deposit (compte_dépôt_groupé).\n"
|
||||
"Virement SEPA : payez en envoyant un fichier de virement SEPA à votre banque. Pour activer les virements SEPA, vous devez installer le module account_sepa (compte_sepa)."
|
||||
"Dépôt groupé : encaissez plusieurs chèques clients à la fois en générant un dépôt groupé à envoyer à votre banque. Lors de l'encodage du relevé bancaire dans Odoo, vous pouvez rapprocher la transaction et le dépôt groupé. Pour activer le dépôt groupé, vous devez installer le module account_batch_deposit (compte-dépôt-groupé).\n"
|
||||
"Virement SEPA : payez en envoyant un fichier de virement SEPA à votre banque. Pour activer les virements SEPA, vous devez installer le module account_sepa (compte-sepa)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_journal_outbound_payment_method_ids
|
||||
|
|
@ -7177,15 +7268,6 @@ msgstr "Pas de méthode de paiement appropriée activée sur le journal %s"
|
|||
msgid "No detail"
|
||||
msgstr "Aucun détail"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
"Aucun journal divers n'a pu être trouvé. Veuillez en créer un avant de "
|
||||
"continuer."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7989,7 +8071,7 @@ msgstr "Condition de paiement : 30 jours net"
|
|||
#. module: account
|
||||
#: model:account.payment.term,note:account.account_payment_term_advance
|
||||
msgid "Payment terms: 30% Advance End of Following Month"
|
||||
msgstr ""
|
||||
msgstr "Conditions de paiement : 30 % d'avance, fin du mois suivant"
|
||||
|
||||
#. module: account
|
||||
#: model:account.payment.term,note:account.account_payment_term
|
||||
|
|
@ -8152,6 +8234,16 @@ msgid "Please define sequence on the journal related to this invoice."
|
|||
msgstr ""
|
||||
"Veuillez définir une séquence dans le journal relatif à cette facture."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
"Mettez en place un plan comptable ou créez un journal des opérations "
|
||||
"diverses avant de continuer."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -8279,6 +8371,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr "Imprimer les chèques pour payer vos fournisseurs"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -8347,9 +8440,9 @@ msgstr "Compte de résultat"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
"Erreur de programmation : action de l'assistant exécutée sans active_ids "
|
||||
"Erreur de programmation : action de l'assistant exécutée sans active_ids "
|
||||
"dans le contexte."
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8595,7 +8688,7 @@ msgid "Ref."
|
|||
msgstr "Réf."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8886,7 +8979,7 @@ msgid "Rounding Tree"
|
|||
msgstr "Arbre d'arrondi"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr "Transfert de crédit SEPA (SCT)"
|
||||
|
||||
|
|
@ -8909,13 +9002,6 @@ msgstr "Vente"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Taxe à la vente"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "Journal ventes/achats"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -9422,7 +9508,7 @@ msgid "States Count"
|
|||
msgstr "Nombre d'états"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9685,7 +9771,7 @@ msgstr "Taxe à appliquer"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "TaxCloud"
|
||||
msgstr ""
|
||||
msgstr "TaxCloud"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.account.tag,applicability:0
|
||||
|
|
@ -9880,14 +9966,14 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
"Champ technique utilisé pour garder une trace des lettrages des taxes "
|
||||
"d'encaissement, nécessaire lors de l'annulation de la source : cela "
|
||||
"comptabilisera aussi l'inverse dans l'écriture comptable pour annuler cette "
|
||||
"partie."
|
||||
"d'encaissement. Ceci est nécessaire lors de l'annulation de la source : cela"
|
||||
" comptabilisera aussi l'inverse dans l'écriture comptable pour annuler cette"
|
||||
" partie."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_line_tax_exigible
|
||||
|
|
@ -10321,6 +10407,13 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "La référence donnée par le partenaire pour cette facture."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10388,6 +10481,8 @@ msgstr "La séquence du journal %s est désactivée."
|
|||
#: model:ir.model.fields,help:account.field_account_cash_rounding_rounding_method
|
||||
msgid "The tie-breaking rule used for float rounding operations"
|
||||
msgstr ""
|
||||
"Règle utilisée en cas d'égalité pour les opérations d'arrondis de nombres "
|
||||
"décimaux"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_my_invoices
|
||||
|
|
@ -11069,21 +11164,13 @@ msgstr "Type"
|
|||
msgid "UP"
|
||||
msgstr "HAUT"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr "Indéfini pour le moment"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr "Profits/pertes non distribués"
|
||||
|
|
@ -11221,11 +11308,6 @@ msgstr "Utiliser sur base des paiements"
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr "Utilisez le débit direct SEPA"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr "Utilisez les paiements SEPA"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -11270,6 +11352,10 @@ msgid ""
|
|||
" with the current invoice. A new draft invoice will be created\n"
|
||||
" so that you can edit it."
|
||||
msgstr ""
|
||||
"Utilisez cette option si vous voulez annuler une facture et en créer une\n"
|
||||
" nouvelle. L'avoir sera créé, validé et rapproché\n"
|
||||
" de la facture actuelle. Un nouveau brouillon de facture \n"
|
||||
" que vous pourrez modifier sera créé."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
|
||||
|
|
@ -11483,7 +11569,7 @@ msgstr "Fournisseurs"
|
|||
#. module: account
|
||||
#: selection:account.financial.report,type:0
|
||||
msgid "View"
|
||||
msgstr "Voir"
|
||||
msgstr "Vue"
|
||||
|
||||
#. module: account
|
||||
#: selection:res.partner,invoice_warn:0
|
||||
|
|
@ -11710,7 +11796,7 @@ msgstr ""
|
|||
"établi à partir de la hiérarchie des rapports (champ auto-généré 'niveau')."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
|
|
@ -11719,7 +11805,7 @@ msgstr ""
|
|||
" date de blocage %s"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -11730,7 +11816,7 @@ msgstr ""
|
|||
" quelqu'un avec le rôle de \"Conseiller\"."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
|
|
@ -11739,6 +11825,14 @@ msgstr ""
|
|||
"Vous ne pouvez pas annuler une facture qui est partiellement payée. Vous "
|
||||
"devez d'abord annuler le lettrage des lignes de paiement correspondantes."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11838,11 +11932,11 @@ msgstr "On ne peut pas vider le compte bancaire lorsqu'il a été défini. "
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
"Vous ne pouvez pas avoir de compte payable/recevable qui n'est pas "
|
||||
"réconciliable (account code: %s)"
|
||||
"Vous ne pouvez pas avoir de compte client/fournisseur ne pouvant faire "
|
||||
"l'objet d'un rapprochement. (code de compte : %s)"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -8,9 +8,9 @@
|
|||
# Jasmina Otročak <jasmina@uvid.hr>, 2017
|
||||
# Vladimir Olujić <olujic.vladimir@storm.hr>, 2017
|
||||
# Karolina Tonković <karolina.tonkovic@storm.hr>, 2017
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Davor Bojkić <davor.bojkic@storm.hr>, 2017
|
||||
# Tina Milas <tina@uvid.hr>, 2017
|
||||
# Tina Milas, 2017
|
||||
# Dalibor Ružić <Dalibor.Ruzic@storm.hr>, 2017
|
||||
# Ivica Dimjašević <ivica.dimjasevic@storm.hr>, 2017
|
||||
# storm_mpildek <matija.pildek@storm.hr>, 2017
|
||||
|
|
@ -21,8 +21,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: Ana-Maria Olujić <ana-maria.olujic@slobodni-programi.hr>, 2017\n"
|
||||
"Language-Team: Croatian (https://www.transifex.com/odoo/teams/41243/hr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -109,12 +109,6 @@ msgstr "%s (kopija)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (kopija)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr "&nbsp;"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -187,7 +181,7 @@ msgstr ": Bruto Bilanca"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -289,7 +283,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -1128,6 +1122,8 @@ msgid ""
|
|||
"A rounding per line is advised if your prices are tax-included. That way, "
|
||||
"the sum of line subtotals equals the total with taxes."
|
||||
msgstr ""
|
||||
"Zaokruživanje po stavci se preporučuje ako su vaše cijene sa uključenim "
|
||||
"porezom. Na taj način suma svih subtotala jednaka je totalu sa porezom."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:880
|
||||
|
|
@ -1522,11 +1518,12 @@ msgstr "Zamjenski konto"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Računovodstvo"
|
||||
|
|
@ -1848,11 +1845,6 @@ msgstr ""
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Dozvoli otkazivanje knjiženja"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr "Omoguži ažuriranje tečajeva"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1895,6 +1887,7 @@ msgstr "Dozvoljava korištenje analitičkih konta"
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -1944,12 +1937,12 @@ msgstr "Dospjeli iznos u valuti računa"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "Amount Paid"
|
||||
msgstr ""
|
||||
msgstr "Uplaćeni iznos"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_rounding
|
||||
msgid "Amount Rounding"
|
||||
msgstr ""
|
||||
msgstr "Zaokruživanje iznosa"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal_signed
|
||||
|
|
@ -2127,12 +2120,16 @@ msgstr "Automatski primjeni ovu fiskalnu poziciju"
|
|||
|
||||
#. 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."
|
||||
msgstr ""
|
||||
"Primjeni samo ako država odredišta ili država izdavanja računa pripada "
|
||||
"grupi."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2189,7 +2186,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_at_least_one_outbound
|
||||
msgid "At Least One Outbound"
|
||||
msgstr ""
|
||||
msgstr "Najmanje jedan odlazni"
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
|
|
@ -2212,21 +2209,21 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Automatic Import"
|
||||
msgstr ""
|
||||
msgstr "Automatski uvoz"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.financial.report,style_overwrite:0
|
||||
|
|
@ -2396,6 +2393,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr "Izvod banke"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -2428,7 +2431,7 @@ msgstr "Banka i blagajna"
|
|||
#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:15
|
||||
#, python-format
|
||||
msgid "Bank reconciliation"
|
||||
msgstr ""
|
||||
msgstr "Zatvaranje izvoda banke"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_account_setup_bank_data_done
|
||||
|
|
@ -2467,7 +2470,7 @@ msgstr "Iznos osnovice"
|
|||
#: selection:account.tax,tax_exigibility:0
|
||||
#: selection:account.tax.template,tax_exigibility:0
|
||||
msgid "Based on Invoice"
|
||||
msgstr ""
|
||||
msgstr "Prema računu"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_tax_tax_exigibility
|
||||
|
|
@ -2481,7 +2484,7 @@ msgstr ""
|
|||
#: selection:account.tax,tax_exigibility:0
|
||||
#: selection:account.tax.template,tax_exigibility:0
|
||||
msgid "Based on Payment"
|
||||
msgstr ""
|
||||
msgstr "Temeljem plaćanja"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
|
|
@ -3955,6 +3958,28 @@ msgstr "Dana nakon datuma računa"
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Poštovani Gospodine/Gospođo,\n"
|
||||
"\n"
|
||||
"Naša evidencija pokazuje da ima nepodmiranih dugovanja. Molimo ispunite sljedeće podatke.\n"
|
||||
"Ukoliko je iznos već plaćen, molimo zanemarite ovu obavijest, u protivnom, molimo da uplatite ukupan navedeni iznos.\n"
|
||||
"Ukoliko imate pitanja vezanih za Vaš račun, molimo da nas kontaktirate.\n"
|
||||
"\n"
|
||||
"Unaprijed zahvaljujemo na suradnji.\n"
|
||||
"Srdačan pozdrav,"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4445,11 +4470,6 @@ msgstr "Čarobnjak za sastavljanje e-pošte"
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Omogući usporedbu"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr "Omogućuje praćenje plaćanja"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4756,13 +4776,13 @@ msgstr "Fiskalna godina"
|
|||
#: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_day
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_day
|
||||
msgid "Fiscalyear Last Day"
|
||||
msgstr ""
|
||||
msgstr "Zadnji dan fiskalne godine"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_month
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_month
|
||||
msgid "Fiscalyear Last Month"
|
||||
msgstr ""
|
||||
msgstr "Zadnji mjesec fiskalne godine"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.reconcile.model,amount_type:0
|
||||
|
|
@ -4802,7 +4822,7 @@ msgid "Follow-up"
|
|||
msgstr "Pratiti"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5708,12 +5728,6 @@ msgstr "Račun mora biti potvrđen kako bi mogli registrirati uplatu."
|
|||
msgid "Invoice paid"
|
||||
msgstr "Račun plaćen"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Račun poslan"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5790,6 +5804,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Računovodstvo"
|
||||
|
|
@ -6069,6 +6084,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Dnevnici"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6604,7 +6626,7 @@ msgstr "Ručno zatvaranje"
|
|||
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
|
||||
|
|
@ -6615,7 +6637,7 @@ 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 ""
|
||||
|
||||
|
|
@ -6960,13 +6982,6 @@ msgstr "Nije omogućena niti jedna metoda plaćanja na dnevniku %s"
|
|||
msgid "No detail"
|
||||
msgstr "Bez detalja"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7916,6 +7931,14 @@ msgstr "Molimo definirajte brojevni krug na dnevniku."
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr "Molimo definirajte brojevni krug dnevnika povezanog sa ovim računom."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -8041,6 +8064,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -8109,7 +8133,7 @@ msgstr "Dobit i gubitak"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8355,7 +8379,7 @@ msgid "Ref."
|
|||
msgstr "Veza"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8644,7 +8668,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8667,13 +8691,6 @@ msgstr "Prodaja"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Porez prodaje"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "Dnevnik prodaje/nabave"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -9161,7 +9178,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9596,8 +9613,8 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
"Tehničko polje, koristi se za praćenje zatvaranja poreza po naplaćenom. Ovo"
|
||||
|
|
@ -9999,6 +10016,13 @@ msgstr "Partner mora biti jednak za dugovna i potražna konta!"
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "Poziv na broj."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10714,21 +10738,13 @@ msgstr "Vrsta"
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr "Neraspoređena dobit/gubitak"
|
||||
|
|
@ -10866,11 +10882,6 @@ msgstr "Koristi po naplaćenom"
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr "Koristi SEPA plaćanja"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -11346,7 +11357,7 @@ msgstr ""
|
|||
"izvještajima hijerarhijski ( automatski izračunato polje nivoa)."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
|
|
@ -11355,7 +11366,7 @@ msgstr ""
|
|||
"zaključavanja %s"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -11365,7 +11376,7 @@ msgstr ""
|
|||
"postavke tvrtke ili pitajte konzultanta."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
|
|
@ -11374,6 +11385,14 @@ msgstr ""
|
|||
"Ne možete otkazati račun koji je djelomićno plaćen. Morate prvo razvezati "
|
||||
"stavke zatvaranja."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11464,11 +11483,9 @@ msgstr ""
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
"Ne možete imati konta dugovanja/potraživanja koja nisu za zatvaranje. (šifra"
|
||||
" konta: %s)"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# * account
|
||||
#
|
||||
# Translators:
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# krnkris <krnkris@freemail.hu>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# krnkris, 2017
|
||||
# Kovács Tibor <kovika@gmail.com>, 2017
|
||||
# gezza <geza.nagy@oregional.hu>, 2017
|
||||
# Ákos Nagy <akos.nagy@oregional.hu>, 2017
|
||||
|
|
@ -13,8 +13,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: picibucor <picibucor@gmail.com>, 2017\n"
|
||||
"Language-Team: Hungarian (https://www.transifex.com/odoo/teams/41243/hu/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -62,7 +62,7 @@ msgstr "# tranzakció"
|
|||
#. module: account
|
||||
#: model:mail.template,report_name:account.mail_template_data_payment_receipt
|
||||
msgid "${(object.name or '').replace('/','-')}"
|
||||
msgstr ""
|
||||
msgstr "${(object.name or '').replace('/','-')}"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.template,subject:account.email_template_edi_invoice
|
||||
|
|
@ -74,6 +74,7 @@ msgstr "${object.company_id.name} Számla (Ref ${object.number or 'n/a'})"
|
|||
msgid ""
|
||||
"${object.company_id.name} Payment Receipt (Ref ${object.name or 'n/a' })"
|
||||
msgstr ""
|
||||
"${object.company_id.name} Fizetési nyugta (Ref ${object.name or 'n/a' })"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.template,subject:account.mail_template_data_notification_email_account_invoice
|
||||
|
|
@ -100,16 +101,10 @@ msgstr "%s (Másolás)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (másolat)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr "&nbsp;"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
msgstr ""
|
||||
msgstr "&nbsp;<span>ezen</span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -178,7 +173,7 @@ msgstr ": Próba egyenleg"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -280,7 +275,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -1501,11 +1496,12 @@ msgstr "Helyette használt főkönyvi számla"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Könyvelés"
|
||||
|
|
@ -1830,11 +1826,6 @@ msgstr ""
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Érvénytelenítés engedélyezése"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1877,6 +1868,7 @@ msgstr "Analitikus számla használatának engedélyezése."
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -2111,12 +2103,16 @@ msgstr "Automatikusan alkalmazza ezt a költség helyet."
|
|||
|
||||
#. 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."
|
||||
msgstr ""
|
||||
"Csak akkor alkalmazza, ha szállítási vagy számlázási ország megegyezik a "
|
||||
"csoporttal."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2195,14 +2191,14 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2379,6 +2375,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr "Bankkivonat"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -2469,7 +2471,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Batch Deposits"
|
||||
msgstr ""
|
||||
msgstr "Kötegelt befizetés"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -2956,7 +2958,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Checks"
|
||||
msgstr ""
|
||||
msgstr "Csekkek"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_tax_children_tax_ids
|
||||
|
|
@ -3943,6 +3945,32 @@ msgstr "Számla keltétől eltelt nap(ok)"
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Tisztelt Hölgyem/Uram,\n"
|
||||
"\n"
|
||||
"Adataink szerint, az Önök részéről kiegyenlítetlen számláink vannak. Kérjük tekintsék meg a lenti részleteket.\n"
|
||||
"Ha időközben kiegyenlítették azokat, akkor tekintsék levelünket tárgytalannak. Egyéb esetben, kérjük Önöket az elmaradt\n"
|
||||
"számláink kiegyenlítésére.\n"
|
||||
"Egyéb felmerülő kérdésekben állunk szíves rendelkezésükre, kérjük keressenek fel bennünket.\n"
|
||||
"\n"
|
||||
"Az áru ellenértékének teljes kiegyenlítéséig az áru az Eladó tulajdona, az sem fedezetül sem zálogul nem szolgálhat,\n"
|
||||
"el nem tulajdonítható.\n"
|
||||
"\n"
|
||||
"Előre köszönjük együttműködésüket.\n"
|
||||
"Tisztelettel,"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4434,11 +4462,6 @@ msgstr "Email összeállító varázsló"
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Összehasonlítás bekapcsolása"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr "Fizetés emlékeztető szervezésének bekapcsolása"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4793,7 +4816,7 @@ msgid "Follow-up"
|
|||
msgstr "Nyomon-követés"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr "Fizetési-emlékeztető szintek"
|
||||
|
||||
|
|
@ -5719,12 +5742,6 @@ msgstr "Számlának jóváhagyottnak kell lennie a fizetés regisztrálásához.
|
|||
msgid "Invoice paid"
|
||||
msgstr "Kifizetett számla"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Elküldött számla"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5801,6 +5818,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Számlázás"
|
||||
|
|
@ -6085,6 +6103,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Naplók"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6627,7 +6652,7 @@ msgstr "Kézi egyeztetés"
|
|||
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
|
||||
|
|
@ -6638,7 +6663,7 @@ 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 ""
|
||||
|
||||
|
|
@ -6984,13 +7009,6 @@ msgstr "Nincs helyesen megadott fizetési mód bekapcsolva ezen a naplón %s"
|
|||
msgid "No detail"
|
||||
msgstr "Nincs részlet"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7951,6 +7969,14 @@ msgstr "Kérem egy sorrend meghatározását a naplón."
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr "Képezzen sorrendet a naplón ehhez a számlához."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -8078,6 +8104,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -8146,7 +8173,7 @@ msgstr "Eredménykimutatás (Nyereség/Veszteség)"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8392,7 +8419,7 @@ msgid "Ref."
|
|||
msgstr "Hiv."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8681,7 +8708,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8704,13 +8731,6 @@ msgstr "Értékesítés"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Értékesítési adó"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "Értékesítés/Beszerzés napló"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -9204,7 +9224,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9644,8 +9664,8 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
"Technikai mező a készpénz alap adók főkönyvi egyeztetésének nyomon "
|
||||
|
|
@ -10063,6 +10083,13 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "A számla partner hivatkozása."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10794,21 +10821,13 @@ msgstr "Típus"
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr "Megosztatlan Nyereség/Veszteség"
|
||||
|
|
@ -10946,11 +10965,6 @@ msgstr "Készpénz alap használat"
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr "SEPA fizetés használata"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -11435,7 +11449,7 @@ msgstr ""
|
|||
"kiszámítva (automatikusan számított mező a 'szint')."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
|
|
@ -11444,7 +11458,7 @@ msgstr ""
|
|||
"ezzel a záró dátummal %s"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -11455,7 +11469,7 @@ msgstr ""
|
|||
"'Rendszergazda' jogosultsággal rendelkezők közül"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
|
|
@ -11464,6 +11478,14 @@ msgstr ""
|
|||
"Nem vonhat vissza részben kiegyenlített számlát. Először egyeztetetlenné, "
|
||||
"könyveletlenné kell tennie az ide vonatkozó fizetéseket."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11559,11 +11581,9 @@ msgstr ""
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
"Nem lehet vevői Kintlévőség/beszállítói kifizetés főkönyvi számla, ha az nem"
|
||||
" egyeztethető, könyvelhető. (főkönyvi számla kód: %s)"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# Bonny Useful <bonny.useful@gmail.com>, 2017
|
||||
# Ryanto The <ry.the77@gmail.com>, 2017
|
||||
# Wahyu Setiawan <wahyusetiaaa@gmail.com>, 2017
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# oon arfiandwi (OonID) <oon.arfiandwi@gmail.com>, 2017
|
||||
# Edi Santoso <repopamor@gmail.com>, 2017
|
||||
# Rizky Fajar Ryanda <rizky.rikuverse@gmail.com>, 2017
|
||||
|
|
@ -26,8 +26,8 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: Muhammad Syarif <mhdsyarif.ms@gmail.com>, 2017\n"
|
||||
"Language-Team: Indonesian (https://www.transifex.com/odoo/teams/41243/id/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -114,12 +114,6 @@ msgstr "%s (Salinan)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (salinan)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr "&nbsp;"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -192,7 +186,7 @@ msgstr ": Neraca Saldo"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -201,16 +195,6 @@ msgid ""
|
|||
"</p>\n"
|
||||
"</data>"
|
||||
msgstr ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Yth. ${object.partner_id.name},</p>\n"
|
||||
"<p>Terima kasih atas pembayaran Anda.<br/>Ini adalah kuitansi Anda<strong>${(object.name or '').replace('/','-')}</strong> sejumlah <strong>${object.amount} ${object.currency_id.name}</strong> dari ${object.company_id.name}.</p>\n"
|
||||
"<p>Jika Anda memiliki pertanyaan, jangan ragu untuk menghubungi kami.</p>\n"
|
||||
"<p>Salam Hormat,\n"
|
||||
"% if user and user.signature:\n"
|
||||
"${user.signature | safe}\n"
|
||||
"% endif\n"
|
||||
"</p>\n"
|
||||
"</data>"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice
|
||||
|
|
@ -369,7 +353,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -395,50 +379,6 @@ msgid ""
|
|||
"</p>\n"
|
||||
"</div>"
|
||||
msgstr ""
|
||||
"<div>\n"
|
||||
"<p>Yth ${object.partner_id.name}\n"
|
||||
"% set access_action = object.with_context(force_website=True).get_access_action()\n"
|
||||
"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
|
||||
"% set access_url = object.get_mail_url()\n"
|
||||
"\n"
|
||||
"% if object.partner_id.parent_id:\n"
|
||||
" (<i>${object.partner_id.parent_id.name}</i>)\n"
|
||||
"% endif\n"
|
||||
",</p>\n"
|
||||
"<p>Pada lampiran adalah dokumen Anda\n"
|
||||
"% if object.number:\n"
|
||||
"Faktur <strong>${object.number}</strong>\n"
|
||||
"% else:\n"
|
||||
"faktur\n"
|
||||
"% endif\n"
|
||||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"dengan jumlah <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"dari ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
"% if is_online:\n"
|
||||
" <br/><br/>\n"
|
||||
" <center>\n"
|
||||
" <a href=\"${access_url}\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">Lihat Faktur</a>\n"
|
||||
" </center>\n"
|
||||
"% endif\n"
|
||||
" <br/><br/>\n"
|
||||
"\n"
|
||||
"% if object.state=='paid':\n"
|
||||
" <p>Faktur ini sudah dibayar.</p>\n"
|
||||
"% else:\n"
|
||||
" <p>Silahkan lunasi faktur ini sesuai dengan perjanjian.</p>\n"
|
||||
"% endif\n"
|
||||
"\n"
|
||||
"<p>Terima kasih,</p>\n"
|
||||
"<p style=\"color:#888888\">\n"
|
||||
"% if object.user_id and object.user_id.signature:\n"
|
||||
" ${object.user_id.signature | safe}\n"
|
||||
"% endif\n"
|
||||
"</p>\n"
|
||||
"</div>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -721,7 +661,7 @@ msgstr "<strong>2. Daftar Pembayaran yang Belum Dicocokkan</strong>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document_with_payments
|
||||
msgid "<strong>Amount Due</strong>"
|
||||
msgstr "<strong>Jumlah Jatuh Tempo</strong>"
|
||||
msgstr "<strong>Belum Dibayar</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -1655,13 +1595,12 @@ msgstr "Akun untuk digunakan sebagai gantinya"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
"Akun yang digunakan sebagai kontra dari ayat jurnal, untuk pajak wajib "
|
||||
"bersadarkan pembayaran."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Akuntansi"
|
||||
|
|
@ -1983,11 +1922,6 @@ msgstr "Semua baris akun ayat jurnal harus diproses untuk menutup laporan."
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Aktifkan Pembatalan Ayat Jurnal"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr "Gunakan Kurs Langsung"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -2030,6 +1964,7 @@ msgstr "Aktifkan penggunaan akunting analitik."
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -2064,17 +1999,17 @@ msgstr "Jumlah Mata Uang"
|
|||
#: model:ir.ui.view,arch_db:account.invoice_tree
|
||||
#: model:ir.ui.view,arch_db:account.portal_my_invoices
|
||||
msgid "Amount Due"
|
||||
msgstr "Jumlah Jatuh Tempo"
|
||||
msgstr "Belum Dibayar"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_residual_company_signed
|
||||
msgid "Amount Due in Company Currency"
|
||||
msgstr "Jumlah Jatuh Tempo dalam Mata Uang Perusahaan"
|
||||
msgstr "Jumlah Belum Dibayar dalam Mata Uang Perusahaan"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_residual_signed
|
||||
msgid "Amount Due in Invoice Currency"
|
||||
msgstr "Jumlah Jatuh Tempo dalam Mata Uang Faktur"
|
||||
msgstr "Jumlah Belum Dibayar dalam Mata Uang Faktur"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
|
|
@ -2259,10 +2194,14 @@ msgstr "Terapkan otomatis posisi fiskal ini."
|
|||
|
||||
#. 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."
|
||||
msgstr "Terapkan hanya jika negara pengiriman atau faktur sesuai dengan grup."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2342,14 +2281,14 @@ msgid "Automated Entries"
|
|||
msgstr "Ayat-ayat yang Diotomatiskan"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr "Baris Saldo Otomatis"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr "Kurs Otomatis"
|
||||
|
||||
|
|
@ -2529,6 +2468,12 @@ msgstr "Pengaturan Bank Ditandai Sebagai Selesai"
|
|||
msgid "Bank Statement"
|
||||
msgstr "Rekening Koran"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -4106,6 +4051,27 @@ msgstr "Hari setelah tanggal faktur"
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr "Hilangkan bar pemasangan di dasbor"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Yth Bapak/Ibu,\n"
|
||||
"Catatan kami menunjukkan bahwa beberapa pembayaran pada akun Anda masih belum lunas. Silakan lihat rincian di bawah ini.\n"
|
||||
"Jika jumlah tersebut telah dibayar, mohon abaikan pemberitahuan ini. Jika tidak, silakan lunasi jumlah yang tercantum di bawah ini.\n"
|
||||
"Jika Anda memiliki pertanyaan tentang akun Anda, silahkan hubungi kami.\n"
|
||||
"\n"
|
||||
"Terima kasih sebelumnya atas kerjasama Anda.\n"
|
||||
"Salam hormat"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4521,7 +4487,7 @@ msgstr "Jatuh Tempo"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_residual
|
||||
msgid "Due Amount"
|
||||
msgstr "Jumlah Jatuh Tempo"
|
||||
msgstr "Jumlah Belum Dibayar"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
@ -4605,11 +4571,6 @@ msgstr "Petunjuk komposisi email"
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Aktifkan Pembandingan"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr "Aktifkan pengelolaan tindak lanjut pembayaran"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4964,7 +4925,7 @@ msgid "Follow-up"
|
|||
msgstr "Tindak Lanjut"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr "Tingkatan Tindak Lanjut"
|
||||
|
||||
|
|
@ -5918,12 +5879,6 @@ msgstr "Faktur harus divalidasi agar dapat diatur menjadi merekam pembayaran."
|
|||
msgid "Invoice paid"
|
||||
msgstr "Faktur lunas"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Faktur dikirim"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -6000,6 +5955,7 @@ msgstr "Faktur tanpa Pembayaran"
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Penagihan"
|
||||
|
|
@ -6284,6 +6240,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Jurnal-jurnal"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6822,11 +6785,8 @@ msgstr "Rekonsiliasi Manual"
|
|||
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 ""
|
||||
"Manual: Dibayar dengan kas, cek atau semua cara lain di luar Odoo.\n"
|
||||
"Electronik: Pembayaran otomatis melalui penerima pembayaran dengan meminta transaksi pada kartu yang disimpan oleh pelanggan ketika membeli atau subscribe daring (token pembayaran).\n"
|
||||
"Setoran Massal: Cairkan beberapa cek pelanggan sekaligus dengan membuat setoran massal untuk diserahkan pada bank Anda. Ketika merekam rekening koran di Odoo, Anda akan disarankan untuk merekonsiliasi transaksi dengan setoran massal. Aktifkan pilihan ini dari pengaturan."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_id
|
||||
|
|
@ -6836,14 +6796,9 @@ 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 ""
|
||||
"Manual: Dibayar dengan kas, cek atau semua cara lain di luar Odoo.\n"
|
||||
"Electronik: Pembayaran otomatis melalui penerima pembayaran dengan meminta transaksi pada kartu yang disimpan oleh pelanggan ketika membeli atau subscribe daring (token pembayaran).\n"
|
||||
"Cek: Bayar tagihan dengan cek dan cetak dari Odoo.\n"
|
||||
"Setoran Massal: Cairkan beberapa cek pelanggan sekaligus dengan membuat setoran massal untuk diserahkan pada bank Anda. Ketika merekam rekening koran di Odoo, Anda akan disarankan untuk merekonsiliasi transaksi dengan setoran massal. Untuk mengaktifkan setoran massal, pasang modul account_batch_deposit.\n"
|
||||
"SEPA Credit Transfer: Bayar tagihan Anda dari file SEPA Credit Transfer yang Anda serahkan ke bank Anda. Untuk mengaktifkan SEPA Credit Transfer, modul account_sepa harus dipasang"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_journal_outbound_payment_method_ids
|
||||
|
|
@ -7190,15 +7145,6 @@ msgstr "Tidak ada metode pembayaran sesuai yang diaktifkan pada jurnal %s"
|
|||
msgid "No detail"
|
||||
msgstr "Tidak ada detail"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
"Tidak ada jurnal lain-lain yang dapat ditemukan. Silahkan buat yang baru "
|
||||
"sebelum melanjutkan."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -8156,6 +8102,14 @@ msgid "Please define sequence on the journal related to this invoice."
|
|||
msgstr ""
|
||||
"Silahkan tetapkan penomoran pada jurnal yang berhubungan dengan faktur ini."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -8283,6 +8237,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr "Cetak cek untuk membayar pemasok Anda"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -8351,8 +8306,8 @@ msgstr "Laba dan Rugi"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
msgstr "Eror program: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_chart_template_form
|
||||
|
|
@ -8597,7 +8552,7 @@ msgid "Ref."
|
|||
msgstr "Ref."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8703,17 +8658,17 @@ msgstr "Biasa"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_invoice_residual_company_signed
|
||||
msgid "Remaining amount due in the currency of the company."
|
||||
msgstr "Sisa jumlah jatuh tempo dalam mata uang perusahaan."
|
||||
msgstr "Sisa jumlah belum dibayar dalam mata uang perusahaan."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_invoice_residual_signed
|
||||
msgid "Remaining amount due in the currency of the invoice."
|
||||
msgstr "Sisa jumlah jatuh tempo dalam mata uang faktur."
|
||||
msgstr "Sisa jumlah belum dibayar dalam mata uang faktur."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_invoice_residual
|
||||
msgid "Remaining amount due."
|
||||
msgstr "Sisa jumlah jatuh tempo."
|
||||
msgstr "Sisa jumlah belum dibayar."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_tax_dest_id
|
||||
|
|
@ -8887,7 +8842,7 @@ msgid "Rounding Tree"
|
|||
msgstr "Daftar Pembulatan"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr "SEPA Credit Transfer (SCT)"
|
||||
|
||||
|
|
@ -8910,13 +8865,6 @@ msgstr "Penjualan"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Pajak Penjualan"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "Jurnal Penjualan/Pembelian"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -9418,7 +9366,7 @@ msgid "States Count"
|
|||
msgstr "Jumlah Status"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9869,13 +9817,10 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
"Kolom teknis yang digunakan untuk melacak rekonsiliasi pajak basis kas. ini "
|
||||
"diperlukan ketika membatalkan sumbernya: ayat jurnal yang berlawanan akan "
|
||||
"direkam untuk membatalkan bagian tersebut."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_line_tax_exigible
|
||||
|
|
@ -10298,6 +10243,13 @@ msgstr "Rekanan harus sama pada semua baris untuk akun piutang dan hutang!"
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "Referensi rekanan untuk faktur ini."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10801,7 +10753,7 @@ msgstr "Siap Difakturkan"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
|
||||
msgid "To Pay"
|
||||
msgstr "Siap Dibayar"
|
||||
msgstr "Belum Dibayar"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -11038,23 +10990,13 @@ msgstr "Tipe"
|
|||
msgid "UP"
|
||||
msgstr "UP"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
"Tidak dapat mencampur pajak yang termasuk dalam harga yang mempengaruhi "
|
||||
"jumlah dasar tetapi tidak dimasukkan di dalam harga."
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr "Belum Didefinisikan"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr "Keuntungan/Kerugian Belum Terdistribusi"
|
||||
|
|
@ -11192,11 +11134,6 @@ msgstr "Gunakan Basis Kas"
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr "Gunakan SEPA Direct Debit"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr "Gunakan pembayaran SEPA"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -11677,7 +11614,7 @@ msgstr ""
|
|||
"pada hirarki laporan keuangan (kolom hitung-otomatis 'level')."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
|
|
@ -11686,7 +11623,7 @@ msgstr ""
|
|||
"kunci %s"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -11697,7 +11634,7 @@ msgstr ""
|
|||
"'Penasihat'"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
|
|
@ -11706,6 +11643,14 @@ msgstr ""
|
|||
"Anda tidak dapat membatalkan faktur yang sudah dibayar sebagian. Anda perlu "
|
||||
"membatalkan rekonsiliasi ayat pembayaran terkait terlebih dahulu."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11805,11 +11750,9 @@ msgstr "Anda tidak dapat mengosongkan akun bank setelah diset."
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
"Anda tidak boleh memiliki akun hutang/piutang yang tidak dapat "
|
||||
"direkonsiliasi. (kode akun: %s)"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# Translators:
|
||||
# Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Eric Geens <ericgeens@yahoo.com>, 2017
|
||||
# Erwin van der Ploeg <erwin@odooexperts.nl>, 2017
|
||||
# Stephan Van Dyck <stephan.vandyck@vanroey.be>, 2017
|
||||
|
|
@ -15,13 +15,14 @@
|
|||
# Melroy van den Berg <webmaster1989@gmail.com>, 2017
|
||||
# Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2017
|
||||
# Julia van Orsouw <julia@odooexperts.nl>, 2017
|
||||
# Thomas Pot <thomas@open2bizz.nl>, 2018
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"Last-Translator: Julia van Orsouw <julia@odooexperts.nl>, 2017\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: Thomas Pot <thomas@open2bizz.nl>, 2018\n"
|
||||
"Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -107,12 +108,6 @@ msgstr "%s (Kopie)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (kopie)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr "&nbsp;"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -173,7 +168,7 @@ msgstr ": Grootboek"
|
|||
#: code:addons/account/models/account.py:539
|
||||
#, python-format
|
||||
msgid ": Refund"
|
||||
msgstr ": Credit nota"
|
||||
msgstr ": Creditfactuur"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_trialbalance
|
||||
|
|
@ -185,7 +180,7 @@ msgstr ": Proefbalans"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -195,9 +190,9 @@ msgid ""
|
|||
"</data>"
|
||||
msgstr ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Beste ${object.partner_id.name},</p>\n"
|
||||
"<p>Bedankt voor uw betaling.<br/>Hier is uw betaalbewijs <strong>${(object.name or '').replace('/','-')}</strong> voor het bedrag van <strong>${object.amount} ${object.currency_id.name}</strong> van ${object.company_id.name}.</p>\n"
|
||||
"<p>Wanneer u vragen heeft, laat het ons weten.</p>\n"
|
||||
"<data>Beste ${object.partner_id.name},</p>\n"
|
||||
"<p>Bedankt voor de betaling.<br/>Hierbij sturen wij u het afschrift van de betaling <strong>${(object.name or '').replace('/','-')}</strong> voor het bedrag van <strong>${format_amount(object.amount, object.currency_id)}</strong> van ${object.company_id.name}.</p>\n"
|
||||
"<p>Wanneer u nog vragen heeft, neemt u dan contact op.</p>\n"
|
||||
"<p>Met vriendelijke groet,\n"
|
||||
"% if user and user.signature:\n"
|
||||
"${user.signature | safe}\n"
|
||||
|
|
@ -362,7 +357,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -398,16 +393,16 @@ msgstr ""
|
|||
" (<i>${object.partner_id.parent_id.name}</i>)\n"
|
||||
"% endif\n"
|
||||
",</p>\n"
|
||||
"<p>In de bijlage vind u, uw \n"
|
||||
"<p>In de bijlage sturen wij uw \n"
|
||||
"% if object.number:\n"
|
||||
"invoice <strong>${object.number}</strong>\n"
|
||||
"factuur <strong>${object.number}</strong>\n"
|
||||
"% else:\n"
|
||||
"factuur\n"
|
||||
"% endif\n"
|
||||
"% if object.origin:\n"
|
||||
"(met referentie: ${object.origin})\n"
|
||||
"(uw referentie: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"voor het bedrag van <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"voor een totaalbedrag van <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"van ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -420,12 +415,12 @@ msgstr ""
|
|||
" <br/><br/>\n"
|
||||
"\n"
|
||||
"% if object.state=='paid':\n"
|
||||
" <p>Deze factuur is al betaald.</p>\n"
|
||||
" <p>Deze factuur is reeds voldaan.</p>\n"
|
||||
"% else:\n"
|
||||
" <p>Gelieve de betaling zo spoedig mogelijk te voldoen.</p>\n"
|
||||
" <p>Wij stellen het op prijs wanneer u deze factuur z.s.m. betaald, doch uiterlijk op de vervaldatum.</p>\n"
|
||||
"% endif\n"
|
||||
"\n"
|
||||
"<p>Vriendelijk bedankt,</p>\n"
|
||||
"<p>Dank u vriendelijk,</p>\n"
|
||||
"<p style=\"color:#888888\">\n"
|
||||
"% if object.user_id and object.user_id.signature:\n"
|
||||
" ${object.user_id.signature | safe}\n"
|
||||
|
|
@ -565,7 +560,7 @@ msgid ""
|
|||
" </span>"
|
||||
msgstr ""
|
||||
"<span class=\"panel-title\">\n"
|
||||
" <strong>Facturatie</strong> (Beperkte toegang)\n"
|
||||
" <strong>Boekhouding</strong> (Beperkte toegang)\n"
|
||||
" </span>"
|
||||
|
||||
#. module: account
|
||||
|
|
@ -822,7 +817,7 @@ msgstr "<strong>Klant adres</strong>"
|
|||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "<strong>Customer Code:</strong>"
|
||||
msgstr "<strong>Klantcode:</strong>"
|
||||
msgstr "<strong>Debiteurennummer:</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
|
|
@ -1134,8 +1129,7 @@ msgid ""
|
|||
"<strong>Validate the bill</strong><br/> after encoding the products and "
|
||||
"taxes."
|
||||
msgstr ""
|
||||
"Bevestig de factuur</strong><br/> na het invoeren van de producten en "
|
||||
"belastingen."
|
||||
"Bevestig de factuur</strong><br/> na het invoeren van de producten en BTW."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
|
|
@ -1173,7 +1167,7 @@ msgstr "Een kas transactie kan geen 0 bedrag bevatten."
|
|||
#, python-format
|
||||
msgid "A Payment Terms should have its last line of type Balance."
|
||||
msgstr ""
|
||||
"Een betalingsvoorwaarde moet zijn laatste lijn als type balans hebben."
|
||||
"Bij een betalingsvoorwaarde moet zijn laatste regel het type saldo hebben."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1734
|
||||
|
|
@ -1226,7 +1220,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "A list of common taxes and their rates."
|
||||
msgstr "Een lijst van vaak voorkomende belastingen en hun tarieven."
|
||||
msgstr "Een lijst van vaak voorkomende BTW en hun tarieven."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -1256,9 +1250,8 @@ msgid ""
|
|||
"A rounding per line is advised if your prices are tax-included. That way, "
|
||||
"the sum of line subtotals equals the total with taxes."
|
||||
msgstr ""
|
||||
"Een afronding per lijn is aanbevolen indien uw prijzen inclusief belastingen"
|
||||
" zijn. Hierdoor is de som van de lijnen gelijk aan de totale som met "
|
||||
"belastingen."
|
||||
"Een afronding per regel is aanbevolen indien uw prijzen inclusief BTW zijn. "
|
||||
"Hierdoor is de som van de regels gelijk aan de totale bedrag inclusief BTW."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:880
|
||||
|
|
@ -1656,13 +1649,14 @@ msgstr "Rekening om toe te passen"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
"Rekening welke wordt gebruikt als tegenrekening voor de boeking bij BTW "
|
||||
"Grootboek welke wordt gebruikt als tegenrekening voor de boeking bij BTW "
|
||||
"gebaseerd op betalingen."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Boekhouding"
|
||||
|
|
@ -1780,12 +1774,12 @@ msgstr "Toevoegen"
|
|||
#: model:ir.ui.view,arch_db:account.invoice_form
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
|
||||
msgid "Add Credit Note"
|
||||
msgstr "Voeg credit nota toe"
|
||||
msgstr "Voeg creditfactuur toe"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.cash.rounding,strategy:0
|
||||
msgid "Add a rounding line"
|
||||
msgstr "Voeg een afrondingslijn toe"
|
||||
msgstr "Voeg een afrondingsregel toe"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_has_second_line
|
||||
|
|
@ -1990,11 +1984,6 @@ msgstr ""
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Maak het annuleren van boekingen mogelijk"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr "Sta live wisselkoers toe"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -2037,6 +2026,7 @@ msgstr "Stelt u in staat kostenplaatsen te gebruiken"
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -2248,7 +2238,7 @@ msgstr "Kostenplaatslabels"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Analytics"
|
||||
msgstr "Analytics"
|
||||
msgstr "Kostenplaatsen"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_tax_exigible
|
||||
|
|
@ -2268,11 +2258,16 @@ msgstr "Automatisch toepassen op deze fiscale positie."
|
|||
|
||||
#. 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."
|
||||
msgstr ""
|
||||
"Alleen toepassen als aflevering of facturering overeenkomen met de groep."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
"Alleen toepassen als aflever- of factuur land overeenkomt met de groep."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2289,7 +2284,7 @@ msgstr "Alleen toepassen als partner een BTW nummer heeft."
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Apply right VAT rates for digital products sold in EU"
|
||||
msgstr "Pas juiste belastingen toe voor digitale producten verkocht in de EU"
|
||||
msgstr "Pas juiste BTW toe voor digitale producten verkocht in de EU"
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
|
|
@ -2304,7 +2299,7 @@ msgstr "Gearchiveerd"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
|
||||
msgid "Ask for a Credit Note"
|
||||
msgstr "Voeg om een creditfactuur"
|
||||
msgstr "Vraag om een creditfactuur"
|
||||
|
||||
#. module: account
|
||||
#: model:account.financial.report,name:account.account_financial_report_assets0
|
||||
|
|
@ -2353,14 +2348,14 @@ msgid "Automated Entries"
|
|||
msgstr "Geautomatiseerde boekingen"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr "Automatische balansregel"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr "Automatische wisselkoersen"
|
||||
|
||||
|
|
@ -2453,7 +2448,7 @@ msgstr "Bank"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Bank & Cash"
|
||||
msgstr "Bank & Cash"
|
||||
msgstr "Bank & Kas"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:163
|
||||
|
|
@ -2541,6 +2536,12 @@ msgstr "Bank installatie gemarkeerd als voltooid"
|
|||
msgid "Bank Statement"
|
||||
msgstr "Bankafschrift"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr "Bankafschrift %s"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -2741,7 +2742,7 @@ msgstr "Per product"
|
|||
#. module: account
|
||||
#: model:ir.filters,name:account.filter_invoice_product_category
|
||||
msgid "By Product Category"
|
||||
msgstr "Op product categorie"
|
||||
msgstr "Op productcategorie"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.filters,name:account.filter_invoice_salespersons
|
||||
|
|
@ -2937,7 +2938,7 @@ msgstr "Kas afrondingen"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
|
||||
msgid "Cash Statements"
|
||||
msgstr "Betaalbewijsen"
|
||||
msgstr "Betaalbewijzen"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_bank_account_ids
|
||||
|
|
@ -3125,7 +3126,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Checks"
|
||||
msgstr "Controles"
|
||||
msgstr "Cheques"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_tax_children_tax_ids
|
||||
|
|
@ -3408,12 +3409,12 @@ msgstr "Complete set van BTW"
|
|||
#: code:addons/account/models/account_invoice.py:570
|
||||
#, python-format
|
||||
msgid "Compose Email"
|
||||
msgstr "Email opstellen"
|
||||
msgstr "E-mail opstellen"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Compute tax rates based on U.S. ZIP codes"
|
||||
msgstr "Bereken belastingen gebaseerd op V.S. postcodes"
|
||||
msgstr "Bereken BTW gebaseerd op V.S. postcodes"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_line_counterpart
|
||||
|
|
@ -3837,7 +3838,7 @@ msgstr "Credit mutatie"
|
|||
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
|
||||
#, python-format
|
||||
msgid "Credit Note"
|
||||
msgstr "Creditnota"
|
||||
msgstr "Creditfactuur"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:440
|
||||
|
|
@ -4118,6 +4119,29 @@ msgstr "Dag(en) na de factuurdatum"
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr "De-activeer installatie hulp in dashboard"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Geachte heer / mevrouw,\n"
|
||||
"\n"
|
||||
"Uit onze gegevens blijkt dat sommige rekeningen nog niet zijn betaald. Hieronder vindt u meer informatie.\n"
|
||||
"Indien het bedrag reeds is betaald, dan kunt u dit bericht negeren. Anders willen wij u vragen om het onderstaande totaal bedrag over te maken.\n"
|
||||
"\n"
|
||||
"Als u vragen heeft over uw facturen, neem dan contact met ons op.\n"
|
||||
"\n"
|
||||
"Dank u bij voorbaat voor uw medewerking.\n"
|
||||
"Met vriendelijke groet,"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4206,7 +4230,7 @@ msgstr "Standaard BTW"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Default taxes applied to local transactions"
|
||||
msgstr "Standaard belastingen toegepast op lokale transacties"
|
||||
msgstr "Standaard BTW toegepast op lokale transacties"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
|
|
@ -4615,11 +4639,6 @@ msgstr "E-mail samenstellen wizard"
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Vergelijking inschakelen"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr "Activeren betaalherinneringen / betaalopvolging management"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4775,7 +4794,7 @@ msgstr "Kostenrekening op product sjabloon"
|
|||
#: model:account.account.type,name:account.data_account_type_expenses
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Expenses"
|
||||
msgstr "Declaraties"
|
||||
msgstr "Kosten"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_reference
|
||||
|
|
@ -4882,7 +4901,7 @@ msgstr "Fiscale toewijzing"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Fiscal Periods"
|
||||
msgstr "Fiscale perioden"
|
||||
msgstr "Boekjaar"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
|
||||
|
|
@ -4973,7 +4992,7 @@ msgid "Follow-up"
|
|||
msgstr "Opvolging"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr "Betalingsherinnering niveau's"
|
||||
|
||||
|
|
@ -5117,7 +5136,7 @@ msgstr "Genereer boekingen"
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.account_reports_legal_statements_menu
|
||||
msgid "Generic Statements"
|
||||
msgstr "Generieke afschriften"
|
||||
msgstr "Management rapportages"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -5927,12 +5946,6 @@ msgstr ""
|
|||
msgid "Invoice paid"
|
||||
msgstr "Factuur betaald"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Factuur verzonden"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -6009,9 +6022,10 @@ msgstr "Facturen zonder betaling"
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Facturatie"
|
||||
msgstr "Boekhouding"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_is_unaffected_earnings_line
|
||||
|
|
@ -6295,6 +6309,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Dagboeken"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr "Dagboeken controle"
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6752,7 +6773,7 @@ msgstr "MEM"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Mail your invoices in one-click using"
|
||||
msgstr "Mail uw facturen in één klik met gebruik van"
|
||||
msgstr "E-mail uw facturen in één klik met gebruik van"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -6768,12 +6789,12 @@ msgstr "Hoofd titel 1 (vet, onderstreept)"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_res_config_settings_currency_id
|
||||
msgid "Main currency of the company."
|
||||
msgstr "Hoofd valuta van het bedrijf."
|
||||
msgstr "Hoofdvaluta van het bedrijf."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Main currency of your company"
|
||||
msgstr "Hoofd valuta van uw bedrijf"
|
||||
msgstr "Hoofdvaluta van uw bedrijf"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -6836,11 +6857,11 @@ msgstr "Handmatig afletteren"
|
|||
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 ""
|
||||
"Handmatig: Krijg betaald met contant geld, cheques of een andere methode buiten Odoo om\n"
|
||||
"Elektronisch: Betaal automatisch via een betalingsverwerver door een transactie aan te vragen op een door de klant opgeslagen kaart bij het online kopen of abonneren van (betalingstoken).\n"
|
||||
"Batch Deposito: Verzamel meerdere klantcheques tegelijk door een batch deposito te genereren om bij uw bank in te dienen. Wanneer u de bankafschrift in Odoo ingeeft, wordt u voorgesteld om de transactie af te letteren met de batchafbetaling. Schakel deze optie in bij instellingen."
|
||||
"Batch Deposito: Verzamel meerdere klantcheques tegelijk door een batch deposito te genereren om bij uw bank in te dienen. Wanneer u de bankafschriften in Odoo ingeeft, wordt u voorgesteld om de transactie af te letteren met de batchafbetaling. Schakel deze optie in bij instellingen."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_id
|
||||
|
|
@ -6850,13 +6871,13 @@ 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 ""
|
||||
"Handmatig: Krijg betaald met contant geld, cheques of een andere methode buiten Odoo om\n"
|
||||
"Elektronisch: Betaal automatisch via een betalingsverwerker door een transactie aan te vragen op een door de klant opgeslagen kaart bij het online kopen of abonneren van (betalingstoken).\n"
|
||||
"Cheque: Betaal factuur met een cheque en druk deze af in Odoo\n"
|
||||
"Batch Deposito: Verzamel meerdere klantcheques tegelijk door een batch deposito te genereren om bij uw bank in te dienen. Wanneer u de bankafschrift in Odoo ingeeft, wordt u voorgesteld om de transactie af te letteren met de batchafbetaling. Schakel deze optie in bij instellingen.\n"
|
||||
"Batch Deposito: Verzamel meerdere klantcheques tegelijk door een batch deposito te genereren om bij uw bank in te dienen. Wanneer u de bankafschriften in Odoo ingeeft, wordt u voorgesteld om de transactie af te letteren met de batchafbetaling. Schakel deze optie in bij instellingen.\n"
|
||||
"SEPA overschrijving: Betaal de factuur met een SEPA verschrijvingsbestand welke je upload bij de bank. Om SEPA te activeren dient te module ccount_sepa worden geïnstalleerd."
|
||||
|
||||
#. module: account
|
||||
|
|
@ -6933,7 +6954,7 @@ msgstr "Bijbehorende nummer"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile_max_date
|
||||
msgid "Max Date of Matched Lines"
|
||||
msgstr "Maximale datum van overeenkomende lijnen"
|
||||
msgstr "Maximale datum van overeenkomende regels"
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
|
|
@ -7206,15 +7227,6 @@ msgstr "Geen geschikte betaalmethode gedefinieerd voor dagboek %s"
|
|||
msgid "No detail"
|
||||
msgstr "Geen detail"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
"Geen memoriaal dagboek gevonden. Mak een memoriaal dagboek aan om door te "
|
||||
"gaan."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7397,7 +7409,7 @@ msgid ""
|
|||
" for miscellaneous operations."
|
||||
msgstr ""
|
||||
"Odoo maakt automatisch een journaalpost per financieel document:\n"
|
||||
"factuur, creditnota, inkoopfactuur, bankafschrift, enz. U zult dus\n"
|
||||
"factuur, creditfactuur, inkoopfactuur, bankafschrift, enz. U zult dus\n"
|
||||
"alleen voor alle andere een seperate journaalpost willen maken;\n"
|
||||
"denk aan openingsbalans, memoriaalboekingen"
|
||||
|
||||
|
|
@ -7440,7 +7452,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"De electronisch facturatie in Odoo vergemakkelijkt en versnelt\n"
|
||||
" het innen van betalingen van klanten. Uw klant ontvangt zijn factuur\n"
|
||||
" per email, en hij kan online betalen en/of de factuur importeren\n"
|
||||
" per e-mail, en hij kan online betalen en/of de factuur importeren\n"
|
||||
" in zijn bedrijfssysteem.."
|
||||
|
||||
#. module: account
|
||||
|
|
@ -7726,7 +7738,7 @@ msgstr "PDF rapportages"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Package"
|
||||
msgstr "Verpakking"
|
||||
msgstr "Pakket"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.invoice,state:0 selection:account.invoice.report,state:0
|
||||
|
|
@ -8163,7 +8175,7 @@ msgstr "Maak factuurregels aan."
|
|||
#: code:addons/account/models/account_move.py:157
|
||||
#, python-format
|
||||
msgid "Please define a sequence for the credit notes"
|
||||
msgstr "Gelieve een sequentie te definiëren voor de credit notas"
|
||||
msgstr "U dient een reeks te definiëren voor de creditfacturen"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:162
|
||||
|
|
@ -8177,6 +8189,16 @@ msgstr "Definieer een reeks voor dit dagboek."
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr "Definieer een reeks voor het dagboek gerelateerd aan deze factuur."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
"U dient een grootboekschema te installeren of een overig dagboek aan te "
|
||||
"maken voordat u verder gaat."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -8301,9 +8323,10 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Print checks to pay your vendors"
|
||||
msgstr "Print controles om je leveranciers te betalen"
|
||||
msgstr "Print cheques om je leveranciers te betalen"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -8372,7 +8395,7 @@ msgstr "Winst en Verlies"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
"Programmeerfout: wizard actie uitgevoerd zonder active_ids in context."
|
||||
|
||||
|
|
@ -8619,7 +8642,7 @@ msgid "Ref."
|
|||
msgstr "Ref."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8908,7 +8931,7 @@ msgid "Rounding Tree"
|
|||
msgstr "Afrondboom"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr "SEPA Overschrijving (SCT)"
|
||||
|
||||
|
|
@ -8931,13 +8954,6 @@ msgstr "Verkoop"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Verkoop BTW"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "Verkoopboek/inkoopboek"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -9302,7 +9318,7 @@ msgstr "Toon volledige boekhoudkundige opties"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_tax_search
|
||||
msgid "Show active taxes"
|
||||
msgstr "Toon actieve belastingen"
|
||||
msgstr "Toon actieve BTW"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
|
|
@ -9312,7 +9328,7 @@ msgstr "Toon alle records welke een actiedatum voor vandaag hebben"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_tax_search
|
||||
msgid "Show inactive taxes"
|
||||
msgstr "Toon inactieve belastingen"
|
||||
msgstr "Toon inactieve BTW"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_show_on_dashboard
|
||||
|
|
@ -9394,7 +9410,7 @@ msgstr "Kassa beginsaldo"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_payment_search
|
||||
msgid "State"
|
||||
msgstr "Staat / Provincie"
|
||||
msgstr "Status"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_line_parent_state
|
||||
|
|
@ -9441,7 +9457,7 @@ msgid "States Count"
|
|||
msgstr "Aantal statussen"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9552,13 +9568,13 @@ msgstr "BTW rekening voor credits"
|
|||
#: model:ir.model.fields,field_description:account.field_account_tax_tax_adjustment
|
||||
#: model:ir.model.fields,field_description:account.field_account_tax_template_tax_adjustment
|
||||
msgid "Tax Adjustment"
|
||||
msgstr "Belasting aanpassing"
|
||||
msgstr "BTW aanpassing"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.tax_adjustments_form
|
||||
#: model:ir.ui.menu,name:account.menu_action_tax_adjustment
|
||||
msgid "Tax Adjustments"
|
||||
msgstr "Belasting aanpassing"
|
||||
msgstr "BTW aanpassing"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_journal
|
||||
|
|
@ -9749,8 +9765,7 @@ msgid ""
|
|||
"Taxes, fiscal positions, chart of accounts & legal statements for your "
|
||||
"country"
|
||||
msgstr ""
|
||||
"Belastingen, fiscale posities, grootboekschema & legale afschriften voor"
|
||||
" uw land"
|
||||
"BTW, fiscale posities, grootboekschema & legale afschriften voor uw land"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_line_balance
|
||||
|
|
@ -9892,8 +9907,8 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
"Technisch veld gebruikt om de BTW kasbasis aflettering bij te houden. Dit is"
|
||||
|
|
@ -10273,7 +10288,7 @@ msgstr "De naam die gebruikt wordt voor de boekingen."
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_number_next
|
||||
msgid "The next sequence number will be used for the next credit note."
|
||||
msgstr "De volgende reeksnummer wordt gebruikt voor de volgende credit nota."
|
||||
msgstr "De volgende reeks wordt gebruikt voor de volgende creditfactuur."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_journal_sequence_number_next
|
||||
|
|
@ -10326,6 +10341,15 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "Het relatiekenmerk van deze factuur."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
"De relaties van het dagboek bedrijf en de gerelateerde bankrekeningen komen "
|
||||
"niet overeen."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10453,7 +10477,7 @@ msgstr "Er was een fout met het verwerken van deze pagina."
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "These taxes are set in any new product created."
|
||||
msgstr "Deze belastingen worden ingesteld in elk nieuw aangemaakt product."
|
||||
msgstr "Deze BTW worden ingesteld in elk nieuw aangemaakt product."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_account_template_user_type_id
|
||||
|
|
@ -10948,7 +10972,8 @@ msgstr ""
|
|||
#: model:ir.model.fields,help:account.field_account_invoice_amount_total_signed
|
||||
msgid ""
|
||||
"Total amount in the currency of the invoice, negative for credit notes."
|
||||
msgstr "Totaalbedrag in de valuta van de factuur, negatief bij creditnotas."
|
||||
msgstr ""
|
||||
"Totaalbedrag in de valuta van de factuur, negatief bij creditfacturen."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_res_partner_credit
|
||||
|
|
@ -11075,23 +11100,13 @@ msgstr "Soort"
|
|||
msgid "UP"
|
||||
msgstr "OMHOOG"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
"Het is niet mogelijk om BTW's te combineren welke staan ingesteld op "
|
||||
"inclusief BTW en welke de grondslag aanpassen maar dan exclusief BTW."
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr "Nog niet gedefinieerd"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr "Uitgekeerde winsten/verliezen"
|
||||
|
|
@ -11229,11 +11244,6 @@ msgstr "Gebruik kasbasis"
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr "Gebruik SEPA Auto Inacsso"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr "Gebruik SEPA betalingen"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -11289,8 +11299,8 @@ msgid ""
|
|||
" with the invoice. You will not be able to modify the credit note."
|
||||
msgstr ""
|
||||
"Gebruik deze optie indien u een factuur wilt annuleren, welke niet gemaakt had\n"
|
||||
" mogen worden. de creditnota wordt aangemaakt, goedgekeurd en afgeletterd\n"
|
||||
" met de factuur. U heeft niet de mogelijkheid om de creditnota te bewerken."
|
||||
" mogen worden. de creditfactuur wordt aangemaakt, goedgekeurd en afgeletterd\n"
|
||||
" met de factuur. U heeft niet de mogelijkheid om de creditfactuur te bewerken."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_account_type_include_initial_balance
|
||||
|
|
@ -11720,7 +11730,7 @@ msgstr ""
|
|||
"'Niveau')."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
|
|
@ -11729,7 +11739,7 @@ msgstr ""
|
|||
"datum gelijk of na de blokkeerdatum %s"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -11740,7 +11750,7 @@ msgstr ""
|
|||
"'Controller'"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
|
|
@ -11749,6 +11759,16 @@ msgstr ""
|
|||
"U kunt gedeeltelijk betaalde facturen niet annuleren. U dient de "
|
||||
"afgeletterde betaling eerst ongedaan te maken."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
"Het is niet mogelijk de valuta van het bedrijf te wijzigen omdat er al "
|
||||
"financiële boekingen zijn gemaakt."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11851,11 +11871,11 @@ msgstr "U kunt de bankrekening niet leegmaken als deze al is ingesteld."
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
"U kunt geen crediteuren- of debiteurenrekening hebben die niet af te "
|
||||
"letteren is. (Rekeningcode: %s)"
|
||||
"Het is niet mogelijk om een debiteuren/crediteuren rekening te hebben welke "
|
||||
"niet afletterbaar is. (grootboek: %s)"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
@ -11926,7 +11946,7 @@ msgid ""
|
|||
"You cannot validate an invoice with a negative total amount. You should "
|
||||
"create a credit note instead."
|
||||
msgstr ""
|
||||
"U kunt gen factuur bevestigen met een negatief totaalbedrag. U dient "
|
||||
"U kunt geen factuur bevestigen met een negatief totaalbedrag. U dient "
|
||||
"hiervoor een credit factuur aan te maken."
|
||||
|
||||
#. module: account
|
||||
|
|
@ -11958,7 +11978,7 @@ msgstr "U moet een startdatum ingeven."
|
|||
#: code:addons/account/models/account_invoice.py:1582
|
||||
#, python-format
|
||||
msgid "You must first select a partner!"
|
||||
msgstr "Gelieve eerst een klant te selecteren!"
|
||||
msgstr "U dient eerst een klant te selecteren!"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/wizard/account_report_aged_partner_balance.py:26
|
||||
|
|
@ -12325,4 +12345,4 @@ msgstr "wizard.multi.charts.accounts"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_bank_statement_form
|
||||
msgid "→ Count"
|
||||
msgstr "→ Tel"
|
||||
msgstr "→ Aantal"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -3,7 +3,7 @@
|
|||
# * account
|
||||
#
|
||||
# Translators:
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Viktor Pogrebniak <vp@aifil.ru>, 2017
|
||||
# Sergey Vilizhanin <sv@grimmette.ru>, 2017
|
||||
# Максим Дронь <dronmax@gmail.com>, 2017
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
# Artur Komishenko <Archi1792@gmail.com>, 2017
|
||||
# Mekan Bash <tmbashimov@gmail.com>, 2017
|
||||
# Русский «kolobok2048» Ивашка <kolobok2048@gmail.com>, 2017
|
||||
# Эдуард Манятовский <manyatovskiy@gmail.com>, 2017
|
||||
# Collex100, 2017
|
||||
# Gennady Marchenko <gennadym@gmail.com>, 2017
|
||||
# Max Belyanin <maxbelyanin@gmail.com>, 2017
|
||||
# Denis Baranov <baranov@itlibertas.com>, 2017
|
||||
|
|
@ -28,15 +28,21 @@
|
|||
# Alex Puchkov <ap@alteco.co>, 2017
|
||||
# Amaro Vita <vita.amaro@gmail.com>, 2017
|
||||
# KingOPl Slav <87slava13@gmail.com>, 2017
|
||||
# Andrey Skabelin <inactive+a.skabelin@transifex.com>, 2017
|
||||
# Andrey Skabelin, 2017
|
||||
# Doc Doc <vladkk94@gmail.com>, 2017
|
||||
# Артём Инжиянц <artem.inzhyyants@gmail.com>, 2017
|
||||
# Aidos Kakimzhanov <aidos.kakimzhan@gmail.com>, 2017
|
||||
# Dmitry sky <d.v.selitsky@gmail.com>, 2017
|
||||
# Yuriy Ney <k_wizard@mail.ru>, 2017
|
||||
# Yuriy Ney <kwizardn@gmail.com>, 2018
|
||||
# sergeiruzkiicode <sergei.ruzki@icode.by>, 2018
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"Last-Translator: Doc Doc <vladkk94@gmail.com>, 2017\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: sergeiruzkiicode <sergei.ruzki@icode.by>, 2018\n"
|
||||
"Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -121,12 +127,6 @@ msgstr "%s (Копия)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (копия)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr "&nbsp;"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -199,7 +199,7 @@ msgstr ": Пробный баланс"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -301,7 +301,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -344,6 +344,8 @@ msgid ""
|
|||
"<span class=\"label label-default\"><i class=\"fa fa-fw fa-check\"/><span "
|
||||
"class=\"hidden-xs\"> Paid</span></span>"
|
||||
msgstr ""
|
||||
"<span class=\"label label-default\"><i class=\"fa fa-fw fa-check\"/><span "
|
||||
"class=\"hidden-xs\">Оплачено</span></span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_my_invoices
|
||||
|
|
@ -351,6 +353,8 @@ msgid ""
|
|||
"<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/><span "
|
||||
"class=\"hidden-xs\"> Cancelled</span></span>"
|
||||
msgstr ""
|
||||
"<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/><span "
|
||||
"class=\"hidden-xs\">Отменено</span></span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_my_invoices
|
||||
|
|
@ -358,6 +362,8 @@ msgid ""
|
|||
"<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span "
|
||||
"class=\"hidden-xs\"> Waiting for Payment</span></span>"
|
||||
msgstr ""
|
||||
"<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span "
|
||||
"class=\"hidden-xs\">Ожидает оплаты</span></span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.partner_view_buttons
|
||||
|
|
@ -383,6 +389,11 @@ msgid ""
|
|||
" <span class=\"small\">> 200 contacts</span>\n"
|
||||
" </span>"
|
||||
msgstr ""
|
||||
"<span class=\"panel-title\">\n"
|
||||
" <span class=\"fa\" data-icon=\"\"/>\n"
|
||||
" <strong>Импорт</strong><br/>\n"
|
||||
" <span class=\"small\">> 200 контактов</span>\n"
|
||||
" </span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -393,6 +404,11 @@ msgid ""
|
|||
" <span class=\"small\">< 200 contacts</span>\n"
|
||||
" </span>"
|
||||
msgstr ""
|
||||
"<span class=\"panel-title\">\n"
|
||||
" <span class=\"fa\" data-icon=\"\"/>\n"
|
||||
" <strong> Создать вручную</strong><br/>\n"
|
||||
" <span class=\"small\">< 200 контактов</span>\n"
|
||||
" </span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -526,7 +542,7 @@ msgstr "<span>Получатель</span>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
|
||||
msgid "<span>Journal Entries</span>"
|
||||
msgstr ""
|
||||
msgstr "<span>Записи журнала</span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
|
||||
|
|
@ -561,7 +577,7 @@ msgstr "<span>Сверить</span>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
|
||||
msgid "<span>Reporting</span>"
|
||||
msgstr ""
|
||||
msgstr "<span>Отчетность</span>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
|
||||
|
|
@ -685,7 +701,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
msgid "<strong>Customer Address</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Адрес заказчика</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
|
|
@ -696,7 +712,7 @@ msgstr "<strong>Код заказчика:</strong>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Customer: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Заказчик: </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -754,12 +770,12 @@ msgstr "<strong>Расходы</strong>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
|
||||
msgid "<strong>Fiscal Year End</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Конец налогового года</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_tax
|
||||
msgid "<strong>From</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>От</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
|
|
@ -789,7 +805,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Memo: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Заметка.</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -822,17 +838,17 @@ msgstr "<strong>Партнёра:</strong>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Payment Amount: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Сумма платежа</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Payment Date: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Дата платежа</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Payment Method: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Метода платежа</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
|
||||
|
|
@ -851,7 +867,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_tax
|
||||
msgid "<strong>Purchase</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Закупка</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -993,7 +1009,7 @@ msgstr "<strong>Итого</strong>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_account_kanban
|
||||
msgid "<strong>Type: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Тип:</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -1005,12 +1021,12 @@ msgstr "<strong>Проверьте счёт</strong><br/> после ввода
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Vendor: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Продавец:</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_tax
|
||||
msgid "<strong>to </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>до </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
|
||||
|
|
@ -1030,19 +1046,19 @@ msgstr ""
|
|||
#: code:addons/account/models/account_bank_statement.py:383
|
||||
#, python-format
|
||||
msgid "A Cash transaction can't have a 0 amount."
|
||||
msgstr ""
|
||||
msgstr "Сумма наличной оплаты не может быть нулевой."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1731
|
||||
#, python-format
|
||||
msgid "A Payment Terms should have its last line of type Balance."
|
||||
msgstr ""
|
||||
msgstr "Последняя строка Условий Оплаты должна иметь тип Balance."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1734
|
||||
#, python-format
|
||||
msgid "A Payment Terms should have only one line of type Balance."
|
||||
msgstr ""
|
||||
msgstr "Только одна строка Условий Оплаты может иметь тип Balance."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:707
|
||||
|
|
@ -1118,6 +1134,9 @@ msgid ""
|
|||
"A rounding per line is advised if your prices are tax-included. That way, "
|
||||
"the sum of line subtotals equals the total with taxes."
|
||||
msgstr ""
|
||||
"Округление по строкам рекомендуется использовать, если ваши цены включают "
|
||||
"налоги. В этом случае, сумма подитогов по строке будет эквивалентна итогу, "
|
||||
"включающему налоги."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:880
|
||||
|
|
@ -1146,6 +1165,9 @@ msgid ""
|
|||
" bank accounts, checks), one purchase journal, one sales journal\n"
|
||||
" and one for miscellaneous information."
|
||||
msgstr ""
|
||||
"Типичная компания может иметь один журнал для методов оплаты(наличные\n"
|
||||
" банковский счёт, чеки), один журнал покупок, один журнал продаж\n"
|
||||
" и один для прочей информации."
|
||||
|
||||
#. module: account
|
||||
#: model:res.groups,name:account.group_warning_account
|
||||
|
|
@ -1251,7 +1273,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_group_tree
|
||||
msgid "Account Groups"
|
||||
msgstr ""
|
||||
msgstr "Группы Счетов"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_partner_bank_journal_id
|
||||
|
|
@ -1356,7 +1378,7 @@ msgstr "Тег счёта"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.account_tag_action
|
||||
msgid "Account Tags"
|
||||
msgstr ""
|
||||
msgstr "Тэги Счетов"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_tax_form
|
||||
|
|
@ -1513,11 +1535,12 @@ msgstr "Альтернативный счёт"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Бухгалтерский учёт"
|
||||
|
|
@ -1606,7 +1629,7 @@ msgstr "Действия"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Activate Other Currencies"
|
||||
msgstr ""
|
||||
msgstr "Активировать другие валюты"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -1753,7 +1776,7 @@ msgstr "Все проводки"
|
|||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_all_partner_invoices
|
||||
msgid "All Invoices"
|
||||
msgstr ""
|
||||
msgstr "Все Счета"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_all_lines_reconciled
|
||||
|
|
@ -1837,11 +1860,6 @@ msgstr "Необходимо обработать все строки отчёт
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Разрешить отмену проводок"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1884,6 +1902,7 @@ msgstr "Позволяет использовать аналитический
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -2092,7 +2111,7 @@ msgstr "Теги аналитики"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Analytics"
|
||||
msgstr ""
|
||||
msgstr "Аналитика"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_tax_exigible
|
||||
|
|
@ -2112,12 +2131,16 @@ 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."
|
||||
msgstr ""
|
||||
"Применить только если страна доставки или счёта на оплату соответствует "
|
||||
"группе."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2168,12 +2191,12 @@ msgstr "Связанные шаблоны счета"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_at_least_one_inbound
|
||||
msgid "At Least One Inbound"
|
||||
msgstr ""
|
||||
msgstr "Хотя бы один входящий"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_at_least_one_outbound
|
||||
msgid "At Least One Outbound"
|
||||
msgstr ""
|
||||
msgstr "Хотя бы один исходящий"
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
|
|
@ -2196,21 +2219,21 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "Automatic Import"
|
||||
msgstr ""
|
||||
msgstr "Автоматический импорт"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.financial.report,style_overwrite:0
|
||||
|
|
@ -2380,6 +2403,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr "Банковская выписка"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -2417,7 +2446,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_account_setup_bank_data_done
|
||||
msgid "Bank setup marked as done"
|
||||
msgstr ""
|
||||
msgstr "Настройка банка отмечена, как завершённая."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_statement_line_id
|
||||
|
|
@ -2607,7 +2636,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
msgid "CSV Import"
|
||||
msgstr ""
|
||||
msgstr "Импорт CSV"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_chart_template_visible
|
||||
|
|
@ -2924,6 +2953,8 @@ msgid ""
|
|||
"Check this box if you don't want to share the same sequence for invoices and"
|
||||
" credit notes made from this journal"
|
||||
msgstr ""
|
||||
"Установите это, если не хотите сквозную нумерацию счетов и кредитных авизо, "
|
||||
"относящихся к этому журналу "
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_journal_update_posted
|
||||
|
|
@ -3682,7 +3713,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_id
|
||||
msgid "Credit Note Entry Sequence"
|
||||
msgstr ""
|
||||
msgstr "Начальный номер кредитных авизо"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
|
||||
|
|
@ -3693,7 +3724,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_number_next
|
||||
msgid "Credit Notes: Next Number"
|
||||
msgstr ""
|
||||
msgstr "Последующий номер кредитного авизо"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_credit_account_id
|
||||
|
|
@ -3938,6 +3969,28 @@ msgstr "Дня(ей) после даты выставления счет-фак
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Здравствуйте!\n"
|
||||
"\n"
|
||||
"Согласно нашим данным, у Вас есть неоплаченные счета от нашей компании. Подробности указаны в данном письме.\n"
|
||||
"Если сумма уже оплачена, просто проигнорируйте это оповещение. В противном случае, пожалуйста, произведите указанные платежи.\n"
|
||||
"Если у Вас есть какие-либо замечания, пожалуйста, свяжитесь с нами.\n"
|
||||
"\n"
|
||||
"Благодарим за сотрудничество.\n"
|
||||
"С наилучшими пожеланиями,"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -3986,7 +4039,7 @@ msgstr "декабрём"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence
|
||||
msgid "Dedicated Credit Note Sequence"
|
||||
msgstr ""
|
||||
msgstr "Назначенная нумерация для кредитных обязательств"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_default_credit_account_id
|
||||
|
|
@ -4431,11 +4484,6 @@ msgstr "Мастер составления эл. писем"
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Разрешить сравнение"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr "Включить управление напоминаниями о платежах"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4744,13 +4792,13 @@ msgstr "Учетный год"
|
|||
#: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_day
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_day
|
||||
msgid "Fiscalyear Last Day"
|
||||
msgstr ""
|
||||
msgstr "Последний день налогового года"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_financial_year_op_fiscalyear_last_month
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_last_month
|
||||
msgid "Fiscalyear Last Month"
|
||||
msgstr ""
|
||||
msgstr "Последний месяц налогового года"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.reconcile.model,amount_type:0
|
||||
|
|
@ -4790,7 +4838,7 @@ msgid "Follow-up"
|
|||
msgstr "Напоминание"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr "Уровни напоминаний"
|
||||
|
||||
|
|
@ -4901,7 +4949,7 @@ msgstr "Будущее"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
msgid "Future Activities"
|
||||
msgstr ""
|
||||
msgstr "Будущие действия"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
|
|
@ -5721,12 +5769,6 @@ msgstr ""
|
|||
msgid "Invoice paid"
|
||||
msgstr "Счет оплачен"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Счет отправлен"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5803,6 +5845,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Выставление счёта"
|
||||
|
|
@ -6085,6 +6128,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Журналы"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6103,12 +6153,12 @@ msgstr "Обоснование"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_kanban_dashboard
|
||||
msgid "Kanban Dashboard"
|
||||
msgstr ""
|
||||
msgstr "Канбан Доска"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_journal_kanban_dashboard_graph
|
||||
msgid "Kanban Dashboard Graph"
|
||||
msgstr ""
|
||||
msgstr "График Канбан Доски"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_journal_form
|
||||
|
|
@ -6411,7 +6461,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
msgid "Late Activities"
|
||||
msgstr ""
|
||||
msgstr "Действия с опозданием"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_last_time_entries_checked
|
||||
|
|
@ -6495,7 +6545,7 @@ msgstr "Судебный спор"
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:29
|
||||
#, python-format
|
||||
msgid "Load more"
|
||||
msgstr ""
|
||||
msgstr "Загрузить еще"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_company_fiscalyear_lock_date
|
||||
|
|
@ -6623,8 +6673,11 @@ 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"
|
||||
"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 ""
|
||||
"Вручную: Оплачено наличными, чеком или любым другим способом вне Odoo.\n"
|
||||
"Электронно: Оплачено автоматически с помощью платёжного агента, путём запроса перевода с карты, сохранённой покупателем при приобретении или подписке онлайн (признак оплаты).\n"
|
||||
"Пакетное списание: Объединяет чеки нескольких покупателей за раз, генерируя пакетное списание для отправки в ваш банк. Когда расшифровывается выписка банка в Odoo, вам предлагается сопоставить перевод с пакетным списанием. Задействуйте эту возможность в Настройки."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_id
|
||||
|
|
@ -6634,7 +6687,7 @@ 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 ""
|
||||
|
||||
|
|
@ -6645,6 +6698,9 @@ msgid ""
|
|||
"Check:Pay bill by check and print it from Odoo.\n"
|
||||
"SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. Enable this option from the settings."
|
||||
msgstr ""
|
||||
"Вручную: Счет на оплату оплачен наличными ил любым другим способом вне Odoo.\n"
|
||||
"Чек: Счет на оплату оплачен чеком и распечатан из Odoo.\n"
|
||||
"Перевод SEPA: Счет на оплату оплачен через файл перевода SEPA, направленный в ваш банк. Задействуйте эту возможность в Настройках."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -6666,7 +6722,7 @@ msgstr ""
|
|||
#: model:ir.ui.view,arch_db:account.setup_financial_year_opening_form
|
||||
#: model:ir.ui.view,arch_db:account.setup_view_company_form
|
||||
msgid "Mark as done"
|
||||
msgstr ""
|
||||
msgstr "Отметить сделанным"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.payment,payment_difference_handling:0
|
||||
|
|
@ -6865,7 +6921,7 @@ msgstr "Мультивалютность"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
msgid "My Activities"
|
||||
msgstr ""
|
||||
msgstr "Моя деятельность"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
|
||||
|
|
@ -6979,13 +7035,6 @@ msgstr "Никакой соответствующий способ оплаты
|
|||
msgid "No detail"
|
||||
msgstr "Нет информации"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7939,6 +7988,14 @@ msgstr "Пожалуйста, определите нумерацию журна
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr "Пожалуйста, определите нумерацию в журнале, связанном с этим счетом."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -8065,6 +8122,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -8083,7 +8141,7 @@ msgstr "Категория продукта"
|
|||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_image
|
||||
msgid "Product Image"
|
||||
msgstr ""
|
||||
msgstr "Изображения продукта "
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_qty
|
||||
|
|
@ -8133,7 +8191,7 @@ msgstr "Прибыли и убытки"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8379,7 +8437,7 @@ msgid "Ref."
|
|||
msgstr "Ссыл."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8668,7 +8726,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8691,13 +8749,6 @@ msgstr "Продажа"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Налог с Продаж"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "Журнал продаж/покупок"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -8721,7 +8772,7 @@ msgstr "Налог с Продаж(%)"
|
|||
#: code:addons/account/models/account_journal_dashboard.py:33
|
||||
#, python-format
|
||||
msgid "Sales: Untaxed Total"
|
||||
msgstr ""
|
||||
msgstr "Продажи: всего без учета налогов"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_user_id
|
||||
|
|
@ -8979,7 +9030,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_journal_active
|
||||
msgid "Set active to false to hide the Journal without removing it."
|
||||
msgstr ""
|
||||
msgstr "Переключите \"активный\" в \"ЛОЖЬ\", для сокрытия Журнала без его удаления"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_tax_active
|
||||
|
|
@ -9191,7 +9242,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9599,6 +9650,8 @@ msgstr "Техническое поле используется в методе
|
|||
#: model:ir.model.fields,help:account.field_account_journal_account_setup_bank_data_done
|
||||
msgid "Technical field used in the special view for the setup bar step."
|
||||
msgstr ""
|
||||
"Техническое поле, используемое в специальном представлении для шага "
|
||||
"установки панели"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_abstract_payment_payment_method_code
|
||||
|
|
@ -9631,13 +9684,13 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
"Техническое поле, используемое для отслеживания выравнивания налоговой "
|
||||
"кассовой базы. Это необходимо при отмене источника: он будет публиковать "
|
||||
"обратную запись в журнале, чтобы отменить эту часть."
|
||||
"Технические поле используется для отслеживания согласования налога на "
|
||||
"наличной основе. Это необходимо при отмене источника: он будет размещать "
|
||||
"обратную запись в журнале, чтобы отменить эту часть тоже."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_line_tax_exigible
|
||||
|
|
@ -9958,6 +10011,8 @@ msgstr ""
|
|||
msgid ""
|
||||
"The last day of the month will be taken if the chosen day doesn't exist."
|
||||
msgstr ""
|
||||
"Если указанная дата не существует, будет взят последний день выбранного "
|
||||
"месяца."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_payment_term_form
|
||||
|
|
@ -9994,11 +10049,13 @@ msgstr "Наименование которое будет использова
|
|||
#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_number_next
|
||||
msgid "The next sequence number will be used for the next credit note."
|
||||
msgstr ""
|
||||
"Последующий номер будет использован для нумерации следующего кредитного "
|
||||
"авизо"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_journal_sequence_number_next
|
||||
msgid "The next sequence number will be used for the next invoice."
|
||||
msgstr ""
|
||||
msgstr "Последующий номер будет использован для нумерации следующего счета"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_bank_statement_line_currency_id
|
||||
|
|
@ -10046,6 +10103,13 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "Ссылка на партнера в этом счете"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10165,7 +10229,7 @@ msgstr "Нет документов для сверки"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_error
|
||||
msgid "There was an error processing this page."
|
||||
msgstr ""
|
||||
msgstr "При обработке страницы произошла ошибка"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
|
|
@ -10306,6 +10370,8 @@ msgid ""
|
|||
"This field contains the information related to the numbering of the credit "
|
||||
"note entries of this journal."
|
||||
msgstr ""
|
||||
"Это поле содержит информацию о нумерации записей о кредитных авизо в этом "
|
||||
"журнале"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_journal_sequence_id
|
||||
|
|
@ -10772,21 +10838,13 @@ msgstr "Тип"
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr "Нераспределенная Прибыль/Убытки"
|
||||
|
|
@ -10924,11 +10982,6 @@ msgstr "Использовать Наличную Основу"
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr "Использовать SEPA Платежи"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -11112,7 +11165,7 @@ msgstr "Счет от поставщика"
|
|||
#: code:addons/account/models/account_invoice.py:442
|
||||
#, python-format
|
||||
msgid "Vendor Bill - %s"
|
||||
msgstr ""
|
||||
msgstr "Счет от поставщика - %s"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/chart_template.py:189
|
||||
|
|
@ -11131,25 +11184,25 @@ msgstr "Счета от поставщиков"
|
|||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
#, python-format
|
||||
msgid "Vendor Credit Note"
|
||||
msgstr ""
|
||||
msgstr "Кредитное обязательство поставщика"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:444
|
||||
#, python-format
|
||||
msgid "Vendor Credit Note - %s"
|
||||
msgstr ""
|
||||
msgstr "Кредитное обязательство поставщика - %s"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_invoice_in_refund
|
||||
#: model:ir.ui.menu,name:account.menu_action_invoice_in_refund
|
||||
msgid "Vendor Credit Notes"
|
||||
msgstr ""
|
||||
msgstr "Кредитное обязательство поставщика"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1229
|
||||
#, python-format
|
||||
msgid "Vendor Credit note"
|
||||
msgstr ""
|
||||
msgstr "Кредитное обязательство поставщика"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -11413,14 +11466,14 @@ msgstr ""
|
|||
" иерархии финансовых отчетов (автоматически вычисляемое поле 'уровень')."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
msgstr "Нельзя добавлять/изменять записи до и включительно даты блокировки %s"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -11431,7 +11484,7 @@ msgstr ""
|
|||
"'Консультант'"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
|
|
@ -11440,6 +11493,14 @@ msgstr ""
|
|||
"Вы не можете отменить счет, который частично оплачен. Сначала надо отменить "
|
||||
"сверку связанных записей."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11534,11 +11595,9 @@ msgstr ""
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
"Вы не может иметь счёт дебиторской/кредиторской задолженности, который не "
|
||||
"является возвратным. (код учетной записи: %s)"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -3,15 +3,15 @@
|
|||
# * account
|
||||
#
|
||||
# Translators:
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Slobodan Simić <slsimic@gmail.com>, 2017
|
||||
# Đorđe Cvijanović <cdorde@gmail.com>, 2017
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: Đorđe Cvijanović <cdorde@gmail.com>, 2017\n"
|
||||
"Language-Team: Serbian (https://www.transifex.com/odoo/teams/41243/sr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
|
@ -92,12 +92,6 @@ msgstr ""
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (копија)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -170,7 +164,7 @@ msgstr ""
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -272,7 +266,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -1398,11 +1392,12 @@ msgstr ""
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Рачуноводство"
|
||||
|
|
@ -1712,11 +1707,6 @@ msgstr ""
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Dozvoli storniranje stavki"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1759,6 +1749,7 @@ msgstr ""
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -1979,10 +1970,14 @@ 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."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2061,14 +2056,14 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2245,6 +2240,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr "Bankovni izveštaj"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -3778,6 +3779,20 @@ msgstr ""
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4264,11 +4279,6 @@ msgstr ""
|
|||
msgid "Enable Comparison"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4616,7 +4626,7 @@ msgid "Follow-up"
|
|||
msgstr "Pracenje"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5489,12 +5499,6 @@ msgstr ""
|
|||
msgid "Invoice paid"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5569,6 +5573,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Fakturisanje"
|
||||
|
|
@ -5837,6 +5842,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Dnevnici"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6362,7 +6374,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"
|
||||
"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
|
||||
|
|
@ -6373,7 +6385,7 @@ 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 ""
|
||||
|
||||
|
|
@ -6716,13 +6728,6 @@ msgstr ""
|
|||
msgid "No detail"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7636,6 +7641,14 @@ msgstr ""
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -7759,6 +7772,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -7827,7 +7841,7 @@ msgstr ""
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8073,7 +8087,7 @@ msgid "Ref."
|
|||
msgstr "Ref."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8354,7 +8368,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8377,13 +8391,6 @@ msgstr "Prodaja"
|
|||
msgid "Sale Tax"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -8860,7 +8867,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9282,8 +9289,8 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9656,6 +9663,13 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "Partnerova refenerenca ovog racuna"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10309,21 +10323,13 @@ msgstr "Tip"
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr ""
|
||||
|
|
@ -10459,11 +10465,6 @@ msgstr ""
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -10906,14 +10907,14 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -10921,13 +10922,21 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
"unreconcile related payment entries first."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11009,7 +11018,7 @@ msgstr ""
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -4,17 +4,18 @@
|
|||
#
|
||||
# Translators:
|
||||
# Nemanja Dragovic <nemanjadragovic94@gmail.com>, 2017
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Djordje Marjanovic <djordje_m@yahoo.com>, 2017
|
||||
# Ljubisa Jovev <ljubisa.jovev@gmail.com>, 2017
|
||||
# Đorđe Cvijanović <cdorde@gmail.com>, 2017
|
||||
# Dragan Vukosavljevic <dragan.vukosavljevic@gmail.com>, 2018
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"Last-Translator: Đorđe Cvijanović <cdorde@gmail.com>, 2017\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: Dragan Vukosavljevic <dragan.vukosavljevic@gmail.com>, 2018\n"
|
||||
"Language-Team: Serbian (Latin) (https://www.transifex.com/odoo/teams/41243/sr%40latin/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -94,12 +95,6 @@ msgstr "%s (Kopija)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (kopija)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -172,7 +167,7 @@ msgstr ": Bruto bilans"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -274,7 +269,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -1418,11 +1413,12 @@ msgstr "Konto koji ce se koristiti"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Računovodstvo"
|
||||
|
|
@ -1734,11 +1730,6 @@ msgstr "Sve stavke knjiženja moraju biti obrađene da bi se zatvorio izvod."
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Dozvoli poništavanje unosa"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1781,6 +1772,7 @@ msgstr "Omogućava ti korištenje analitičkog računovodstva."
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -2000,10 +1992,14 @@ 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."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2082,14 +2078,14 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2266,6 +2262,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr "Bankovni izvod"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -3798,6 +3800,20 @@ msgstr "Dan(a) nakon fakturisanja"
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4287,11 +4303,6 @@ msgstr ""
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Omogući poređenje"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4639,7 +4650,7 @@ msgid "Follow-up"
|
|||
msgstr "Praćenje"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5523,12 +5534,6 @@ msgstr ""
|
|||
msgid "Invoice paid"
|
||||
msgstr "Faktura plaćena"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Faktura poslata"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5603,6 +5608,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Fakturisanje"
|
||||
|
|
@ -5873,6 +5879,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Dnevnici"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6398,7 +6411,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"
|
||||
"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
|
||||
|
|
@ -6409,7 +6422,7 @@ 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 ""
|
||||
|
||||
|
|
@ -6752,13 +6765,6 @@ msgstr "Ne postoji prikladan način plaćanja omogućen na ovom dnevniku %s"
|
|||
msgid "No detail"
|
||||
msgstr "Bez detalja"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7677,6 +7683,14 @@ msgid "Please define sequence on the journal related to this invoice."
|
|||
msgstr ""
|
||||
"Molimo, označite brojevni krug za dnevnik u kojem se nalazi ova faktura."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -7801,6 +7815,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -7869,7 +7884,7 @@ msgstr "Bilans uspjeha"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8115,7 +8130,7 @@ msgid "Ref."
|
|||
msgstr "Oznaka"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8396,7 +8411,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8419,13 +8434,6 @@ msgstr "Prodaja"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Prodajni porez"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -8902,7 +8910,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9324,8 +9332,8 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9705,6 +9713,13 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10368,21 +10383,13 @@ msgstr "Tip"
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr "Nerasporedjena dobit/trošak"
|
||||
|
|
@ -10518,11 +10525,6 @@ msgstr ""
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -10967,14 +10969,14 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -10982,13 +10984,21 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
"unreconcile related payment entries first."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11072,7 +11082,7 @@ msgstr ""
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -11444,7 +11454,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_res_config_settings
|
||||
msgid "res.config.settings"
|
||||
msgstr ""
|
||||
msgstr "res.config.settings"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:236
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# Translators:
|
||||
# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2017
|
||||
# Anders Wallenquist <anders.wallenquist@vertel.se>, 2017
|
||||
# Martin Trigaux <mat@odoo.com>, 2017
|
||||
# Martin Trigaux, 2017
|
||||
# Martin Wilderoth <martin.wilderoth@linserv.se>, 2017
|
||||
# lasch a <bmail440@gmail.com>, 2017
|
||||
# lynnliuying <lynn.liu1971@gmail.com>, 2017
|
||||
|
|
@ -21,15 +21,15 @@
|
|||
# Kim Asplund <kim.asplund@gmail.com>, 2017
|
||||
# Robert Frykelius <robert.frykelius@linserv.se>, 2017
|
||||
# Zou Haojun <haojunzou84@gmail.com>, 2017
|
||||
# Frida E <frida.eddestal@gmail.com>, 2017
|
||||
# Lord Cobol <mattias@invaliddesign.com>, 2017
|
||||
# Frida E, 2017
|
||||
# Lord Cobol, 2017
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-10-24 08:59+0000\n"
|
||||
"PO-Revision-Date: 2017-10-24 08:59+0000\n"
|
||||
"Last-Translator: Lord Cobol <mattias@invaliddesign.com>, 2017\n"
|
||||
"POT-Creation-Date: 2018-03-12 15:37+0000\n"
|
||||
"PO-Revision-Date: 2018-03-12 15:37+0000\n"
|
||||
"Last-Translator: Lord Cobol, 2017\n"
|
||||
"Language-Team: Swedish (https://www.transifex.com/odoo/teams/41243/sv/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -114,12 +114,6 @@ msgstr "%s (Kopia)"
|
|||
msgid "%s (copy)"
|
||||
msgstr "%s (kopia)"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.portal_invoice_report
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_invoice_document
|
||||
msgid "&nbsp;<span>on</span>"
|
||||
|
|
@ -192,7 +186,7 @@ msgstr ": Råbalans"
|
|||
msgid ""
|
||||
"<?xml version=\"1.0\"?>\n"
|
||||
"<data><p>Dear ${object.partner_id.name},</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${format_amount(object.amount, object.currency_id)}</strong> from ${object.company_id.name}.</p>\n"
|
||||
"<p>If you have any questions, please do not hesitate to contact us.</p>\n"
|
||||
"<p>Best regards,\n"
|
||||
"% if user and user.signature:\n"
|
||||
|
|
@ -294,7 +288,7 @@ msgid ""
|
|||
"% if object.origin:\n"
|
||||
"(with reference: ${object.origin})\n"
|
||||
"% endif\n"
|
||||
"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
|
||||
"amounting in <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
|
||||
"from ${object.company_id.name}.\n"
|
||||
"</p>\n"
|
||||
"\n"
|
||||
|
|
@ -681,7 +675,7 @@ msgstr "<strong>Kundkod:</strong>"
|
|||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_payment_receipt
|
||||
msgid "<strong>Customer: </strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Kund: </strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -933,7 +927,7 @@ msgstr "<strong>Delsumma</strong>"
|
|||
#: model:ir.ui.view,arch_db:account.report_partnerledger
|
||||
#: model:ir.ui.view,arch_db:account.report_trialbalance
|
||||
msgid "<strong>Target Moves:</strong>"
|
||||
msgstr ""
|
||||
msgstr "<strong>Valda affärshändelser:</strong>"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
|
|
@ -1463,11 +1457,12 @@ msgstr "Konto som ska användas istället"
|
|||
#: 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 "
|
||||
"Account used as counterpart for the journal entry, for taxes eligible based "
|
||||
"on payments."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
|
||||
#: model:ir.ui.menu,name:account.account_account_menu
|
||||
msgid "Accounting"
|
||||
msgstr "Redovisning"
|
||||
|
|
@ -1782,11 +1777,6 @@ msgstr ""
|
|||
msgid "Allow Cancelling Entries"
|
||||
msgstr "Tillåt makulering av verifikat"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Allow Currency Rate Live"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_account_template_reconcile
|
||||
msgid "Allow Invoices & payments Matching"
|
||||
|
|
@ -1829,6 +1819,7 @@ msgstr "Aktiverar objektredovisningen"
|
|||
#: code:addons/account/static/src/xml/account_reconciliation.xml:252
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount_total
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_amount
|
||||
|
|
@ -2049,10 +2040,14 @@ msgstr "Tillämpa denna skatterregion automatiskt ."
|
|||
|
||||
#. 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."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
|
||||
msgid "Apply only if delivery or invoicing country match the group."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
|
||||
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
|
||||
|
|
@ -2131,14 +2126,14 @@ msgid "Automated Entries"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:349
|
||||
#: code:addons/account/models/company.py:354
|
||||
#: code:addons/account/wizard/setup_wizards.py:79
|
||||
#, python-format
|
||||
msgid "Automatic Balancing Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_currency_rate_live
|
||||
msgid "Automatic Currency Rates"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2315,6 +2310,12 @@ msgstr ""
|
|||
msgid "Bank Statement"
|
||||
msgstr "Bankutdrag"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_bank_statement.py:935
|
||||
#, python-format
|
||||
msgid "Bank Statement %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
|
|
@ -3855,6 +3856,23 @@ msgstr ""
|
|||
msgid "Deactivate setup bar on the dashboard"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:43
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Dear Sir/Madam,\n"
|
||||
"\n"
|
||||
"Our records indicate that some payments on your account are still due. Please find details below.\n"
|
||||
"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
|
||||
"If you have any queries regarding your account, Please contact us.\n"
|
||||
"\n"
|
||||
"Thank you in advance for your cooperation.\n"
|
||||
"Best Regards,"
|
||||
msgstr ""
|
||||
"Hej,\n"
|
||||
"\n"
|
||||
"Enligt våra noteringar finns det fortfarande utestående fordringar, se nedan. Vänligen bortse från detta meddelande om ni redan har betalat. Annars ber vi er skicka betalningen snarast. Tveka inte att kontakta oss om det finns några frågor."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
|
||||
#: model:ir.ui.view,arch_db:account.report_financial
|
||||
|
|
@ -4341,11 +4359,6 @@ msgstr "E-postredigeringsguide"
|
|||
msgid "Enable Comparison"
|
||||
msgstr "Aktivera jämförelse"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Enable payment followup management"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.account_planner
|
||||
msgid "End"
|
||||
|
|
@ -4696,7 +4709,7 @@ msgid "Follow-up"
|
|||
msgstr "Uppföljning"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_reports_followup
|
||||
msgid "Follow-up Levels"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4726,6 +4739,8 @@ msgid ""
|
|||
"For the Odoo Team,<br/>\n"
|
||||
" Fabien Pinckaers, Founder"
|
||||
msgstr ""
|
||||
"För Odoo-teamet,<br/>\n"
|
||||
" Fabien Pinckaers, grundare"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_account_currency_id
|
||||
|
|
@ -5587,12 +5602,6 @@ msgstr ""
|
|||
msgid "Invoice paid"
|
||||
msgstr "Faktura betald"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1825
|
||||
#, python-format
|
||||
msgid "Invoice sent"
|
||||
msgstr "Faktura skickad"
|
||||
|
||||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
|
|
@ -5669,6 +5678,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance
|
||||
#: model:ir.ui.view,arch_db:account.product_template_form_view
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.ui.view,arch_db:account.view_partner_property_form
|
||||
msgid "Invoicing"
|
||||
msgstr "Fakturering"
|
||||
|
|
@ -5946,6 +5956,13 @@ msgstr ""
|
|||
msgid "Journals"
|
||||
msgstr "Journaler"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Journals Audit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:res.company,fiscalyear_last_month:0
|
||||
msgid "July"
|
||||
|
|
@ -6473,7 +6490,7 @@ msgstr "Manuell avstämning"
|
|||
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
|
||||
|
|
@ -6484,7 +6501,7 @@ 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 ""
|
||||
|
||||
|
|
@ -6830,13 +6847,6 @@ msgstr ""
|
|||
msgid "No detail"
|
||||
msgstr "Inga detaljer"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:274
|
||||
#, python-format
|
||||
msgid ""
|
||||
"No miscellanous journal could be found. Please create one before proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:116
|
||||
#, python-format
|
||||
|
|
@ -7756,6 +7766,14 @@ msgstr ""
|
|||
msgid "Please define sequence on the journal related to this invoice."
|
||||
msgstr "Vänligen definiera ordningen på journalen knuten till fakturan."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:273
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Please install a chart of accounts or create a miscellaneous journal before "
|
||||
"proceeding."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.view_account_form
|
||||
msgid "Plus Bank"
|
||||
|
|
@ -7879,6 +7897,7 @@ msgid "Print checks to pay your vendors"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_product_product
|
||||
#: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id
|
||||
|
|
@ -7947,7 +7966,7 @@ msgstr "Resultaträkning"
|
|||
#: code:addons/account/models/account_payment.py:135
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Programmation error: wizard action executed without active_ids in context."
|
||||
"Programming error: wizard action executed without active_ids in context."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
|
|
@ -8193,7 +8212,7 @@ msgid "Ref."
|
|||
msgstr "Ref."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:72
|
||||
#: code:addons/account/controllers/portal.py:74
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
|
||||
|
|
@ -8474,7 +8493,7 @@ msgid "Rounding Tree"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "SEPA Credit Transfer (SCT)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8497,13 +8516,6 @@ msgstr "Försäljning"
|
|||
msgid "Sale Tax"
|
||||
msgstr "Försäljningsmoms"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
|
||||
#: model:ir.actions.report,name:account.action_report_journal
|
||||
#: model:ir.ui.menu,name:account.menu_print_journal
|
||||
msgid "Sale/Purchase Journal"
|
||||
msgstr "Sälj-/inköpsjournal"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,type_tax_use:0
|
||||
#: selection:account.tax.template,type_tax_use:0
|
||||
|
|
@ -8983,7 +8995,7 @@ msgid "States Count"
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/controllers/portal.py:73
|
||||
#: code:addons/account/controllers/portal.py:75
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
|
||||
#: model:ir.model.fields,field_description:account.field_account_invoice_state
|
||||
|
|
@ -9405,8 +9417,8 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model.fields,help:account.field_account_move_tax_cash_basis_rec_id
|
||||
msgid ""
|
||||
"Technical field used to keep track of the tax cash basis reconciliation.This"
|
||||
" is needed when cancelling the source: it will post the inverse journal "
|
||||
"Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal "
|
||||
"entry to cancel that part too."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -9792,6 +9804,13 @@ msgstr ""
|
|||
msgid "The partner reference of this invoice."
|
||||
msgstr "Företagsreferens för denna faktura"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:522
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The partners of the journal's company and the related bank account mismatch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_payment.py:60
|
||||
#, python-format
|
||||
|
|
@ -10469,21 +10488,13 @@ msgstr "Typ"
|
|||
msgid "UP"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:944
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Unable to mix any taxes being price included with taxes affecting the base "
|
||||
"amount but not included in price."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.journal,bank_statements_source:0
|
||||
msgid "Undefined Yet"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:304
|
||||
#: code:addons/account/models/company.py:305
|
||||
#, python-format
|
||||
msgid "Undistributed Profits/Losses"
|
||||
msgstr "Outdeladvinst / förlust"
|
||||
|
|
@ -10619,11 +10630,6 @@ msgstr ""
|
|||
msgid "Use SEPA Direct Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_sepa
|
||||
msgid "Use SEPA payments"
|
||||
msgstr "Använd SEPA-betalningar"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id
|
||||
msgid "Use Specific Journal"
|
||||
|
|
@ -11073,14 +11079,14 @@ msgstr ""
|
|||
"den finansiella rapporthierarkin (auto-beräknade fältet \"nivå\")."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:207
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_move.py:209
|
||||
#: code:addons/account/models/account_move.py:211
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot add/modify entries prior to and inclusive of the lock date %s. "
|
||||
|
|
@ -11088,13 +11094,21 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account_invoice.py:1208
|
||||
#: code:addons/account/models/account_invoice.py:1193
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot cancel an invoice which is partially paid. You need to "
|
||||
"unreconcile related payment entries first."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/company.py:143
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot change the currency of the company since some journal items "
|
||||
"already exist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/models/account.py:235
|
||||
#, python-format
|
||||
|
|
@ -11178,7 +11192,7 @@ msgstr ""
|
|||
#: code:addons/account/models/account.py:55
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You cannot have a receivable/payable account that is not reconciliable. "
|
||||
"You cannot have a receivable/payable account that is not reconcilable. "
|
||||
"(account code: %s)"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -4,7 +4,7 @@ import time
|
|||
import math
|
||||
|
||||
from odoo.osv import expression
|
||||
from odoo.tools.float_utils import float_round as round, float_is_zero as is_zero
|
||||
from odoo.tools.float_utils import float_round as round
|
||||
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
|
||||
from odoo.exceptions import UserError, ValidationError
|
||||
from odoo import api, fields, models, _
|
||||
|
|
@ -378,7 +378,7 @@ class AccountJournal(models.Model):
|
|||
belongs_to_company = fields.Boolean('Belong to the user\'s current company', compute="_belong_to_company", search="_search_company_journals",)
|
||||
|
||||
# Bank journals fields
|
||||
bank_account_id = fields.Many2one('res.partner.bank', string="Bank Account", ondelete='restrict', copy=False, domain="[('partner_id','=', company_id)]")
|
||||
bank_account_id = fields.Many2one('res.partner.bank', string="Bank Account", ondelete='restrict', copy=False)
|
||||
bank_statements_source = fields.Selection([('undefined', 'Undefined Yet'),('manual', 'Record Manually')], string='Bank Feeds', default='undefined')
|
||||
bank_acc_number = fields.Char(related='bank_account_id.acc_number')
|
||||
bank_id = fields.Many2one('res.bank', related='bank_account_id.bank_id')
|
||||
|
|
@ -409,7 +409,7 @@ class AccountJournal(models.Model):
|
|||
for journal in self:
|
||||
if journal.sequence_id and journal.sequence_number_next:
|
||||
sequence = journal.sequence_id._get_current_sequence()
|
||||
sequence.number_next = journal.sequence_number_next
|
||||
sequence.sudo().number_next = journal.sequence_number_next
|
||||
|
||||
@api.multi
|
||||
# do not depend on 'refund_sequence_id.date_range_ids', because
|
||||
|
|
@ -488,9 +488,16 @@ class AccountJournal(models.Model):
|
|||
@api.multi
|
||||
def write(self, vals):
|
||||
for journal in self:
|
||||
company = journal.company_id
|
||||
if ('company_id' in vals and journal.company_id.id != vals['company_id']):
|
||||
if self.env['account.move'].search([('journal_id', 'in', self.ids)], limit=1):
|
||||
raise UserError(_('This journal already contains items, therefore you cannot modify its company.'))
|
||||
company = self.env['res.company'].browse(vals['company_id'])
|
||||
if self.bank_account_id.company_id and self.bank_account_id.company_id != company:
|
||||
self.bank_account_id.write({
|
||||
'company_id': company.id,
|
||||
'partner_id': company.partner_id.id,
|
||||
})
|
||||
if ('code' in vals and journal.code != vals['code']):
|
||||
if self.env['account.move'].search([('journal_id', 'in', self.ids)], limit=1):
|
||||
raise UserError(_('This journal already contains items, therefore you cannot modify its short name.'))
|
||||
|
|
@ -504,8 +511,16 @@ class AccountJournal(models.Model):
|
|||
self.default_debit_account_id.currency_id = vals['currency_id']
|
||||
if not 'default_credit_account_id' in vals and self.default_credit_account_id:
|
||||
self.default_credit_account_id.currency_id = vals['currency_id']
|
||||
if 'bank_account_id' in vals and not vals.get('bank_account_id'):
|
||||
raise UserError(_('You cannot empty the bank account once set.'))
|
||||
if self.bank_account_id:
|
||||
self.bank_account_id.currency_id = vals['currency_id']
|
||||
if 'bank_account_id' in vals:
|
||||
if not vals.get('bank_account_id'):
|
||||
raise UserError(_('You cannot empty the bank account once set.'))
|
||||
else:
|
||||
bank_account = self.env['res.partner.bank'].browse(vals['bank_account_id'])
|
||||
if bank_account.partner_id != company.partner_id:
|
||||
raise UserError(_("The partners of the journal's company and the related bank account mismatch."))
|
||||
|
||||
result = super(AccountJournal, self).write(vals)
|
||||
|
||||
# Create the bank_account_id if necessary
|
||||
|
|
@ -721,7 +736,7 @@ class AccountTaxGroup(models.Model):
|
|||
class AccountTax(models.Model):
|
||||
_name = 'account.tax'
|
||||
_description = 'Tax'
|
||||
_order = 'sequence'
|
||||
_order = 'sequence,id'
|
||||
|
||||
@api.model
|
||||
def _default_tax_group(self):
|
||||
|
|
@ -848,7 +863,6 @@ class AccountTax(models.Model):
|
|||
price_unit * quantity eventually affected by previous taxes (if tax is include_base_amount XOR price_include)
|
||||
"""
|
||||
self.ensure_one()
|
||||
price_include = self._context.get('force_price_include', self.price_include)
|
||||
if self.amount_type == 'fixed':
|
||||
# Use copysign to take into account the sign of the base amount which includes the sign
|
||||
# of the quantity and the sign of the price_unit
|
||||
|
|
@ -862,11 +876,11 @@ class AccountTax(models.Model):
|
|||
return math.copysign(quantity, base_amount) * self.amount
|
||||
else:
|
||||
return quantity * self.amount
|
||||
if (self.amount_type == 'percent' and not price_include) or (self.amount_type == 'division' and self.price_include):
|
||||
if (self.amount_type == 'percent' and not self.price_include) or (self.amount_type == 'division' and self.price_include):
|
||||
return base_amount * self.amount / 100
|
||||
if self.amount_type == 'percent' and price_include:
|
||||
if self.amount_type == 'percent' and self.price_include:
|
||||
return base_amount - (base_amount / (1 + self.amount / 100))
|
||||
if self.amount_type == 'division' and not price_include:
|
||||
if self.amount_type == 'division' and not self.price_include:
|
||||
return base_amount / (1 - self.amount / 100) - base_amount
|
||||
|
||||
@api.multi
|
||||
|
|
@ -900,58 +914,13 @@ class AccountTax(models.Model):
|
|||
'analytic': boolean,
|
||||
}]
|
||||
} """
|
||||
|
||||
# 1) Flatten the taxes.
|
||||
|
||||
def collect_taxes(self, all_taxes=None):
|
||||
# Collect all the taxes recursively ordered by the sequence.
|
||||
# Example:
|
||||
# group | seq | sub-group |
|
||||
# ------------|-----------|
|
||||
# | 1 | |
|
||||
# ------------|-----------|
|
||||
# t | 2 | | seq | |
|
||||
# | | | 4 | |
|
||||
# | | | 5 | |
|
||||
# | | | 6 | |
|
||||
# | | |
|
||||
# ------------|-----------|
|
||||
# | 3 | |
|
||||
# ------------|-----------|
|
||||
# Result: 1-4-5-6-3
|
||||
if not all_taxes:
|
||||
all_taxes = self.env['account.tax']
|
||||
for tax in self.sorted(key=lambda r: r.sequence):
|
||||
if tax.amount_type == 'group':
|
||||
all_taxes = collect_taxes(tax.children_tax_ids, all_taxes)
|
||||
else:
|
||||
all_taxes += tax
|
||||
return all_taxes
|
||||
|
||||
taxes = collect_taxes(self)
|
||||
|
||||
# 2) Avoid dealing with taxes mixing price_include=False && include_base_amount=True
|
||||
# with price_include=True
|
||||
|
||||
base_excluded_flag = False # price_include=False && include_base_amount=True
|
||||
included_flag = False # price_include=True
|
||||
for tax in taxes:
|
||||
if tax.price_include:
|
||||
included_flag = True
|
||||
elif tax.include_base_amount:
|
||||
base_excluded_flag = True
|
||||
if base_excluded_flag and included_flag:
|
||||
raise UserError(_('Unable to mix any taxes being price included with taxes affecting the base amount but not included in price.'))
|
||||
|
||||
# 3) Deal with the rounding methods
|
||||
|
||||
if len(self) == 0:
|
||||
company_id = self.env.user.company_id
|
||||
else:
|
||||
company_id = self[0].company_id
|
||||
if not currency:
|
||||
currency = company_id.currency_id
|
||||
|
||||
taxes = []
|
||||
# By default, for each tax, tax amount will first be computed
|
||||
# and rounded at the 'Account' decimal precision for each
|
||||
# PO/SO/invoice line and then these rounded amounts will be
|
||||
|
|
@ -976,146 +945,62 @@ class AccountTax(models.Model):
|
|||
if not round_tax:
|
||||
prec += 5
|
||||
|
||||
# 4) Iterate the taxes in the reversed sequence order to retrieve the initial base of the computation.
|
||||
# tax | base | amount |
|
||||
# /\ ----------------------------
|
||||
# || tax_1 | XXXX | | <- we are looking for that, it's the total_excluded
|
||||
# || tax_2 | | |
|
||||
# || tax_3 | | |
|
||||
# || ... | .. | .. |
|
||||
# ----------------------------
|
||||
|
||||
base = round(price_unit * quantity, prec)
|
||||
|
||||
# Keep track of subsequent recomputed bases in order to avoid some rounding issues.
|
||||
# For example, 399.99 computed with a tax 20% price_include leads to
|
||||
# base = 399.99 / 1.2 = 333.32500000000005
|
||||
# tax_amount = base * 0.2 = 66.665
|
||||
# round(base) + round(tax_amount) = 333.33 + 66.67 = 400.0 (!= 399.99: WRONG)
|
||||
#
|
||||
# To fix such issues, base_gaps will contains amount between two bases.
|
||||
# In our example, the gap between 333.32500000000005 and 399.99 is 66.66499999999996
|
||||
#
|
||||
# Then, when processing the tax and because 66.665 - 66.66499999999996 is close to zero,
|
||||
# the real gap is returned and so:
|
||||
# tax_amount = 66.66499999999996
|
||||
# round(base) + round(tax_amount) = 333.33 + 66.66 = 399.99 (CORRECT)
|
||||
base_gaps = []
|
||||
|
||||
def recompute_base(base_amount, fixed_amount, percent_amount):
|
||||
# Recompute the new base amount based on included fixed/percent amount and the current base amount.
|
||||
# Example:
|
||||
# tax | amount |
|
||||
# ------------------
|
||||
# tax_1 | 10% |
|
||||
# tax_2 | 15 |
|
||||
# tax_3 | 20% |
|
||||
# ------------------
|
||||
# if base_amount = 145, the new base is computed as:
|
||||
# (145 - 15) / (1.0 + ((10 + 20) / 100.0)) = 130 / 1.3 = 100
|
||||
if fixed_amount == 0.0 and percent_amount == 0.0:
|
||||
return base_amount
|
||||
new_base = (base_amount - fixed_amount) / (1.0 + percent_amount / 100.0)
|
||||
base_gaps.append(base_amount - new_base)
|
||||
return new_base
|
||||
|
||||
# For the computation of move lines, we could have a negative base value.
|
||||
# In this case, compute all with positive values and negative them at the end.
|
||||
if base < 0:
|
||||
base = -base
|
||||
sign = -1
|
||||
base_values = self.env.context.get('base_values')
|
||||
if not base_values:
|
||||
total_excluded = total_included = base = round(price_unit * quantity, prec)
|
||||
else:
|
||||
sign = 1
|
||||
total_excluded, total_included, base = base_values
|
||||
|
||||
# Keep track of the accumulated included fixed/percent amount.
|
||||
incl_fixed_amount = incl_percent_amount = 0
|
||||
for tax in reversed(taxes):
|
||||
if tax.include_base_amount:
|
||||
base = recompute_base(base, incl_fixed_amount, incl_percent_amount)
|
||||
incl_fixed_amount = incl_percent_amount = 0
|
||||
if self._context.get('force_price_include', tax.price_include):
|
||||
if tax.amount_type == 'fixed':
|
||||
incl_fixed_amount += quantity * tax.amount
|
||||
elif tax.amount_type == 'percent':
|
||||
incl_percent_amount += tax.amount
|
||||
# Start the computation of accumulated amounts at the total_excluded value.
|
||||
total_excluded = total_included = base = recompute_base(base, incl_fixed_amount, incl_percent_amount)
|
||||
# Sorting key is mandatory in this case. When no key is provided, sorted() will perform a
|
||||
# search. However, the search method is overridden in account.tax in order to add a domain
|
||||
# depending on the context. This domain might filter out some taxes from self, e.g. in the
|
||||
# case of group taxes.
|
||||
for tax in self.sorted(key=lambda r: r.sequence):
|
||||
if tax.amount_type == 'group':
|
||||
children = tax.children_tax_ids.with_context(base_values=(total_excluded, total_included, base))
|
||||
ret = children.compute_all(price_unit, currency, quantity, product, partner)
|
||||
total_excluded = ret['total_excluded']
|
||||
base = ret['base'] if tax.include_base_amount else base
|
||||
total_included = ret['total_included']
|
||||
tax_amount = total_included - total_excluded
|
||||
taxes += ret['taxes']
|
||||
continue
|
||||
|
||||
# 5) Iterate the taxes in the sequence order to fill missing base/amount values.
|
||||
# tax | base | amount |
|
||||
# || ----------------------------
|
||||
# || tax_1 | OK | XXXX |
|
||||
# || tax_2 | XXXX | XXXX |
|
||||
# || tax_3 | XXXX | XXXX |
|
||||
# \/ ... | .. | .. |
|
||||
# ----------------------------
|
||||
|
||||
def compute_amount(tax):
|
||||
# Compute the amount of the tax but don't deal with the price_include because it's already
|
||||
# took into account on the base amount except for 'division' tax:
|
||||
# (tax.amount_type == 'percent' && not tax.price_include)
|
||||
# == (tax.amount_type == 'division' && tax.price_include)
|
||||
# N.B: don't use the with_context if force_price_include already False in context
|
||||
if 'force_price_include' not in self._context or self._context['force_price_include']:
|
||||
tax = tax.with_context(force_price_include=False)
|
||||
|
||||
# In case of price_included tax, subtract the amount to the corresponding
|
||||
# gap between the current base and the next one.
|
||||
amount = tax._compute_amount(base, price_unit, quantity, product, partner)
|
||||
|
||||
if not tax.price_include or not base_gaps:
|
||||
return amount
|
||||
|
||||
# Compute the new gap after subtracting of the tax amount
|
||||
new_gap = base_gaps[-1] - amount
|
||||
|
||||
# If the newly computed gap is very close of zero, return the current gap to avoid
|
||||
# rounding issues (see comments above base_gaps).
|
||||
if is_zero(new_gap, prec):
|
||||
return base_gaps.pop()
|
||||
|
||||
# Update the current gap with the new one
|
||||
base_gaps[-1] = new_gap
|
||||
return amount
|
||||
|
||||
taxes_vals = []
|
||||
for tax in taxes:
|
||||
tax_amount = compute_amount(tax)
|
||||
tax_amount = tax._compute_amount(base, price_unit, quantity, product, partner)
|
||||
if not round_tax:
|
||||
tax_amount = round(tax_amount, prec)
|
||||
else:
|
||||
tax_amount = currency.round(tax_amount)
|
||||
|
||||
# Suppose:
|
||||
# seq | amount | incl | incl_base | base | amount
|
||||
# -----------------------------------------------
|
||||
# 1 | 10 % | t | t | 100.0 | 10.0
|
||||
# -----------------------------------------------
|
||||
# ... the next computation must be done using 100.0 + 10.0 = 110.0 as base but
|
||||
# the tax base of this tax will be 100.0.
|
||||
if tax.price_include:
|
||||
total_excluded -= tax_amount
|
||||
base -= tax_amount
|
||||
else:
|
||||
total_included += tax_amount
|
||||
|
||||
# Keep base amount used for the current tax
|
||||
tax_base = base
|
||||
|
||||
if tax.include_base_amount:
|
||||
base += tax_amount
|
||||
|
||||
# The total_included amount is computed as the sum of total_excluded with all tax_amount
|
||||
total_included += tax_amount
|
||||
|
||||
taxes_vals.append({
|
||||
taxes.append({
|
||||
'id': tax.id,
|
||||
'name': tax.with_context(**{'lang': partner.lang} if partner else {}).name,
|
||||
'amount': sign * tax_amount,
|
||||
'base': round(sign * tax_base, prec),
|
||||
'amount': tax_amount,
|
||||
'base': tax_base,
|
||||
'sequence': tax.sequence,
|
||||
'account_id': tax.account_id.id,
|
||||
'refund_account_id': tax.refund_account_id.id,
|
||||
'analytic': tax.analytic,
|
||||
'price_include': tax.price_include,
|
||||
})
|
||||
|
||||
return {
|
||||
'taxes': taxes_vals,
|
||||
'total_excluded': sign * (currency.round(total_excluded) if round_total else total_excluded),
|
||||
'total_included': sign * (currency.round(total_included) if round_total else total_included),
|
||||
'base': round(sign * base, prec),
|
||||
'taxes': sorted(taxes, key=lambda k: k['sequence']),
|
||||
'total_excluded': currency.round(total_excluded) if round_total else total_excluded,
|
||||
'total_included': currency.round(total_included) if round_total else total_included,
|
||||
'base': base,
|
||||
}
|
||||
|
||||
@api.model
|
||||
|
|
@ -1153,7 +1038,7 @@ class AccountReconcileModel(models.Model):
|
|||
('percentage', 'Percentage of balance')
|
||||
], required=True, default='percentage')
|
||||
amount = fields.Float(digits=0, required=True, default=100.0, help="Fixed amount will count as a debit if it is negative, as a credit if it is positive.")
|
||||
tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict', domain=[('type_tax_use', '=', 'purchase')])
|
||||
tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict')
|
||||
analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', ondelete='set null')
|
||||
|
||||
second_account_id = fields.Many2one('account.account', string='Second Account', ondelete='cascade', domain=[('deprecated', '=', False)])
|
||||
|
|
|
|||
|
|
@ -339,14 +339,14 @@ class AccountBankStatement(models.Model):
|
|||
def link_bank_to_partner(self):
|
||||
for statement in self:
|
||||
for st_line in statement.line_ids:
|
||||
if st_line.bank_account_id and st_line.partner_id and st_line.bank_account_id.partner_id != st_line.partner_id:
|
||||
if st_line.bank_account_id and st_line.partner_id and not st_line.bank_account_id.partner_id:
|
||||
st_line.bank_account_id.partner_id = st_line.partner_id
|
||||
|
||||
|
||||
class AccountBankStatementLine(models.Model):
|
||||
_name = "account.bank.statement.line"
|
||||
_description = "Bank Statement Line"
|
||||
_order = "statement_id desc, sequence, id desc"
|
||||
_order = "statement_id desc, date desc, sequence, id desc"
|
||||
|
||||
name = fields.Char(string='Label', required=True)
|
||||
date = fields.Date(required=True, default=lambda self: self._context.get('date', fields.Date.context_today(self)))
|
||||
|
|
@ -895,7 +895,7 @@ class AccountBankStatementLine(models.Model):
|
|||
total = self.amount
|
||||
for aml_rec in payment_aml_rec:
|
||||
total -= aml_rec.debit - aml_rec.credit
|
||||
aml_rec.write({'statement_line_id': self.id})
|
||||
aml_rec.with_context(check_move_validity=False).write({'statement_line_id': self.id})
|
||||
counterpart_moves = (counterpart_moves | aml_rec.move_id)
|
||||
|
||||
# Create move line(s). Either matching an existing journal entry (eg. invoice), in which
|
||||
|
|
@ -934,7 +934,7 @@ class AccountBankStatementLine(models.Model):
|
|||
'currency_id': currency.id,
|
||||
'amount': abs(total),
|
||||
'communication': self._get_communication(payment_methods[0] if payment_methods else False),
|
||||
'name': self.statement_id.name,
|
||||
'name': self.statement_id.name or _("Bank Statement %s") % self.date,
|
||||
})
|
||||
|
||||
# Complete dicts to create both counterpart move lines and write-offs
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
import json
|
||||
import re
|
||||
import uuid
|
||||
from functools import partial
|
||||
|
||||
from lxml import etree
|
||||
from dateutil.relativedelta import relativedelta
|
||||
|
|
@ -10,6 +11,7 @@ from werkzeug.urls import url_encode
|
|||
|
||||
from odoo import api, exceptions, fields, models, _
|
||||
from odoo.tools import float_is_zero, float_compare, pycompat
|
||||
from odoo.tools.misc import formatLang
|
||||
|
||||
from odoo.exceptions import AccessError, UserError, RedirectWarning, ValidationError, Warning
|
||||
|
||||
|
|
@ -218,7 +220,7 @@ class AccountInvoice(models.Model):
|
|||
@api.depends('move_id.line_ids.amount_residual')
|
||||
def _compute_payments(self):
|
||||
payment_lines = set()
|
||||
for line in self.move_id.line_ids:
|
||||
for line in self.move_id.line_ids.filtered(lambda l: l.account_id.id == self.account_id.id):
|
||||
payment_lines.update(line.mapped('matched_credit_ids.credit_move_id.id'))
|
||||
payment_lines.update(line.mapped('matched_debit_ids.debit_move_id.id'))
|
||||
self.payment_move_line_ids = self.env['account.move.line'].browse(list(payment_lines))
|
||||
|
|
@ -246,7 +248,7 @@ class AccountInvoice(models.Model):
|
|||
move_name = fields.Char(string='Journal Entry Name', readonly=False,
|
||||
default=False, copy=False,
|
||||
help="Technical field holding the number given to the invoice, automatically set when the invoice is validated then stored to set the same number again if the invoice is cancelled, set to draft and re-validated.")
|
||||
reference = fields.Char(string='Vendor Reference',
|
||||
reference = fields.Char(string='Vendor Reference', copy=False,
|
||||
help="The partner reference of this invoice.", readonly=True, states={'draft': [('readonly', False)]})
|
||||
reference_type = fields.Selection('_get_reference_type', string='Payment Reference',
|
||||
required=True, readonly=True, states={'draft': [('readonly', False)]},
|
||||
|
|
@ -261,7 +263,6 @@ class AccountInvoice(models.Model):
|
|||
], string='Status', index=True, readonly=True, default='draft',
|
||||
track_visibility='onchange', copy=False,
|
||||
help=" * The 'Draft' status is used when a user is encoding a new and unconfirmed Invoice.\n"
|
||||
" * The 'Pro-forma' status is used when the invoice does not have an invoice number.\n"
|
||||
" * The 'Open' status is used when user creates invoice, an invoice number is generated. It stays in the open status till the user pays the invoice.\n"
|
||||
" * The 'Paid' status is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled.\n"
|
||||
" * The 'Cancelled' status is used when user cancel invoice.")
|
||||
|
|
@ -344,7 +345,7 @@ class AccountInvoice(models.Model):
|
|||
payment_move_line_ids = fields.Many2many('account.move.line', string='Payment Move Lines', compute='_compute_payments', store=True)
|
||||
user_id = fields.Many2one('res.users', string='Salesperson', track_visibility='onchange',
|
||||
readonly=True, states={'draft': [('readonly', False)]},
|
||||
default=lambda self: self.env.user)
|
||||
default=lambda self: self.env.user, copy=False)
|
||||
fiscal_position_id = fields.Many2one('account.fiscal.position', string='Fiscal Position', oldname='fiscal_position',
|
||||
readonly=True, states={'draft': [('readonly', False)]})
|
||||
commercial_partner_id = fields.Many2one('res.partner', string='Commercial Entity', compute_sudo=True,
|
||||
|
|
@ -801,6 +802,8 @@ class AccountInvoice(models.Model):
|
|||
groups = super(AccountInvoice, self)._notification_recipients(message, groups)
|
||||
|
||||
for group_name, group_method, group_data in groups:
|
||||
if group_name == 'customer':
|
||||
continue
|
||||
group_data['has_button_access'] = True
|
||||
|
||||
return groups
|
||||
|
|
@ -936,7 +939,7 @@ class AccountInvoice(models.Model):
|
|||
total_currency = 0
|
||||
for line in invoice_move_lines:
|
||||
if self.currency_id != company_currency:
|
||||
currency = self.currency_id.with_context(date=self.date or self.date_invoice or fields.Date.context_today(self))
|
||||
currency = self.currency_id.with_context(date=self._get_currency_rate_date() or fields.Date.context_today(self))
|
||||
if not (line.get('currency_id') and line.get('amount_currency')):
|
||||
line['currency_id'] = currency.id
|
||||
line['amount_currency'] = currency.round(line['price'])
|
||||
|
|
@ -983,8 +986,6 @@ class AccountInvoice(models.Model):
|
|||
'invoice_id': self.id,
|
||||
'analytic_tag_ids': analytic_tag_ids
|
||||
}
|
||||
if line['account_analytic_id']:
|
||||
move_line_dict['analytic_line_ids'] = [(0, 0, line._get_analytic_line())]
|
||||
res.append(move_line_dict)
|
||||
return res
|
||||
|
||||
|
|
@ -1086,7 +1087,7 @@ class AccountInvoice(models.Model):
|
|||
if inv.payment_term_id:
|
||||
totlines = inv.with_context(ctx).payment_term_id.with_context(currency_id=company_currency.id).compute(total, inv.date_invoice)[0]
|
||||
res_amount_currency = total_currency
|
||||
ctx['date'] = inv.date or inv.date_invoice
|
||||
ctx['date'] = inv._get_currency_rate_date()
|
||||
for i, t in enumerate(totlines):
|
||||
if inv.currency_id != company_currency:
|
||||
amount_currency = company_currency.with_context(ctx).compute(t[1], inv.currency_id)
|
||||
|
|
@ -1179,25 +1180,7 @@ class AccountInvoice(models.Model):
|
|||
|
||||
@api.model
|
||||
def line_get_convert(self, line, part):
|
||||
return {
|
||||
'date_maturity': line.get('date_maturity', False),
|
||||
'partner_id': part,
|
||||
'name': line['name'],
|
||||
'debit': line['price'] > 0 and line['price'],
|
||||
'credit': line['price'] < 0 and -line['price'],
|
||||
'account_id': line['account_id'],
|
||||
'analytic_line_ids': line.get('analytic_line_ids', []),
|
||||
'amount_currency': line['price'] > 0 and abs(line.get('amount_currency', False)) or -abs(line.get('amount_currency', False)),
|
||||
'currency_id': line.get('currency_id', False),
|
||||
'quantity': line.get('quantity', 1.00),
|
||||
'product_id': line.get('product_id', False),
|
||||
'product_uom_id': line.get('uom_id', False),
|
||||
'analytic_account_id': line.get('account_analytic_id', False),
|
||||
'invoice_id': line.get('invoice_id', False),
|
||||
'tax_ids': line.get('tax_ids', False),
|
||||
'tax_line_id': line.get('tax_line_id', False),
|
||||
'analytic_tag_ids': line.get('analytic_tag_ids', False),
|
||||
}
|
||||
return self.env['product.product']._convert_prepared_anglosaxon_line(line, part)
|
||||
|
||||
@api.multi
|
||||
def action_cancel(self):
|
||||
|
|
@ -1285,6 +1268,9 @@ class AccountInvoice(models.Model):
|
|||
copy_fields = ['company_id', 'user_id', 'fiscal_position_id']
|
||||
return self._get_refund_common_fields() + self._get_refund_prepare_fields() + copy_fields
|
||||
|
||||
def _get_currency_rate_date(self):
|
||||
return self.date or self.date_invoice
|
||||
|
||||
@api.model
|
||||
def _prepare_refund(self, invoice, date_invoice=None, date=None, description=None, journal_id=None):
|
||||
""" Prepare the dict of values to create the new credit note from the invoice.
|
||||
|
|
@ -1324,6 +1310,7 @@ class AccountInvoice(models.Model):
|
|||
values['state'] = 'draft'
|
||||
values['number'] = False
|
||||
values['origin'] = invoice.number
|
||||
values['payment_term_id'] = False
|
||||
values['refund_invoice_id'] = invoice.id
|
||||
|
||||
if date:
|
||||
|
|
@ -1387,8 +1374,6 @@ class AccountInvoice(models.Model):
|
|||
'payment_difference_handling': writeoff_acc and 'reconcile' or 'open',
|
||||
'writeoff_account_id': writeoff_acc and writeoff_acc.id or False,
|
||||
}
|
||||
if self.env.context.get('tx_currency_id'):
|
||||
payment_vals['currency_id'] = self.env.context.get('tx_currency_id')
|
||||
|
||||
payment = self.env['account.payment'].create(payment_vals)
|
||||
payment.post()
|
||||
|
|
@ -1409,13 +1394,18 @@ class AccountInvoice(models.Model):
|
|||
@api.multi
|
||||
def _get_tax_amount_by_group(self):
|
||||
self.ensure_one()
|
||||
currency = self.currency_id or self.company_id.currency_id
|
||||
fmt = partial(formatLang, self.with_context(lang=self.partner_id.lang).env, currency_obj=currency)
|
||||
res = {}
|
||||
for line in self.tax_line_ids:
|
||||
res.setdefault(line.tax_id.tax_group_id, {'base': 0.0, 'amount': 0.0})
|
||||
res[line.tax_id.tax_group_id]['amount'] += line.amount
|
||||
res[line.tax_id.tax_group_id]['base'] += line.base
|
||||
res = sorted(res.items(), key=lambda l: l[0].sequence)
|
||||
res = [(l[0].name, l[1]['amount'], l[1]['base']) for l in res]
|
||||
res = [(
|
||||
r[0].name, r[1]['amount'], r[1]['base'],
|
||||
fmt(r[1]['amount']), fmt(r[1]['base']),
|
||||
) for r in res]
|
||||
return res
|
||||
|
||||
|
||||
|
|
@ -1424,25 +1414,10 @@ class AccountInvoiceLine(models.Model):
|
|||
_description = "Invoice Line"
|
||||
_order = "invoice_id,sequence,id"
|
||||
|
||||
@api.multi
|
||||
def _get_analytic_line(self):
|
||||
ref = self.invoice_id.number
|
||||
return {
|
||||
'name': self.name,
|
||||
'date': self.invoice_id.date_invoice,
|
||||
'account_id': self.account_analytic_id.id,
|
||||
'unit_amount': self.quantity,
|
||||
'amount': self.price_subtotal_signed,
|
||||
'product_id': self.product_id.id,
|
||||
'product_uom_id': self.uom_id.id,
|
||||
'general_account_id': self.account_id.id,
|
||||
'ref': ref,
|
||||
}
|
||||
|
||||
@api.one
|
||||
@api.depends('price_unit', 'discount', 'invoice_line_tax_ids', 'quantity',
|
||||
'product_id', 'invoice_id.partner_id', 'invoice_id.currency_id', 'invoice_id.company_id',
|
||||
'invoice_id.date_invoice')
|
||||
'invoice_id.date_invoice', 'invoice_id.date')
|
||||
def _compute_price(self):
|
||||
currency = self.invoice_id and self.invoice_id.currency_id or None
|
||||
price = self.price_unit * (1 - (self.discount or 0.0) / 100.0)
|
||||
|
|
@ -1452,7 +1427,7 @@ class AccountInvoiceLine(models.Model):
|
|||
self.price_subtotal = price_subtotal_signed = taxes['total_excluded'] if taxes else self.quantity * price
|
||||
self.price_total = taxes['total_included'] if taxes else self.price_subtotal
|
||||
if self.invoice_id.currency_id and self.invoice_id.currency_id != self.invoice_id.company_id.currency_id:
|
||||
price_subtotal_signed = self.invoice_id.currency_id.with_context(date=self.invoice_id.date_invoice).compute(price_subtotal_signed, self.invoice_id.company_id.currency_id)
|
||||
price_subtotal_signed = self.invoice_id.currency_id.with_context(date=self.invoice_id._get_currency_rate_date()).compute(price_subtotal_signed, self.invoice_id.company_id.currency_id)
|
||||
sign = self.invoice_id.type in ['in_refund', 'out_refund'] and -1 or 1
|
||||
self.price_subtotal_signed = price_subtotal_signed * sign
|
||||
|
||||
|
|
@ -1575,9 +1550,6 @@ class AccountInvoiceLine(models.Model):
|
|||
self.price_unit = 0.0
|
||||
domain['uom_id'] = []
|
||||
else:
|
||||
# Use the purchase uom by default
|
||||
self.uom_id = self.product_id.uom_po_id
|
||||
|
||||
if part.lang:
|
||||
product = self.product_id.with_context(lang=part.lang)
|
||||
else:
|
||||
|
|
@ -1724,6 +1696,7 @@ class AccountPaymentTerm(models.Model):
|
|||
def compute(self, value, date_ref=False):
|
||||
date_ref = date_ref or fields.Date.today()
|
||||
amount = value
|
||||
sign = value < 0 and -1 or 1
|
||||
result = []
|
||||
if self.env.context.get('currency_id'):
|
||||
currency = self.env['res.currency'].browse(self.env.context['currency_id'])
|
||||
|
|
@ -1731,7 +1704,7 @@ class AccountPaymentTerm(models.Model):
|
|||
currency = self.env.user.company_id.currency_id
|
||||
for line in self.line_ids:
|
||||
if line.value == 'fixed':
|
||||
amt = currency.round(line.value_amount)
|
||||
amt = sign * currency.round(line.value_amount)
|
||||
elif line.value == 'percent':
|
||||
amt = currency.round(value * (line.value_amount / 100.0))
|
||||
elif line.value == 'balance':
|
||||
|
|
|
|||
|
|
@ -201,18 +201,19 @@ class account_journal(models.Model):
|
|||
(number_draft, sum_draft) = self._count_results_and_sum_amounts(query_results_drafts, currency)
|
||||
(number_late, sum_late) = self._count_results_and_sum_amounts(late_query_results, currency)
|
||||
|
||||
difference = currency.round(last_balance-account_sum) + 0.0
|
||||
return {
|
||||
'number_to_reconcile': number_to_reconcile,
|
||||
'account_balance': formatLang(self.env, account_sum, currency_obj=self.currency_id or self.company_id.currency_id),
|
||||
'last_balance': formatLang(self.env, last_balance, currency_obj=self.currency_id or self.company_id.currency_id),
|
||||
'difference': (last_balance-account_sum) and formatLang(self.env, last_balance-account_sum, currency_obj=self.currency_id or self.company_id.currency_id) or False,
|
||||
'account_balance': formatLang(self.env, currency.round(account_sum) + 0.0, currency_obj=currency),
|
||||
'last_balance': formatLang(self.env, currency.round(last_balance) + 0.0, currency_obj=currency),
|
||||
'difference': formatLang(self.env, difference, currency_obj=currency) if difference else False,
|
||||
'number_draft': number_draft,
|
||||
'number_waiting': number_waiting,
|
||||
'number_late': number_late,
|
||||
'sum_draft': formatLang(self.env, sum_draft or 0.0, currency_obj=self.currency_id or self.company_id.currency_id),
|
||||
'sum_waiting': formatLang(self.env, sum_waiting or 0.0, currency_obj=self.currency_id or self.company_id.currency_id),
|
||||
'sum_late': formatLang(self.env, sum_late or 0.0, currency_obj=self.currency_id or self.company_id.currency_id),
|
||||
'currency_id': self.currency_id and self.currency_id.id or self.company_id.currency_id.id,
|
||||
'sum_draft': formatLang(self.env, currency.round(sum_draft) + 0.0, currency_obj=currency),
|
||||
'sum_waiting': formatLang(self.env, currency.round(sum_waiting) + 0.0, currency_obj=currency),
|
||||
'sum_late': formatLang(self.env, currency.round(sum_late) + 0.0, currency_obj=currency),
|
||||
'currency_id': currency.id,
|
||||
'bank_statements_source': self.bank_statements_source,
|
||||
'title': title,
|
||||
}
|
||||
|
|
@ -223,7 +224,7 @@ class account_journal(models.Model):
|
|||
data as its first element, and the arguments dictionary to use to run
|
||||
it as its second.
|
||||
"""
|
||||
return ("""SELECT state, amount_total, currency_id AS currency
|
||||
return ("""SELECT state, amount_total, currency_id AS currency, type
|
||||
FROM account_invoice
|
||||
WHERE journal_id = %(journal_id)s AND state = 'open';""", {'journal_id':self.id})
|
||||
|
||||
|
|
@ -233,7 +234,7 @@ class account_journal(models.Model):
|
|||
gather the bills in draft state data, and the arguments
|
||||
dictionary to use to run it as its second.
|
||||
"""
|
||||
return ("""SELECT state, amount_total, currency_id AS currency
|
||||
return ("""SELECT state, amount_total, currency_id AS currency, type
|
||||
FROM account_invoice
|
||||
WHERE journal_id = %(journal_id)s AND state = 'draft';""", {'journal_id':self.id})
|
||||
|
||||
|
|
@ -246,7 +247,9 @@ class account_journal(models.Model):
|
|||
for result in results_dict:
|
||||
cur = self.env['res.currency'].browse(result.get('currency'))
|
||||
rslt_count += 1
|
||||
rslt_sum += cur.compute(result.get('amount_total'), target_currency)
|
||||
|
||||
type_factor = result.get('type') in ('in_refund', 'out_refund') and -1 or 1
|
||||
rslt_sum += type_factor * cur.compute(result.get('amount_total'), target_currency)
|
||||
return (rslt_count, rslt_sum)
|
||||
|
||||
@api.multi
|
||||
|
|
@ -345,12 +348,13 @@ class account_journal(models.Model):
|
|||
ctx.update({
|
||||
'journal_type': self.type,
|
||||
'default_journal_id': self.id,
|
||||
'search_default_journal_id': self.id,
|
||||
'default_type': invoice_type,
|
||||
'type': invoice_type
|
||||
})
|
||||
|
||||
[action] = self.env.ref('account.%s' % action_name).read()
|
||||
if not self.env.context.get('use_domain'):
|
||||
ctx['search_default_journal_id'] = self.id
|
||||
action['context'] = ctx
|
||||
action['domain'] = self._context.get('use_domain', [])
|
||||
account_invoice_filter = self.env.ref('account.view_account_invoice_filter', False)
|
||||
|
|
|
|||
|
|
@ -106,11 +106,11 @@ class AccountMove(models.Model):
|
|||
default=lambda self: self.env.user.company_id)
|
||||
matched_percentage = fields.Float('Percentage Matched', compute='_compute_matched_percentage', digits=0, store=True, readonly=True, help="Technical field used in cash basis method")
|
||||
# Dummy Account field to search on account.move by account_id
|
||||
dummy_account_id = fields.Many2one('account.account', related='line_ids.account_id', string='Account', store=False)
|
||||
dummy_account_id = fields.Many2one('account.account', related='line_ids.account_id', string='Account', store=False, readonly=True)
|
||||
tax_cash_basis_rec_id = fields.Many2one(
|
||||
'account.partial.reconcile',
|
||||
string='Tax Cash Basis Entry of',
|
||||
help="Technical field used to keep track of the tax cash basis reconciliation."
|
||||
help="Technical field used to keep track of the tax cash basis reconciliation. "
|
||||
"This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too.")
|
||||
|
||||
@api.model
|
||||
|
|
@ -171,6 +171,8 @@ class AccountMove(models.Model):
|
|||
if not move.journal_id.update_posted:
|
||||
raise UserError(_('You cannot modify a posted entry of this journal.\nFirst you should set the journal to allow cancelling entries.'))
|
||||
if self.ids:
|
||||
self.check_access_rights('write')
|
||||
self.check_access_rule('write')
|
||||
self._check_lock_date()
|
||||
self._cr.execute('UPDATE account_move '\
|
||||
'SET state=%s '\
|
||||
|
|
@ -288,7 +290,7 @@ class AccountMoveLine(models.Model):
|
|||
if not cr.fetchone():
|
||||
cr.execute('CREATE INDEX account_move_line_partner_id_ref_idx ON account_move_line (partner_id, ref)')
|
||||
|
||||
@api.depends('debit', 'credit', 'amount_currency', 'currency_id', 'matched_debit_ids', 'matched_credit_ids', 'matched_debit_ids.amount', 'matched_credit_ids.amount', 'account_id.currency_id', 'move_id.state')
|
||||
@api.depends('debit', 'credit', 'amount_currency', 'currency_id', 'matched_debit_ids', 'matched_credit_ids', 'matched_debit_ids.amount', 'matched_credit_ids.amount', 'move_id.state')
|
||||
def _amount_residual(self):
|
||||
""" Computes the residual amount of a move line from a reconciliable account in the company currency and the line's currency.
|
||||
This amount will be 0 for fully reconciled lines or lines from a non-reconciliable account, the original line amount
|
||||
|
|
@ -442,7 +444,7 @@ class AccountMoveLine(models.Model):
|
|||
tax_line_id = fields.Many2one('account.tax', string='Originator tax', ondelete='restrict')
|
||||
analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account')
|
||||
analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Analytic tags')
|
||||
company_id = fields.Many2one('res.company', related='account_id.company_id', string='Company', store=True)
|
||||
company_id = fields.Many2one('res.company', related='account_id.company_id', string='Company', store=True, readonly=True)
|
||||
counterpart = fields.Char("Counterpart", compute='_get_counterpart', help="Compute the counter part accounts of this journal item for this journal entry. This can be needed in reports.")
|
||||
|
||||
# TODO: put the invoice link and partner_id on the account_move
|
||||
|
|
@ -471,7 +473,7 @@ class AccountMoveLine(models.Model):
|
|||
balance = 0
|
||||
for line in self._context['line_ids']:
|
||||
if line[2]:
|
||||
balance += line[2]['debit'] - line[2]['credit']
|
||||
balance += line[2].get('debit', 0) - line[2].get('credit', 0)
|
||||
if balance < 0:
|
||||
rec.update({'debit': -balance})
|
||||
if balance > 0:
|
||||
|
|
@ -495,7 +497,7 @@ class AccountMoveLine(models.Model):
|
|||
raise ValidationError(_("You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' field."))
|
||||
|
||||
@api.multi
|
||||
@api.constrains('amount_currency')
|
||||
@api.constrains('amount_currency', 'debit', 'credit')
|
||||
def _check_currency_amount(self):
|
||||
for line in self:
|
||||
if line.amount_currency:
|
||||
|
|
@ -518,9 +520,9 @@ class AccountMoveLine(models.Model):
|
|||
for line in self:
|
||||
amount = line.amount_currency
|
||||
if line.currency_id and line.currency_id != line.company_currency_id:
|
||||
amount = self.currency_id.with_context(date=line.date).compute(amount, line.company_currency_id)
|
||||
line.debit = amount > 0 and amount or 0.0
|
||||
line.credit = amount < 0 and -amount or 0.0
|
||||
amount = line.currency_id.with_context(date=line.date).compute(amount, line.company_currency_id)
|
||||
line.debit = amount > 0 and amount or 0.0
|
||||
line.credit = amount < 0 and -amount or 0.0
|
||||
|
||||
####################################################
|
||||
# Reconciliation interface methods
|
||||
|
|
@ -906,7 +908,9 @@ class AccountMoveLine(models.Model):
|
|||
|
||||
def _get_pair_to_reconcile(self):
|
||||
#field is either 'amount_residual' or 'amount_residual_currency' (if the reconciled account has a secondary currency set)
|
||||
field = self[0].account_id.currency_id and 'amount_residual_currency' or 'amount_residual'
|
||||
company_currency_id = self[0].account_id.company_id.currency_id
|
||||
account_curreny_id = self[0].account_id.currency_id
|
||||
field = (account_curreny_id and company_currency_id != account_curreny_id) and 'amount_residual_currency' or 'amount_residual'
|
||||
#reconciliation on bank accounts are special cases as we don't want to set them as reconciliable
|
||||
#but we still want to reconcile entries that are reversed together in order to clear those lines
|
||||
#in the bank reconciliation report.
|
||||
|
|
@ -922,7 +926,7 @@ class AccountMoveLine(models.Model):
|
|||
elif self._context.get('skip_full_reconcile_check') == 'amount_currency_only':
|
||||
field = 'amount_residual_currency'
|
||||
#target the pair of move in self that are the oldest
|
||||
sorted_moves = sorted(self, key=lambda a: a.date)
|
||||
sorted_moves = sorted(self, key=lambda a: a.date_maturity or a.date)
|
||||
debit = credit = False
|
||||
for aml in sorted_moves:
|
||||
if credit and debit:
|
||||
|
|
@ -944,8 +948,9 @@ class AccountMoveLine(models.Model):
|
|||
#there is no more pair to reconcile so return what move_line are left
|
||||
if not sm_credit_move or not sm_debit_move:
|
||||
return self
|
||||
|
||||
field = self[0].account_id.currency_id and 'amount_residual_currency' or 'amount_residual'
|
||||
company_currency_id = self[0].account_id.company_id.currency_id
|
||||
account_curreny_id = self[0].account_id.currency_id
|
||||
field = (account_curreny_id and company_currency_id != account_curreny_id) and 'amount_residual_currency' or 'amount_residual'
|
||||
if not sm_debit_move.debit and not sm_debit_move.credit:
|
||||
#both debit and credit field are 0, consider the amount_residual_currency field because it's an exchange difference entry
|
||||
field = 'amount_residual_currency'
|
||||
|
|
@ -1168,6 +1173,11 @@ class AccountMoveLine(models.Model):
|
|||
account_move_line.payment_id.write({'invoice_ids': [(3, invoice.id, None)]})
|
||||
rec_move_ids += account_move_line.matched_debit_ids
|
||||
rec_move_ids += account_move_line.matched_credit_ids
|
||||
if self.env.context.get('invoice_id'):
|
||||
current_invoice = self.env['account.invoice'].browse(self.env.context['invoice_id'])
|
||||
rec_move_ids = rec_move_ids.filtered(
|
||||
lambda r: (r.debit_move_id + r.credit_move_id) & current_invoice.move_id.line_ids
|
||||
)
|
||||
return rec_move_ids.unlink()
|
||||
|
||||
####################################################
|
||||
|
|
@ -1331,7 +1341,7 @@ class AccountMoveLine(models.Model):
|
|||
record.payment_id.state = 'reconciled'
|
||||
|
||||
result = super(AccountMoveLine, self).write(vals)
|
||||
if self._context.get('check_move_validity', True):
|
||||
if self._context.get('check_move_validity', True) and any(key in vals for key in ('account_id', 'journal_id', 'date', 'move_id', 'debit', 'credit')):
|
||||
move_ids = set()
|
||||
for line in self:
|
||||
if line.move_id.id not in move_ids:
|
||||
|
|
@ -1351,7 +1361,7 @@ class AccountMoveLine(models.Model):
|
|||
raise UserError(_('You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n%s.') % err_msg)
|
||||
if line.move_id.id not in move_ids:
|
||||
move_ids.add(line.move_id.id)
|
||||
self.env['account.move'].browse(list(move_ids))._check_lock_date()
|
||||
self.env['account.move'].browse(list(move_ids))._check_lock_date()
|
||||
return True
|
||||
|
||||
####################################################
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ class account_payment(models.Model):
|
|||
def _compute_journal_domain_and_types(self):
|
||||
journal_type = ['bank', 'cash']
|
||||
domain = []
|
||||
if self.currency_id.is_zero(self.amount):
|
||||
if self.currency_id.is_zero(self.amount) and self.has_invoices:
|
||||
# In case of payment with 0 amount, allow to select a journal of type 'general' like
|
||||
# 'Miscellaneous Operations' and set this journal by default.
|
||||
journal_type = ['general']
|
||||
|
|
@ -327,7 +327,7 @@ class account_payment(models.Model):
|
|||
else:
|
||||
if self.payment_type == 'inbound':
|
||||
domain.append(('at_least_one_inbound', '=', True))
|
||||
else:
|
||||
elif self.payment_type == 'outbound':
|
||||
domain.append(('at_least_one_outbound', '=', True))
|
||||
return {'domain': domain, 'journal_types': set(journal_type)}
|
||||
|
||||
|
|
@ -336,9 +336,16 @@ class account_payment(models.Model):
|
|||
jrnl_filters = self._compute_journal_domain_and_types()
|
||||
journal_types = jrnl_filters['journal_types']
|
||||
domain_on_types = [('type', 'in', list(journal_types))]
|
||||
if self.journal_id.type not in journal_types:
|
||||
self.journal_id = self.env['account.journal'].search(domain_on_types, limit=1)
|
||||
return {'domain': {'journal_id': jrnl_filters['domain'] + domain_on_types}}
|
||||
|
||||
journal_domain = jrnl_filters['domain'] + domain_on_types
|
||||
default_journal_id = self.env.context.get('default_journal_id')
|
||||
if not default_journal_id:
|
||||
if self.journal_id.type not in journal_types:
|
||||
self.journal_id = self.env['account.journal'].search(domain_on_types, limit=1)
|
||||
else:
|
||||
journal_domain = journal_domain.append(('id', '=', default_journal_id))
|
||||
|
||||
return {'domain': {'journal_id': journal_domain}}
|
||||
|
||||
@api.one
|
||||
@api.depends('invoice_ids', 'payment_type', 'partner_type', 'partner_id')
|
||||
|
|
@ -354,6 +361,12 @@ class account_payment(models.Model):
|
|||
self.destination_account_id = self.partner_id.property_account_receivable_id.id
|
||||
else:
|
||||
self.destination_account_id = self.partner_id.property_account_payable_id.id
|
||||
elif self.partner_type == 'customer':
|
||||
default_account = self.env['ir.property'].get('property_account_receivable_id', 'res.partner')
|
||||
self.destination_account_id = default_account.id
|
||||
elif self.partner_type == 'supplier':
|
||||
default_account = self.env['ir.property'].get('property_account_payable_id', 'res.partner')
|
||||
self.destination_account_id = default_account.id
|
||||
|
||||
@api.onchange('partner_type')
|
||||
def _onchange_partner_type(self):
|
||||
|
|
@ -369,6 +382,8 @@ class account_payment(models.Model):
|
|||
self.partner_type = 'customer'
|
||||
elif self.payment_type == 'outbound':
|
||||
self.partner_type = 'supplier'
|
||||
else:
|
||||
self.partner_type = False
|
||||
# Set payment method domain
|
||||
res = self._onchange_journal()
|
||||
if not res.get('domain', {}):
|
||||
|
|
@ -496,6 +511,7 @@ class account_payment(models.Model):
|
|||
(transfer_credit_aml + transfer_debit_aml).reconcile()
|
||||
|
||||
rec.write({'state': 'posted', 'move_name': move.name})
|
||||
return True
|
||||
|
||||
@api.multi
|
||||
def action_draft(self):
|
||||
|
|
@ -510,7 +526,7 @@ class account_payment(models.Model):
|
|||
if any(len(record.invoice_ids) != 1 for record in self):
|
||||
# For multiple invoices, there is account.register.payments wizard
|
||||
raise UserError(_("This method should only be called to process a single invoice's payment."))
|
||||
self.post();
|
||||
return self.post()
|
||||
|
||||
def _create_payment_entry(self, amount):
|
||||
""" Create a journal entry corresponding to a payment, if the payment references invoice(s) they are reconciled.
|
||||
|
|
@ -561,9 +577,9 @@ class account_payment(models.Model):
|
|||
writeoff_line['amount_currency'] = amount_currency_wo
|
||||
writeoff_line['currency_id'] = currency_id
|
||||
writeoff_line = aml_obj.create(writeoff_line)
|
||||
if counterpart_aml['debit'] or writeoff_line['credit']:
|
||||
if counterpart_aml['debit'] or (writeoff_line['credit'] and not counterpart_aml['credit']):
|
||||
counterpart_aml['debit'] += credit_wo - debit_wo
|
||||
if counterpart_aml['credit'] or writeoff_line['debit']:
|
||||
if counterpart_aml['credit'] or (writeoff_line['debit'] and not counterpart_aml['debit']):
|
||||
counterpart_aml['credit'] += debit_wo - credit_wo
|
||||
counterpart_aml['amount_currency'] -= amount_currency_wo
|
||||
|
||||
|
|
|
|||
|
|
@ -40,8 +40,7 @@ def migrate_tags_on_taxes(cr, registry):
|
|||
('type_tax_use', '=', tax_template.type_tax_use),
|
||||
('description', '=', tax_template.description)
|
||||
])
|
||||
if len(tax_id.ids) == 1:
|
||||
tax_id.sudo().write({'tag_ids': [(6, 0, tax_template.tag_ids.ids)]})
|
||||
tax_id.sudo().write({'tag_ids': [(6, 0, tax_template.tag_ids.ids)]})
|
||||
|
||||
def preserve_existing_tags_on_taxes(cr, registry, module):
|
||||
''' This is a utility function used to preserve existing previous tags during upgrade of the module.'''
|
||||
|
|
@ -291,7 +290,8 @@ class AccountChartTemplate(models.Model):
|
|||
tmp1, tmp2 = self.parent_id._install_template(company, code_digits=code_digits, transfer_account_id=transfer_account_id, acc_ref=acc_ref, taxes_ref=taxes_ref)
|
||||
acc_ref.update(tmp1)
|
||||
taxes_ref.update(tmp2)
|
||||
tmp1, tmp2 = self._load_template(company, code_digits=code_digits, transfer_account_id=transfer_account_id, account_ref=acc_ref, taxes_ref=taxes_ref)
|
||||
# Ensure, even if individually, that everything is translated according to the company's language.
|
||||
tmp1, tmp2 = self.with_context(lang=company.partner_id.lang)._load_template(company, code_digits=code_digits, transfer_account_id=transfer_account_id, account_ref=acc_ref, taxes_ref=taxes_ref)
|
||||
acc_ref.update(tmp1)
|
||||
taxes_ref.update(tmp2)
|
||||
return acc_ref, taxes_ref
|
||||
|
|
@ -510,7 +510,7 @@ class AccountTaxTemplate(models.Model):
|
|||
amount_type = fields.Selection(default='percent', string="Tax Computation", required=True,
|
||||
selection=[('group', 'Group of Taxes'), ('fixed', 'Fixed'), ('percent', 'Percentage of Price'), ('division', 'Percentage of Price Tax Included')])
|
||||
active = fields.Boolean(default=True, help="Set active to false to hide the tax without removing it.")
|
||||
company_id = fields.Many2one('res.company', string='Company', required=True, default=lambda self: self.env.user.company_id)
|
||||
company_id = fields.Many2one('res.company', string='Company')
|
||||
children_tax_ids = fields.Many2many('account.tax.template', 'account_tax_template_filiation_rel', 'parent_tax', 'child_tax', string='Children Taxes')
|
||||
sequence = fields.Integer(required=True, default=1,
|
||||
help="The sequence field is used to define order in which the tax lines are applied.")
|
||||
|
|
@ -740,6 +740,9 @@ class WizardMultiChartsAccounts(models.TransientModel):
|
|||
res.setdefault('domain', {})
|
||||
res['domain']['sale_tax_id'] = repr(sale_tax_domain)
|
||||
res['domain']['purchase_tax_id'] = repr(purchase_tax_domain)
|
||||
else:
|
||||
self.sale_tax_id = False
|
||||
self.purchase_tax_id = False
|
||||
if self.chart_template_id.transfer_account_id:
|
||||
self.transfer_account_id = self.chart_template_id.transfer_account_id.id
|
||||
if self.chart_template_id.code_digits:
|
||||
|
|
@ -857,6 +860,8 @@ class WizardMultiChartsAccounts(models.TransientModel):
|
|||
all the provided information to create the accounts, the banks, the journals, the taxes, the
|
||||
accounting properties... accordingly for the chosen company.
|
||||
'''
|
||||
# Ensure everything is translated consitingly to the company's language, not the user's one.
|
||||
self = self.with_context(lang=self.company_id.partner_id.lang)
|
||||
if not self.env.user._is_admin():
|
||||
raise AccessError(_("Only administrators can change the settings"))
|
||||
|
||||
|
|
@ -911,7 +916,6 @@ class WizardMultiChartsAccounts(models.TransientModel):
|
|||
|
||||
# write values of default taxes for product as super user and write in the config
|
||||
IrDefault = self.env['ir.default']
|
||||
IrConfig = self.env['ir.config_parameter']
|
||||
if self.sale_tax_id and taxes_ref:
|
||||
IrDefault.sudo().set('product.template', "taxes_id", [taxes_ref[self.sale_tax_id.id]], company_id=company.id)
|
||||
if self.purchase_tax_id and taxes_ref:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ from datetime import timedelta, datetime
|
|||
import calendar
|
||||
|
||||
from odoo import fields, models, api, _
|
||||
from odoo.exceptions import ValidationError
|
||||
from odoo.exceptions import ValidationError, UserError
|
||||
from odoo.exceptions import UserError
|
||||
from odoo.tools.float_utils import float_round, float_is_zero
|
||||
|
||||
|
|
@ -40,14 +40,14 @@ class ResCompany(models.Model):
|
|||
property_stock_valuation_account_id = fields.Many2one('account.account', string="Account Template for Stock Valuation")
|
||||
bank_journal_ids = fields.One2many('account.journal', 'company_id', domain=[('type', '=', 'bank')], string='Bank Journals')
|
||||
overdue_msg = fields.Text(string='Overdue Payments Message', translate=True,
|
||||
default='''Dear Sir/Madam,
|
||||
default=lambda s: _('''Dear Sir/Madam,
|
||||
|
||||
Our records indicate that some payments on your account are still due. Please find details below.
|
||||
If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.
|
||||
If you have any queries regarding your account, Please contact us.
|
||||
|
||||
Thank you in advance for your cooperation.
|
||||
Best Regards,''')
|
||||
Best Regards,'''))
|
||||
tax_exigibility = fields.Boolean(string='Use Cash Basis')
|
||||
|
||||
#Fields of the setup step for opening move
|
||||
|
|
@ -136,6 +136,12 @@ Best Regards,''')
|
|||
company.reflect_code_prefix_change(company.cash_account_code_prefix, new_cash_code, digits)
|
||||
if values.get('accounts_code_digits'):
|
||||
company.reflect_code_digits_change(digits)
|
||||
|
||||
#forbid the change of currency_id if there are already some accounting entries existing
|
||||
if 'currency_id' in values and values['currency_id'] != company.currency_id.id:
|
||||
if self.env['account.move.line'].search([('company_id', '=', company.id)]):
|
||||
raise UserError(_('You cannot change the currency of the company since some journal items already exist'))
|
||||
|
||||
return super(ResCompany, self).write(values)
|
||||
|
||||
@api.model
|
||||
|
|
@ -180,7 +186,6 @@ Best Regards,''')
|
|||
def setting_init_fiscal_year_action(self):
|
||||
""" Called by the 'Fiscal Year Opening' button of the setup bar."""
|
||||
company = self.env.user.company_id
|
||||
company.create_op_move_if_non_existant()
|
||||
new_wizard = self.env['account.financial.year.op'].create({'company_id': company.id})
|
||||
view_id = self.env.ref('account.setup_financial_year_opening_form').id
|
||||
|
||||
|
|
@ -271,7 +276,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 miscellaneous journal could be found. Please create one before proceeding."))
|
||||
raise UserError(_("Please install a chart of accounts or create a miscellaneous journal before proceeding."))
|
||||
|
||||
self.account_opening_move_id = self.env['account.move'].create({
|
||||
'name': _('Opening Journal Entry'),
|
||||
|
|
@ -298,14 +303,14 @@ Best Regards,''')
|
|||
unaffected_earnings_type = self.env.ref("account.data_unaffected_earnings")
|
||||
account = self.env['account.account'].search([('company_id', '=', self.id),
|
||||
('user_type_id', '=', unaffected_earnings_type.id)])
|
||||
if not account:
|
||||
account = self.env['account.account'].create({
|
||||
if account:
|
||||
return account[0]
|
||||
return self.env['account.account'].create({
|
||||
'code': '999999',
|
||||
'name': _('Undistributed Profits/Losses'),
|
||||
'user_type_id': unaffected_earnings_type.id,
|
||||
'company_id': self.id,
|
||||
})
|
||||
return account
|
||||
|
||||
def get_opening_move_differences(self, opening_move_lines):
|
||||
currency = self.currency_id
|
||||
|
|
|
|||
|
|
@ -297,10 +297,16 @@ class ResPartner(models.Model):
|
|||
partner.total_invoiced = sum(price['total'] for price in price_totals if price['partner_id'] in child_ids)
|
||||
|
||||
@api.multi
|
||||
def _journal_item_count(self):
|
||||
def _compute_journal_item_count(self):
|
||||
AccountMoveLine = self.env['account.move.line']
|
||||
for partner in self:
|
||||
partner.journal_item_count = self.env['account.move.line'].search_count([('partner_id', '=', partner.id)])
|
||||
partner.contracts_count = self.env['account.analytic.account'].search_count([('partner_id', '=', partner.id)])
|
||||
partner.journal_item_count = AccountMoveLine.search_count([('partner_id', '=', partner.id)])
|
||||
|
||||
@api.multi
|
||||
def _compute_contracts_count(self):
|
||||
AccountAnalyticAccount = self.env['account.analytic.account']
|
||||
for partner in self:
|
||||
partner.contracts_count = AccountAnalyticAccount.search_count([('partner_id', '=', partner.id)])
|
||||
|
||||
def get_followup_lines_domain(self, date, overdue_only=False, only_unblocked=False):
|
||||
domain = [('reconciled', '=', False), ('account_id.deprecated', '=', False), ('account_id.internal_type', '=', 'receivable'), '|', ('debit', '!=', 0), ('credit', '!=', 0), ('company_id', '=', self.env.user.company_id.id)]
|
||||
|
|
@ -374,9 +380,8 @@ class ResPartner(models.Model):
|
|||
groups='account.group_account_invoice')
|
||||
currency_id = fields.Many2one('res.currency', compute='_get_company_currency', readonly=True,
|
||||
string="Currency", help='Utility field to express amount currency')
|
||||
|
||||
contracts_count = fields.Integer(compute='_journal_item_count', string="Contracts", type='integer')
|
||||
journal_item_count = fields.Integer(compute='_journal_item_count', string="Journal Items", type="integer")
|
||||
contracts_count = fields.Integer(compute='_compute_contracts_count', string="Contracts", type='integer')
|
||||
journal_item_count = fields.Integer(compute='_compute_journal_item_count', string="Journal Items", type="integer")
|
||||
property_account_payable_id = fields.Many2one('account.account', company_dependent=True,
|
||||
string="Account Payable", oldname="property_account_payable",
|
||||
domain="[('internal_type', '=', 'payable'), ('deprecated', '=', False)]",
|
||||
|
|
@ -389,7 +394,8 @@ class ResPartner(models.Model):
|
|||
required=True)
|
||||
property_account_position_id = fields.Many2one('account.fiscal.position', company_dependent=True,
|
||||
string="Fiscal Position",
|
||||
help="The fiscal position will determine taxes and accounts used for the partner.", oldname="property_account_position")
|
||||
help="The fiscal position will determine taxes and accounts used for the partner.", oldname="property_account_position",
|
||||
domain="[('company_id', 'in', [company_id, False])]")
|
||||
property_payment_term_id = fields.Many2one('account.payment.term', company_dependent=True,
|
||||
string='Customer Payment Terms',
|
||||
help="This payment term will be used instead of the default one for sales orders and customer invoices", oldname="property_payment_term")
|
||||
|
|
@ -436,3 +442,8 @@ class ResPartner(models.Model):
|
|||
action['domain'] = literal_eval(action['domain'])
|
||||
action['domain'].append(('partner_id', 'child_of', self.id))
|
||||
return action
|
||||
|
||||
@api.onchange('company_id')
|
||||
def _onchange_company_id(self):
|
||||
if self.company_id:
|
||||
return {'domain': {'property_account_position_id': [('company_id', 'in', [self.company_id.id, False])]}}
|
||||
|
|
|
|||
|
|
@ -71,3 +71,28 @@ class ProductTemplate(models.Model):
|
|||
if not fiscal_pos:
|
||||
fiscal_pos = self.env['account.fiscal.position']
|
||||
return fiscal_pos.map_accounts(accounts)
|
||||
|
||||
class ProductProduct(models.Model):
|
||||
_inherit = "product.product"
|
||||
|
||||
@api.model
|
||||
def _convert_prepared_anglosaxon_line(self, line, partner):
|
||||
return {
|
||||
'date_maturity': line.get('date_maturity', False),
|
||||
'partner_id': partner,
|
||||
'name': line['name'],
|
||||
'debit': line['price'] > 0 and line['price'],
|
||||
'credit': line['price'] < 0 and -line['price'],
|
||||
'account_id': line['account_id'],
|
||||
'analytic_line_ids': line.get('analytic_line_ids', []),
|
||||
'amount_currency': line['price'] > 0 and abs(line.get('amount_currency', False)) or -abs(line.get('amount_currency', False)),
|
||||
'currency_id': line.get('currency_id', False),
|
||||
'quantity': line.get('quantity', 1.00),
|
||||
'product_id': line.get('product_id', False),
|
||||
'product_uom_id': line.get('uom_id', False),
|
||||
'analytic_account_id': line.get('account_analytic_id', False),
|
||||
'invoice_id': line.get('invoice_id', False),
|
||||
'tax_ids': line.get('tax_ids', False),
|
||||
'tax_line_id': line.get('tax_line_id', False),
|
||||
'analytic_tag_ids': line.get('analytic_tag_ids', False),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class ResConfigSettings(models.TransientModel):
|
|||
module_account_budget = fields.Boolean(string='Budget Management')
|
||||
module_account_payment = fields.Boolean(string='Online Payment')
|
||||
module_account_reports = fields.Boolean("Dynamic Reports")
|
||||
module_account_reports_followup = fields.Boolean("Enable payment followup management")
|
||||
module_account_reports_followup = fields.Boolean("Follow-up Levels")
|
||||
default_sale_tax_id = fields.Many2one('account.tax', string="Default Sale Tax",
|
||||
company_dependent=True, oldname="default_sale_tax")
|
||||
default_purchase_tax_id = fields.Many2one('account.tax', string="Default Purchase Tax",
|
||||
|
|
@ -43,7 +43,7 @@ class ResConfigSettings(models.TransientModel):
|
|||
module_account_batch_deposit = fields.Boolean(string='Use batch deposit',
|
||||
help='This allows you to group received checks before you deposit them to the bank.\n'
|
||||
'-This installs the module account_batch_deposit.')
|
||||
module_account_sepa = fields.Boolean(string='Use SEPA payments')
|
||||
module_account_sepa = fields.Boolean(string='SEPA Credit Transfer (SCT)')
|
||||
module_account_sepa_direct_debit = fields.Boolean(string='Use SEPA Direct Debit')
|
||||
module_account_plaid = fields.Boolean(string="Plaid Connector")
|
||||
module_account_yodlee = fields.Boolean("Bank Interface - Sync your bank feeds automatically")
|
||||
|
|
@ -51,7 +51,7 @@ class ResConfigSettings(models.TransientModel):
|
|||
module_account_bank_statement_import_ofx = fields.Boolean("Import in .ofx format")
|
||||
module_account_bank_statement_import_csv = fields.Boolean("Import in .csv format")
|
||||
module_account_bank_statement_import_camt = fields.Boolean("Import in CAMT.053 format")
|
||||
module_currency_rate_live = fields.Boolean(string="Allow Currency Rate Live")
|
||||
module_currency_rate_live = fields.Boolean(string="Automatic Currency Rates")
|
||||
module_print_docsaway = fields.Boolean(string="Docsaway")
|
||||
module_product_margin = fields.Boolean(string="Allow Product Margin")
|
||||
module_l10n_eu_service = fields.Boolean(string="EU Digital Goods VAT")
|
||||
|
|
@ -63,13 +63,13 @@ class ResConfigSettings(models.TransientModel):
|
|||
@api.model
|
||||
def get_values(self):
|
||||
res = super(ResConfigSettings, self).get_values()
|
||||
params = self.env['ir.config_parameter'].sudo()
|
||||
|
||||
supplier_tax_ids = self.env['ir.default'].get('product.template', "supplier_taxes_id", company_id=True)
|
||||
sale_tax_ids = self.env['ir.default'].get('product.template', "taxes_id", company_id=True)
|
||||
# ONLY FOR v11. DO NOT FORWARD-PORT
|
||||
IrDefault = self.env['ir.default'].sudo()
|
||||
default_sale_tax_id = IrDefault.get('product.template', "taxes_id", company_id=self.company_id.id or self.env.user.company_id.id)
|
||||
default_purchase_tax_id = IrDefault.get('product.template', "supplier_taxes_id", company_id=self.company_id.id or self.env.user.company_id.id)
|
||||
res.update(
|
||||
default_purchase_tax_id=supplier_tax_ids and supplier_tax_ids[0] or False,
|
||||
default_sale_tax_id=sale_tax_ids and sale_tax_ids[0] or False,
|
||||
default_purchase_tax_id=default_purchase_tax_id[0] if default_purchase_tax_id else False,
|
||||
default_sale_tax_id=default_sale_tax_id[0] if default_sale_tax_id else False,
|
||||
)
|
||||
return res
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ class ReportAgedPartnerBalance(models.AbstractModel):
|
|||
_name = 'report.account.report_agedpartnerbalance'
|
||||
|
||||
def _get_partner_move_lines(self, account_type, date_from, target_move, period_length):
|
||||
# This method can receive the context key 'include_nullified_amount' {Boolean}
|
||||
# Do an invoice and a payment and unreconcile. The amount will be nullified
|
||||
# By default, the partner wouldn't appear in this report.
|
||||
# The context key allow it to appear
|
||||
periods = {}
|
||||
start = datetime.strptime(date_from, "%Y-%m-%d")
|
||||
for i in range(5)[::-1]:
|
||||
|
|
@ -27,7 +31,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
|
|||
res = []
|
||||
total = []
|
||||
cr = self.env.cr
|
||||
user_company = self.env.user.company_id.id
|
||||
company_ids = self.env.context.get('company_ids', (self.env.user.company_id.id,))
|
||||
move_state = ['draft', 'posted']
|
||||
if target_move == 'posted':
|
||||
move_state = ['posted']
|
||||
|
|
@ -41,7 +45,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
|
|||
if reconciled_after_date:
|
||||
reconciliation_clause = '(l.reconciled IS FALSE OR l.id IN %s)'
|
||||
arg_list += (tuple(reconciled_after_date),)
|
||||
arg_list += (date_from, user_company)
|
||||
arg_list += (date_from, tuple(company_ids))
|
||||
query = '''
|
||||
SELECT DISTINCT l.partner_id, UPPER(res_partner.name)
|
||||
FROM account_move_line AS l left join res_partner on l.partner_id = res_partner.id, account_account, account_move am
|
||||
|
|
@ -51,7 +55,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
|
|||
AND (account_account.internal_type IN %s)
|
||||
AND ''' + reconciliation_clause + '''
|
||||
AND (l.date <= %s)
|
||||
AND l.company_id = %s
|
||||
AND l.company_id IN %s
|
||||
ORDER BY UPPER(res_partner.name)'''
|
||||
cr.execute(query, arg_list)
|
||||
|
||||
|
|
@ -76,8 +80,8 @@ class ReportAgedPartnerBalance(models.AbstractModel):
|
|||
AND (COALESCE(l.date_maturity,l.date) > %s)\
|
||||
AND ((l.partner_id IN %s) OR (l.partner_id IS NULL))
|
||||
AND (l.date <= %s)
|
||||
AND l.company_id = %s'''
|
||||
cr.execute(query, (tuple(move_state), tuple(account_type), date_from, tuple(partner_ids), date_from, user_company))
|
||||
AND l.company_id IN %s'''
|
||||
cr.execute(query, (tuple(move_state), tuple(account_type), date_from, tuple(partner_ids), date_from, tuple(company_ids)))
|
||||
aml_ids = cr.fetchall()
|
||||
aml_ids = aml_ids and [x[0] for x in aml_ids] or []
|
||||
for line in self.env['account.move.line'].browse(aml_ids):
|
||||
|
|
@ -117,7 +121,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
|
|||
else:
|
||||
dates_query += ' <= %s)'
|
||||
args_list += (periods[str(i)]['stop'],)
|
||||
args_list += (date_from, user_company)
|
||||
args_list += (date_from, tuple(company_ids))
|
||||
|
||||
query = '''SELECT l.id
|
||||
FROM account_move_line AS l, account_account, account_move am
|
||||
|
|
@ -127,7 +131,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
|
|||
AND ((l.partner_id IN %s) OR (l.partner_id IS NULL))
|
||||
AND ''' + dates_query + '''
|
||||
AND (l.date <= %s)
|
||||
AND l.company_id = %s'''
|
||||
AND l.company_id IN %s'''
|
||||
cr.execute(query, args_list)
|
||||
partners_amount = {}
|
||||
aml_ids = cr.fetchall()
|
||||
|
|
@ -190,7 +194,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
|
|||
values['name'] = _('Unknown Partner')
|
||||
values['trust'] = False
|
||||
|
||||
if at_least_one_amount:
|
||||
if at_least_one_amount or self._context.get('include_nullified_amount'):
|
||||
res.append(values)
|
||||
|
||||
return res, total, lines
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ class ReportOverdue(models.AbstractModel):
|
|||
"FROM account_move_line l "
|
||||
"JOIN account_account_type at ON (l.user_type_id = at.id) "
|
||||
"JOIN account_move m ON (l.move_id = m.id) "
|
||||
"WHERE l.partner_id IN %s AND at.type IN ('receivable', 'payable') AND NOT l.reconciled GROUP BY l.date, l.name, l.ref, l.date_maturity, l.partner_id, at.type, l.blocked, l.amount_currency, l.currency_id, l.move_id, m.name", (((fields.date.today(), ) + (tuple(partner_ids),))))
|
||||
"WHERE l.partner_id IN %s AND at.type IN ('receivable', 'payable') AND l.full_reconcile_id IS NULL GROUP BY l.date, l.name, l.ref, l.date_maturity, l.partner_id, at.type, l.blocked, l.amount_currency, l.currency_id, l.move_id, m.name", (((fields.date.today(), ) + (tuple(partner_ids),))))
|
||||
for row in self.env.cr.dictfetchall():
|
||||
res[row.pop('partner_id')].append(row)
|
||||
return res
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class ReportPartnerLedger(models.AbstractModel):
|
|||
full_account = []
|
||||
currency = self.env['res.currency']
|
||||
query_get_data = self.env['account.move.line'].with_context(data['form'].get('used_context', {}))._query_get()
|
||||
reconcile_clause = "" if data['form']['reconciled'] else ' AND "account_move_line".reconciled = false '
|
||||
reconcile_clause = "" if data['form']['reconciled'] else ' AND "account_move_line".full_reconcile_id IS NULL '
|
||||
params = [partner.id, tuple(data['computed']['move_state']), tuple(data['computed']['account_ids'])] + query_get_data[2]
|
||||
query = """
|
||||
SELECT "account_move_line".id, "account_move_line".date, j.code, acc.code as a_code, acc.name as a_name, "account_move_line".ref, m.name as move_name, "account_move_line".name, "account_move_line".debit, "account_move_line".credit, "account_move_line".amount_currency,"account_move_line".currency_id, c.symbol AS currency_code
|
||||
|
|
@ -51,7 +51,7 @@ class ReportPartnerLedger(models.AbstractModel):
|
|||
return
|
||||
result = 0.0
|
||||
query_get_data = self.env['account.move.line'].with_context(data['form'].get('used_context', {}))._query_get()
|
||||
reconcile_clause = "" if data['form']['reconciled'] else ' AND "account_move_line".reconciled = false '
|
||||
reconcile_clause = "" if data['form']['reconciled'] else ' AND "account_move_line".full_reconcile_id IS NULL '
|
||||
|
||||
params = [partner.id, tuple(data['computed']['move_state']), tuple(data['computed']['account_ids'])] + query_get_data[2]
|
||||
query = """SELECT sum(""" + field + """)
|
||||
|
|
@ -95,7 +95,7 @@ class ReportPartnerLedger(models.AbstractModel):
|
|||
AND NOT a.deprecated""", (tuple(data['computed']['ACCOUNT_TYPE']),))
|
||||
data['computed']['account_ids'] = [a for (a,) in self.env.cr.fetchall()]
|
||||
params = [tuple(data['computed']['move_state']), tuple(data['computed']['account_ids'])] + query_get_data[2]
|
||||
reconcile_clause = "" if data['form']['reconciled'] else ' AND "account_move_line".reconciled = false '
|
||||
reconcile_clause = "" if data['form']['reconciled'] else ' AND "account_move_line".full_reconcile_id IS NULL '
|
||||
query = """
|
||||
SELECT DISTINCT "account_move_line".partner_id
|
||||
FROM """ + query_get_data[0] + """, account_account AS account, account_move AS am
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@
|
|||
<field name="groups_id" eval="[(4, ref('account.group_account_invoice')), (4, ref('account.group_account_manager'))]"/>
|
||||
</record>
|
||||
|
||||
<record id="base.group_system" model="res.groups">
|
||||
<field name="implied_ids" eval="[(4, ref('account.group_account_manager'))]"/>
|
||||
</record>
|
||||
|
||||
<record id="group_warning_account" model="res.groups">
|
||||
<field name="name">A warning can be set on a partner (Account)</field>
|
||||
<field name="category_id" ref="base.module_category_hidden"/>
|
||||
|
|
|
|||
|
|
@ -359,7 +359,11 @@ var ManualAction = StatementAction.extend({
|
|||
title: self.title,
|
||||
time: Date.now()-self.time,
|
||||
});
|
||||
self._openFirstLine();
|
||||
if(!_.any(result.updated, function (handle) {
|
||||
return self.model.getLine(handle).mode !== 'inactive';
|
||||
})) {
|
||||
self._openFirstLine();
|
||||
}
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -501,7 +501,7 @@ var StatementModel = BasicModel.extend({
|
|||
var amount = line.balance.amount;
|
||||
var amount_str = _.str.sprintf('%.2f', Math.abs(amount));
|
||||
amount_str = (amount > '0' ? '-' : '+') + amount_str;
|
||||
if (line.balance.amount_currency) {
|
||||
if (line.balance.currency_id && line.balance.amount_currency) {
|
||||
var amount_currency = line.balance.amount_currency;
|
||||
var amount_currency_str = _.str.sprintf('%.2f', Math.abs(amount_currency));
|
||||
amount_str += '|' + (amount_currency > '0' ? '-' : '+') + amount_currency_str;
|
||||
|
|
@ -524,17 +524,37 @@ var StatementModel = BasicModel.extend({
|
|||
*/
|
||||
togglePartialReconcile: function (handle) {
|
||||
var line = this.getLine(handle);
|
||||
var props = _.filter(line.reconciliation_proposition, {'invalid': false});
|
||||
var prop = props[0];
|
||||
if (props.length !== 1 || Math.abs(line.st_line.amount) >= Math.abs(prop.amount)) {
|
||||
|
||||
// Retrieve the toggle proposition
|
||||
var selected;
|
||||
_.each(line.reconciliation_proposition, function (prop) {
|
||||
if (!prop.invalid) {
|
||||
if (((line.balance.amount < 0 || !line.partial_reconcile) && prop.amount > 0 && line.st_line.amount > 0 && line.st_line.amount < prop.amount) ||
|
||||
((line.balance.amount > 0 || !line.partial_reconcile) && prop.amount < 0 && line.st_line.amount < 0 && line.st_line.amount > prop.amount)) {
|
||||
selected = prop;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// If no toggled proposition found, reject it
|
||||
if (selected == null)
|
||||
return $.Deferred().reject();
|
||||
}
|
||||
prop.partial_reconcile = !prop.partial_reconcile;
|
||||
if (!prop.partial_reconcile) {
|
||||
|
||||
// Inverse partial_reconcile value
|
||||
selected.partial_reconcile = !selected.partial_reconcile;
|
||||
if (!selected.partial_reconcile) {
|
||||
return this._computeLine(line);
|
||||
}
|
||||
|
||||
// Compute the write_off
|
||||
var format_options = { currency_id: line.st_line.currency_id };
|
||||
selected.write_off_amount = selected.amount + line.balance.amount;
|
||||
selected.write_off_amount_str = field_utils.format.monetary(Math.abs(selected.write_off_amount), {}, format_options);
|
||||
selected.write_off_amount_str = selected.write_off_amount_str.replace(' ', ' ');
|
||||
|
||||
return this._computeLine(line).then(function () {
|
||||
if (prop.partial_reconcile) {
|
||||
if (selected.partial_reconcile) {
|
||||
line.balance.amount = 0;
|
||||
line.balance.type = 1;
|
||||
line.mode = 'inactive';
|
||||
|
|
@ -594,7 +614,7 @@ var StatementModel = BasicModel.extend({
|
|||
handles = [handle];
|
||||
} else {
|
||||
_.each(this.lines, function (line, handle) {
|
||||
if (!line.reconciled && !line.balance.amount && line.reconciliation_proposition.length) {
|
||||
if (!line.reconciled && line.balance && !line.balance.amount && line.reconciliation_proposition.length) {
|
||||
handles.push(handle);
|
||||
}
|
||||
});
|
||||
|
|
@ -605,9 +625,14 @@ var StatementModel = BasicModel.extend({
|
|||
var line = self.getLine(handle);
|
||||
var props = _.filter(line.reconciliation_proposition, function (prop) {return !prop.is_tax && !prop.invalid;});
|
||||
if (props.length === 0) {
|
||||
// Usability: if user has not choosen any lines and click validate, it has the same behavior
|
||||
// as creating a write-off of the same amount.
|
||||
props.push(self._formatQuickCreate(line, {
|
||||
account_id: [line.st_line.open_balance_account_id, self.accounts[line.st_line.open_balance_account_id]],
|
||||
}));
|
||||
// update balance of line otherwise it won't be to zero and another line will be added
|
||||
line.reconciliation_proposition.push(props[0]);
|
||||
self._computeLine(line);
|
||||
}
|
||||
ids.push(line.id);
|
||||
var values_dict = {
|
||||
|
|
@ -622,6 +647,7 @@ var StatementModel = BasicModel.extend({
|
|||
return isNaN(prop.id);
|
||||
}), self._formatToProcessReconciliation.bind(self, line)),
|
||||
};
|
||||
|
||||
// If the lines are not fully balanced, create an unreconciled amount.
|
||||
// line.st_line.currency_id is never false here because its equivalent to
|
||||
// statement_line.currency_id or statement_line.journal_id.currency_id or statement_line.journal_id.company_id.currency_id (Python-side).
|
||||
|
|
@ -773,6 +799,8 @@ var StatementModel = BasicModel.extend({
|
|||
'__focus': false
|
||||
});
|
||||
|
||||
prop.computed_with_tax = tax.price_include
|
||||
prop.tax_amount = tax.amount
|
||||
prop.amount = tax.base;
|
||||
prop.amount_str = field_utils.format.monetary(Math.abs(prop.amount), {}, formatOptions);
|
||||
prop.invalid = !self._isValid(prop);
|
||||
|
|
@ -814,14 +842,13 @@ var StatementModel = BasicModel.extend({
|
|||
amount: total,
|
||||
amount_str: field_utils.format.monetary(Math.abs(total), {}, formatOptions),
|
||||
currency_id: isOtherCurrencyId,
|
||||
amount_currency: isOtherCurrencyId ? amount_currency : false,
|
||||
amount_currency: isOtherCurrencyId ? amount_currency : total,
|
||||
amount_currency_str: isOtherCurrencyId ? field_utils.format.monetary(Math.abs(amount_currency), {}, {
|
||||
currency_id: isOtherCurrencyId
|
||||
}) : false,
|
||||
account_code: self.accounts[line.st_line.open_balance_account_id],
|
||||
};
|
||||
line.balance.type = (isOtherCurrencyId && amount_currency || line.balance.amount) ?
|
||||
(line.balance.amount > 0 && line.st_line.partner_id ? 0 : -1) : 1;
|
||||
line.balance.type = line.balance.amount_currency ? (line.balance.amount_currency > 0 && line.st_line.partner_id ? 0 : -1) : 1;
|
||||
});
|
||||
},
|
||||
/**
|
||||
|
|
@ -1042,14 +1069,20 @@ var StatementModel = BasicModel.extend({
|
|||
* @returns {object}
|
||||
*/
|
||||
_formatToProcessReconciliation: function (line, prop) {
|
||||
var amount = -prop.amount;
|
||||
// Do not forward port in master. @CSN will change this
|
||||
var amount = prop.computed_with_tax && -prop.base_amount || -prop.amount;
|
||||
if (prop.partial_reconcile === true) {
|
||||
amount = -line.st_line.amount;
|
||||
amount = -prop.write_off_amount;
|
||||
}
|
||||
|
||||
var result = {
|
||||
name : prop.label,
|
||||
debit : amount > 0 ? amount : 0,
|
||||
credit : amount < 0 ? -amount : 0,
|
||||
// This one isn't usefull for the server,
|
||||
// But since we need to change the amount (and thus its semantics) into base_amount
|
||||
// It might be useful to have a trace in the RPC for debugging purposes
|
||||
computed_with_tax: prop.computed_with_tax,
|
||||
};
|
||||
if (!isNaN(prop.id)) {
|
||||
result.counterpart_aml_id = prop.id;
|
||||
|
|
@ -1283,7 +1316,7 @@ var ManualModel = StatementModel.extend({
|
|||
return this._super(line).then(function () {
|
||||
var props = _.reject(line.reconciliation_proposition, 'invalid');
|
||||
line.balance.type = -1;
|
||||
if (!line.balance.amount && props.length) {
|
||||
if (!line.balance.amount_currency && props.length) {
|
||||
line.balance.type = 1;
|
||||
} else if(_.any(props, function (prop) {return prop.amount > 0;}) &&
|
||||
_.any(props, function (prop) {return prop.amount < 0;})) {
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ var StatementRenderer = Widget.extend(FieldManagerMixin, {
|
|||
if (state.valuenow === state.valuemax && !this.$('.done_message').length) {
|
||||
var dt = Date.now()-this.time;
|
||||
var $done = $(qweb.render("reconciliation.done", {
|
||||
'duration': moment(dt).utc().format(time.strftime_to_moment_format(_t.database.parameters.time_format)),
|
||||
'duration': moment(dt).utc().format(time.getLangTimeFormat()),
|
||||
'number': state.valuenow,
|
||||
'timePerTransaction': Math.round(dt/1000/state.valuemax),
|
||||
'context': state.context,
|
||||
|
|
@ -354,7 +354,21 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
|
|||
|
||||
// reconciliation_proposition
|
||||
var $props = this.$('.accounting_view tbody').empty();
|
||||
var props = _.filter(state.reconciliation_proposition, {'display': true});
|
||||
|
||||
// loop state propositions
|
||||
var props = [];
|
||||
var nb_debit_props = 0;
|
||||
var nb_credit_props = 0;
|
||||
_.each(state.reconciliation_proposition, function (prop) {
|
||||
if (prop.display) {
|
||||
props.push(prop);
|
||||
if (prop.amount < 0)
|
||||
nb_debit_props += 1;
|
||||
else if (prop.amount > 0)
|
||||
nb_credit_props += 1;
|
||||
}
|
||||
});
|
||||
|
||||
_.each(props, function (line) {
|
||||
var $line = $(qweb.render("reconciliation.line.mv_line", {'line': line, 'state': state}));
|
||||
if (!isNaN(line.id)) {
|
||||
|
|
@ -362,18 +376,16 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
|
|||
.appendTo($line.find('.cell_info_popover'))
|
||||
.attr("data-content", qweb.render('reconciliation.line.mv_line.details', {'line': line}));
|
||||
}
|
||||
|
||||
if ((state.balance.amount !== 0 || line.partial_reconcile) && props.length === 1 &&
|
||||
line.already_paid === false &&
|
||||
(
|
||||
(state.st_line.amount > 0 && state.st_line.amount < props[0].amount) ||
|
||||
(state.st_line.amount < 0 && state.st_line.amount > props[0].amount))
|
||||
) {
|
||||
if (line.already_paid === false &&
|
||||
((state.balance.amount_currency < 0 || line.partial_reconcile) && nb_credit_props == 1
|
||||
&& line.amount > 0 && state.st_line.amount > 0 && state.st_line.amount < line.amount) ||
|
||||
((state.balance.amount_currency > 0 || line.partial_reconcile) && nb_debit_props == 1
|
||||
&& line.amount < 0 && state.st_line.amount < 0 && state.st_line.amount > line.amount)) {
|
||||
var $cell = $line.find(line.amount > 0 ? '.cell_right' : '.cell_left');
|
||||
var text;
|
||||
if (line.partial_reconcile) {
|
||||
text = _t("Undo the partial reconciliation.");
|
||||
$cell.text(state.st_line.amount_str);
|
||||
$cell.text(line.write_off_amount_str);
|
||||
} else {
|
||||
text = _t("This move's amount is higher than the transaction's amount. Click to register a partial payment and keep the payment balance open.");
|
||||
}
|
||||
|
|
@ -415,17 +427,18 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
|
|||
this._renderCreate(state);
|
||||
}
|
||||
var data = this.model.get(this.handleCreateRecord).data;
|
||||
this.model.notifyChanges(this.handleCreateRecord, state.createForm);
|
||||
var record = this.model.get(this.handleCreateRecord);
|
||||
_.each(this.fields, function (field, fieldName) {
|
||||
if (self._avoidFieldUpdate[fieldName]) return;
|
||||
if (fieldName === "partner_id") return;
|
||||
if ((data[fieldName] || state.createForm[fieldName]) && !_.isEqual(state.createForm[fieldName], data[fieldName])) {
|
||||
field.reset(record);
|
||||
}
|
||||
this.model.notifyChanges(this.handleCreateRecord, state.createForm).then(function () {
|
||||
var record = self.model.get(self.handleCreateRecord);
|
||||
_.each(self.fields, function (field, fieldName) {
|
||||
if (self._avoidFieldUpdate[fieldName]) return;
|
||||
if (fieldName === "partner_id") return;
|
||||
if ((data[fieldName] || state.createForm[fieldName]) && !_.isEqual(state.createForm[fieldName], data[fieldName])) {
|
||||
field.reset(record);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
this.$('.create .add_line').toggle(!!state.balance.amount);
|
||||
this.$('.create .add_line').toggle(!!state.balance.amount_currency);
|
||||
},
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
|
|
@ -613,7 +626,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
|
|||
/**
|
||||
* @private
|
||||
*/
|
||||
_onFilterChange: function () {
|
||||
_onFilterChange: function (event) {
|
||||
this.trigger_up('change_filter', {'data': _.str.strip($(event.target).val())});
|
||||
},
|
||||
/**
|
||||
|
|
@ -626,7 +639,8 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
|
|||
return;
|
||||
}
|
||||
if(event.keyCode === 13) {
|
||||
if (_.findWhere(this.model.lines, {mode: 'create'}).balance.amount) {
|
||||
var created_lines = _.findWhere(this.model.lines, {mode: 'create'});
|
||||
if (created_lines && created_lines.balance.amount) {
|
||||
this._onCreateProposition();
|
||||
}
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
.o_kanban_view.o_kanban_dashboard.o_account_kanban {
|
||||
.o_kanban_record {
|
||||
width: 450px;
|
||||
|
||||
.oe_kanban_action_button {
|
||||
margin-bottom: 5px;
|
||||
|
|
@ -32,12 +31,13 @@
|
|||
}
|
||||
}
|
||||
|
||||
&.o_kanban_grouped .o_kanban_record {
|
||||
min-width: inherit;
|
||||
&.o_kanban_ungrouped {
|
||||
.o_kanban_record {
|
||||
width: 450px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Style for the widget "dashboard_graph"
|
||||
.o_dashboard_graph {
|
||||
&.o_graph_linechart {
|
||||
|
|
|
|||
|
|
@ -124,13 +124,13 @@
|
|||
</t>
|
||||
|
||||
<t t-name="reconciliation.line.balance">
|
||||
<tr t-if="state.balance.amount && !(state.reconciliation_proposition[0] || {}).partial_reconcile">
|
||||
<tr t-if="state.balance.amount_currency && !(state.reconciliation_proposition[0] || {}).partial_reconcile">
|
||||
<td class="cell_action"><span class="toggle_create fa fa-play"></span></td>
|
||||
<td class="cell_account_code"><t t-esc="state.balance.account_code"/></td>
|
||||
<td class="cell_due_date"></td>
|
||||
<td class="cell_label"><t t-if="state.balance.amount < 0">Create Write-off</t><t t-elif="state.st_line.partner_id">Open balance</t><t t-else="">Choose counterpart</t></td>
|
||||
<td class="cell_left"><t t-if="state.balance.amount < 0"><span t-if="state.balance.amount_currency_str" t-attf-class="o_multi_currency o_multi_currency_color_#{state.balance.currency_id%8} line_info_button fa fa-money" t-att-data-content="state.balance.amount_currency_str"/><t t-raw="state.balance.amount_str"/></t></td>
|
||||
<td class="cell_right"><t t-if="state.balance.amount > 0"><span t-if="state.balance.amount_currency_str" t-attf-class="o_multi_currency o_multi_currency_color_#{state.balance.currency_id%8} line_info_button fa fa-money" t-att-data-content="state.balance.amount_currency_str"/><t t-raw="state.balance.amount_str"/></t></td>
|
||||
<td class="cell_label"><t t-if="state.balance.amount_currency < 0">Create Write-off</t><t t-elif="state.st_line.partner_id">Open balance</t><t t-else="">Choose counterpart</t></td>
|
||||
<td class="cell_left"><t t-if="state.balance.amount_currency < 0"><span t-if="state.balance.amount_currency_str" t-attf-class="o_multi_currency o_multi_currency_color_#{state.balance.currency_id%8} line_info_button fa fa-money" t-att-data-content="state.balance.amount_currency_str"/><t t-raw="state.balance.amount_str"/></t></td>
|
||||
<td class="cell_right"><t t-if="state.balance.amount_currency > 0"><span t-if="state.balance.amount_currency_str" t-attf-class="o_multi_currency o_multi_currency_color_#{state.balance.currency_id%8} line_info_button fa fa-money" t-att-data-content="state.balance.amount_currency_str"/><t t-raw="state.balance.amount_str"/></t></td>
|
||||
<td class="cell_info_popover"></td>
|
||||
</tr>
|
||||
</t>
|
||||
|
|
|
|||
|
|
@ -34,17 +34,22 @@ var db = {
|
|||
fields: {
|
||||
id: {string: "ID", type: 'integer'},
|
||||
code: {string: "code", type: 'integer'},
|
||||
display_name: {string: "Displayed name", type: 'char'},
|
||||
name: {string: "Displayed name", type: 'char'},
|
||||
},
|
||||
records: [
|
||||
{id: 282, code: 100000, display_name: "100000 Fixed Asset Account"},
|
||||
{id: 283, code: 101000, display_name: "101000 Current Assets"},
|
||||
{id: 284, code: 101110, display_name: "101110 Stock Valuation Account"},
|
||||
{id: 285, code: 101120, display_name: "101120 Stock Interim Account (Received)"},
|
||||
{id: 286, code: 101130, display_name: "101130 Stock Interim Account (Delivered)"},
|
||||
{id: 287, code: 101200, display_name: "101200 Account Receivable"},
|
||||
{id: 288, code: 101300, display_name: "101300 Tax Paid"},
|
||||
{id: 308, code: 101401, display_name: "101401 Bank"},
|
||||
{id: 282, code: 100000, name: "100000 Fixed Asset Account"},
|
||||
{id: 283, code: 101000, name: "101000 Current Assets"},
|
||||
{id: 284, code: 101110, name: "101110 Stock Valuation Account"},
|
||||
{id: 285, code: 101120, name: "101120 Stock Interim Account (Received)"},
|
||||
{id: 286, code: 101130, name: "101130 Stock Interim Account (Delivered)"},
|
||||
{id: 287, code: 101200, name: "101200 Account Receivable"},
|
||||
{id: 288, code: 101300, name: "101300 Tax Paid"},
|
||||
{id: 308, code: 101401, name: "101401 Bank"},
|
||||
{id: 500, code: 500, name: "500 Account"},
|
||||
{id: 501, code: 501, name: "501 Account"},
|
||||
{id: 502, code: 502, name: "502 Account"},
|
||||
{id: 503, code: 503, name: "503 Account"},
|
||||
{id: 504, code: 504, name: "504 Account"},
|
||||
],
|
||||
mark_as_reconciled: function () {
|
||||
return $.when();
|
||||
|
|
@ -448,7 +453,10 @@ var move_lines_for_manual_reconciliation = {
|
|||
'[7,12,"",0,6]': [
|
||||
{'account_type': "receivable", 'account_id': [287, "101200 Account Receivable"], 'amount_currency_str': "", 'currency_id': false, 'date_maturity': "2017-02-08", 'date': "2017-02-08", 'total_amount_str': "$ 11,000.00", 'partner_id': 12, 'account_name': "101200 Account Receivable", 'name': "INV/2017/0004: Customer Payment", 'partner_name': "Camptocamp", 'total_amount_currency_str': "", 'id': 17, 'credit': 11000.0, 'journal_id': [1, "Customer Invoices"], 'amount_str': "$ 11,000.00", 'debit': 0.0, 'account_code': "101200", 'ref': "", 'already_paid': false},
|
||||
{'account_type': "receivable", 'account_id': [7, "101200 Account Receivable"], 'amount_currency_str': "", 'currency_id': false, 'date_maturity': "2017-02-09", 'date': "2017-02-09", 'total_amount_str': "$ 1,000.00", 'partner_id': 12, 'account_name': "101200 Account Receivable", 'name': "INV/2017/0005: Customer Payment", 'partner_name': "Camptocamp", 'total_amount_currency_str': "", 'id': 19, 'credit': 1000.0, 'journal_id': [1, "Customer Invoices"], 'amount_str': "$ 1,000.00", 'debit': 0.0, 'account_code': "101200", 'ref': "", 'already_paid': false},
|
||||
{'account_type': "receivable", 'account_id': [287, "101200 Account Receivable"], 'amount_currency_str': "", 'currency_id': false, 'date_maturity': "2017-02-09", 'date': "2017-02-09", 'total_amount_str': "$ 180.00", 'partner_id': 12, 'account_name': "101200 Account Receivable", 'name': "BILL/2017/0003: Customer Payment", 'partner_name': "Camptocamp", 'total_amount_currency_str': "", 'id': 21, 'credit': 180.0, 'journal_id': [2, "Vendor Bills"], 'amount_str': "$ 180.00", 'debit': 0.0, 'account_code': "101200", 'ref': "fddfgfdgfdgsdfg", 'already_paid': false},
|
||||
{'account_type': "receivable", 'account_id': [287, "101200 Account Receivable"], 'amount_currency': 100, 'amount_currency_str': "100.00 €", 'currency_id': 1, 'date_maturity': "2017-02-09", 'date': "2017-02-09", 'total_amount_str': "$ 170.00", 'partner_id': 12, 'account_name': "101200 Account Receivable", 'name': "INV/2017/0003: Customer Payment", 'partner_name': "Camptocamp", 'total_amount_currency_str': "", 'id': 21, 'credit': 0.0, 'journal_id': [1, "Customer Invoices"], 'amount_str': "$ 170.00", 'debit': 170.0, 'account_code': "101200", 'ref': "INV fddfgfdgfdgsdfg", 'already_paid': false},
|
||||
{'account_type': "receivable", 'account_id': [287, "101200 Account Receivable"], 'amount_currency': 100, 'amount_currency_str': "100.00 €", 'currency_id': 1, 'date_maturity': "2017-02-10", 'date': "2017-02-10", 'total_amount_str': "$ 180.00", 'partner_id': 12, 'account_name': "101200 Account Receivable", 'name': "BILL/2017/0003: Customer Payment", 'partner_name': "Camptocamp", 'total_amount_currency_str': "", 'id': 22, 'credit': 180.0, 'journal_id': [2, "Vendor Bills"], 'amount_str': "$ 180.00", 'debit': 0.0, 'account_code': "101200", 'ref': "fddfgfdgfdgsdfg", 'already_paid': false},
|
||||
{'account_type': "receivable", 'account_id': [287, "101200 Account Receivable"], 'amount_currency': 170, 'amount_currency_str': "170.00 €", 'currency_id': 1, 'date_maturity': "2017-02-09", 'date': "2017-02-09", 'total_amount_str': "$ 100.00", 'partner_id': 12, 'account_name': "101200 Account Receivable", 'name': "INV/2017/0003: Customer Payment", 'partner_name': "Camptocamp", 'total_amount_currency_str': "", 'id': 23, 'credit': 0.0, 'journal_id': [1, "Customer Invoices"], 'amount_str': "$ 100.00", 'debit': 100.0, 'account_code': "101200", 'ref': "INV fddfgfdgfdgsdfg", 'already_paid': false},
|
||||
{'account_type': "receivable", 'account_id': [287, "101200 Account Receivable"], 'amount_currency': 180, 'amount_currency_str': "180.00 €", 'currency_id': 1, 'date_maturity': "2017-02-10", 'date': "2017-02-10", 'total_amount_str': "$ 100.00", 'partner_id': 12, 'account_name': "101200 Account Receivable", 'name': "BILL/2017/0003: Customer Payment", 'partner_name': "Camptocamp", 'total_amount_currency_str': "", 'id': 24, 'credit': 100.0, 'journal_id': [2, "Vendor Bills"], 'amount_str': "$ 100.00", 'debit': 0.0, 'account_code': "101200", 'ref': "fddfgfdgfdgsdfg", 'already_paid': false},
|
||||
],
|
||||
'[284,8,"",0,6]': [
|
||||
{'account_type': "receivable", 'account_id': [284, "111100 Account Payable"], 'amount_currency_str': "", 'currency_id': false, 'date_maturity': "2017-02-08", 'date': "2017-02-08", 'total_amount_str': "$ 11,000.00", 'partner_id': 8, 'account_name': "101200 Account Receivable", 'name': "INV/2017/0004: Customer Payment", 'partner_name': "Agrolait", 'total_amount_currency_str': "", 'id': 17, 'credit': 11000.0, 'journal_id': [1, "Customer Invoices"], 'amount_str': "$ 11,000.00", 'debit': 0.0, 'account_code': "111100", 'ref': "", 'already_paid': false},
|
||||
|
|
@ -658,6 +666,98 @@ QUnit.module('account', {
|
|||
clientAction.destroy();
|
||||
});
|
||||
|
||||
QUnit.test('Reconciliation validate without proposition', function (assert) {
|
||||
assert.expect(1);
|
||||
// Test added to prevent this issue happening again: https://github.com/odoo/odoo/commit/3549688b21eb65e16b9c3f2b6462eb8d8b52cd47
|
||||
var clientAction = new ReconciliationClientAction.StatementAction(null, this.params.options);
|
||||
testUtils.addMockEnvironment(clientAction, {
|
||||
data: this.params.data,
|
||||
session: {
|
||||
currencies: {
|
||||
3: {
|
||||
digits: [69, 2],
|
||||
position: "before",
|
||||
symbol: "$"
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
clientAction.appendTo($('#qunit-fixture'));
|
||||
|
||||
var widget = clientAction.widgets[0];
|
||||
// Ensure that when we validate a line without any selection, it is the same
|
||||
// as when we manually create a line with the line.balance and that only one
|
||||
// line is send back to server.
|
||||
testUtils.intercept(clientAction, 'call_service', function (event) {
|
||||
assert.deepEqual(event.data.args[1].args,
|
||||
[[5],[{partner_id: 8, counterpart_aml_dicts: [],
|
||||
payment_aml_ids: [], new_aml_dicts: [{
|
||||
account_id: 287,
|
||||
credit: 1175,
|
||||
debit: 0,
|
||||
name: 'SAJ/2014/002 and SAJ/2014/003'
|
||||
}]}]],
|
||||
"Should call process_reconciliations with ids");
|
||||
});
|
||||
|
||||
// click on validate button
|
||||
widget.$('button.o_validate:not(:hidden)').trigger('click');
|
||||
clientAction.destroy();
|
||||
});
|
||||
|
||||
QUnit.test('Reconciliation validate with proposition', function (assert) {
|
||||
assert.expect(1);
|
||||
// Test added to check this functionality: https://github.com/odoo/odoo/commit/2f3b469dee6f18cbccce1cdf2a81cfe57960c533
|
||||
var clientAction = new ReconciliationClientAction.StatementAction(null, this.params.options);
|
||||
testUtils.addMockEnvironment(clientAction, {
|
||||
data: this.params.data,
|
||||
session: {
|
||||
currencies: {
|
||||
3: {
|
||||
digits: [69, 2],
|
||||
position: "before",
|
||||
symbol: "$"
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
clientAction.appendTo($('#qunit-fixture'));
|
||||
|
||||
var widget = clientAction.widgets[0];
|
||||
// Add a line as proposition
|
||||
// open the first line
|
||||
widget.$('.accounting_view thead td:first').trigger('click');
|
||||
// select propositions
|
||||
widget.$('.match .cell_account_code:first').trigger('click');
|
||||
|
||||
// Ensure that when we validate a line with propositions and that there is a remaining balance
|
||||
// We also create a line which is the open balance.
|
||||
testUtils.intercept(clientAction, 'call_service', function (event) {
|
||||
assert.deepEqual(event.data.args[1].args,
|
||||
[[5],[{partner_id: 8,
|
||||
counterpart_aml_dicts: [{
|
||||
counterpart_aml_id: 109,
|
||||
credit: 650,
|
||||
debit: 0,
|
||||
name: 'INV/2017/0002'
|
||||
}],
|
||||
payment_aml_ids: [],
|
||||
new_aml_dicts: [{
|
||||
account_id: 287,
|
||||
credit: 525,
|
||||
debit: 0,
|
||||
name: 'SAJ/2014/002 and SAJ/2014/003 : Open balance'
|
||||
}]}]],
|
||||
"Should call process_reconciliations with ids");
|
||||
});
|
||||
|
||||
// click on validate button
|
||||
widget.$('button.o_validate:not(:hidden)').trigger('click');
|
||||
clientAction.destroy();
|
||||
});
|
||||
|
||||
QUnit.test('Reconciliation partial', function (assert) {
|
||||
assert.expect(10);
|
||||
|
||||
|
|
@ -672,13 +772,7 @@ QUnit.module('account', {
|
|||
partner_id: false,
|
||||
counterpart_aml_dicts:[],
|
||||
payment_aml_ids: [392],
|
||||
new_aml_dicts: [
|
||||
{
|
||||
"credit": 343.42,
|
||||
"debit": 0,
|
||||
"name": "Bank fees : Open balance"
|
||||
}
|
||||
],
|
||||
new_aml_dicts: [],
|
||||
}]
|
||||
], "should call process_reconciliations with partial reconcile values");
|
||||
}
|
||||
|
|
@ -707,14 +801,14 @@ QUnit.module('account', {
|
|||
assert.notOk( widget.$('.cell_left .line_info_button').length, "should not display the partial reconciliation alert");
|
||||
widget.$('.accounting_view thead td:first').trigger('click');
|
||||
widget.$('.match .cell_account_code:first').trigger('click');
|
||||
assert.equal( widget.$('.accounting_view tbody .cell_left .line_info_button').length, 0, "should not display the partial reconciliation alert");
|
||||
assert.equal( widget.$('.accounting_view tbody .cell_left .line_info_button').length, 1, "should display the partial reconciliation alert");
|
||||
assert.ok( widget.$('button.btn-primary:not(hidden)').length, "should not display the reconcile button");
|
||||
assert.ok( widget.$('.text-danger:not(hidden)').length, "should display counterpart alert");
|
||||
widget.$('.accounting_view .cell_left .line_info_button').trigger('click');
|
||||
assert.strictEqual(widget.$('.accounting_view .cell_left .line_info_button').length, 0, "should not display a partial reconciliation alert");
|
||||
assert.notOk(widget.$('.accounting_view .cell_left .line_info_button').hasClass('do_partial_reconcile_false'), "should not display the partial reconciliation information");
|
||||
assert.strictEqual(widget.$('.accounting_view .cell_left .line_info_button').length, 1, "should display a partial reconciliation alert");
|
||||
assert.notOk(widget.$('.accounting_view .cell_left .line_info_button').hasClass('do_partial_reconcile_true'), "should display the partial reconciliation information");
|
||||
assert.ok( widget.$('button.btn-default:not(hidden)').length, "should display the validate button");
|
||||
assert.strictEqual( widget.$el.data('mode'), "match", "should be inactive mode");
|
||||
assert.strictEqual( widget.$el.data('mode'), "inactive", "should be inactive mode");
|
||||
widget.$('button.btn-default:not(hidden)').trigger('click');
|
||||
|
||||
clientAction.destroy();
|
||||
|
|
@ -932,13 +1026,77 @@ QUnit.module('account', {
|
|||
clientAction.destroy();
|
||||
});
|
||||
|
||||
QUnit.test('Reconciliation create line (many2one test)', function (assert) {
|
||||
assert.expect(5);
|
||||
|
||||
var clientAction = new ReconciliationClientAction.StatementAction(null, this.params.options);
|
||||
var def = $.Deferred();
|
||||
|
||||
testUtils.addMockEnvironment(clientAction, {
|
||||
data: this.params.data,
|
||||
session: {
|
||||
currencies: {
|
||||
3: {
|
||||
digits: [69, 2],
|
||||
position: "before",
|
||||
symbol: "$"
|
||||
}
|
||||
}
|
||||
},
|
||||
archs: {
|
||||
"account.account,false,list": '<tree string="Account"><field name="code"/><field name="name"/></tree>',
|
||||
"account.account,false,search": '<search string="Account"><field name="code"/></search>',
|
||||
},
|
||||
mockRPC: function (route, args) {
|
||||
if (args.method === 'name_get') {
|
||||
return def.then(this._super.bind(this, route, args));
|
||||
}
|
||||
return this._super(route, args);
|
||||
},
|
||||
});
|
||||
|
||||
clientAction.prependTo($('#qunit-fixture'));
|
||||
|
||||
var widget = clientAction.widgets[0];
|
||||
|
||||
// open the first line in write-off mode
|
||||
widget.$('.accounting_view tfoot td:first').trigger('click');
|
||||
|
||||
// select an account with the many2one (drop down)
|
||||
widget.$('.create .create_account_id input').trigger('click');
|
||||
$('.ui-autocomplete .ui-menu-item a:contains(101200)').trigger('mouseenter').trigger('click');
|
||||
assert.strictEqual(widget.$('.create .create_account_id input').val(), "101200 Account Receivable", "Display the selected account");
|
||||
assert.strictEqual(widget.$('tbody:first .cell_account_code').text(), "101200", "Display the code of the selected account");
|
||||
|
||||
// use the many2one select dialog to change the account
|
||||
widget.$('.create .create_account_id input').trigger('click');
|
||||
$('.ui-autocomplete .ui-menu-item a:contains(Search)').trigger('mouseenter').trigger('click');
|
||||
// select the account who does not appear in the drop drown
|
||||
$('.modal tr.o_data_row:contains(502)').click();
|
||||
assert.strictEqual(widget.$('.create .create_account_id input').val(), "101200 Account Receivable", "Selected account does not change");
|
||||
// wait the name_get to render the changes
|
||||
def.resolve();
|
||||
assert.strictEqual(widget.$('.create .create_account_id input').val(), "502 Account", "Display the selected account");
|
||||
assert.strictEqual(widget.$('tbody:first .cell_account_code').text(), "502", "Display the code of the selected account");
|
||||
clientAction.destroy();
|
||||
});
|
||||
|
||||
QUnit.test('Reconciliation create line with taxes', function (assert) {
|
||||
assert.expect(13);
|
||||
|
||||
var clientAction = new ReconciliationClientAction.StatementAction(null, this.params.options);
|
||||
|
||||
testUtils.addMockEnvironment(clientAction, {
|
||||
'data': this.params.data,
|
||||
data: this.params.data,
|
||||
session: {
|
||||
currencies: {
|
||||
3: {
|
||||
digits: [69, 2],
|
||||
position: "before",
|
||||
symbol: "$"
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
clientAction.appendTo($('#qunit-fixture'));
|
||||
|
||||
|
|
@ -950,26 +1108,26 @@ QUnit.module('account', {
|
|||
widget.$('.create .create_label input').val('test1').trigger('input');
|
||||
widget.$('.create .create_amount input').val('1100').trigger('input');
|
||||
|
||||
assert.strictEqual(widget.$('.accounting_view tbody .cell_right:last').text(), "1100.00", "should display the value 1100.00 in left column");
|
||||
assert.strictEqual(widget.$('.accounting_view tbody .cell_right:last').text(), "$\u00a01100.00", "should display the value 1100.00 in left column");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_label').text(), "Open balance", "should display 'Open Balance'");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_right').text(), "75.00", "should display 'Open Balance' with 75.00 in right column");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_right').text(), "$\u00a075.00", "should display 'Open Balance' with 75.00 in right column");
|
||||
assert.strictEqual(widget.$('.accounting_view tbody tr').length, 1, "should have 1 created reconcile lines");
|
||||
|
||||
widget.$('.create .create_tax_id input').trigger('click');
|
||||
$('.ui-autocomplete .ui-menu-item a:contains(10.00%)').trigger('mouseenter').trigger('click');
|
||||
|
||||
assert.strictEqual(widget.$('.accounting_view tbody .cell_right').text().replace('$_', ''), "1000.00100.00", "should have 2 created reconcile lines with right column values");
|
||||
assert.strictEqual(widget.$('.accounting_view tbody .cell_right').text().replace('$_', ''), "$\u00a01000.00$\u00a0100.00", "should have 2 created reconcile lines with right column values");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_label').text(), "Open balance", "should display 'Open Balance'");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_right').text(), "75.00", "should display 'Open Balance' with 75.00 in right column");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_right').text(), "$\u00a075.00", "should display 'Open Balance' with 75.00 in right column");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_left').text(), "", "should display 'Open Balance' without any value in left column");
|
||||
assert.strictEqual(widget.$('.accounting_view tbody tr').length, 2, "should have 2 created reconcile lines");
|
||||
|
||||
widget.$('.create .create_tax_id input').trigger('click');
|
||||
$('.ui-autocomplete .ui-menu-item a:contains(20.00%)').trigger('mouseenter').trigger('click');
|
||||
|
||||
assert.strictEqual(widget.$('.accounting_view tbody .cell_right').text().replace('$_', ''), "1100.00220.00", "should have 2 created reconcile lines with right column values");
|
||||
assert.strictEqual(widget.$('.accounting_view tbody .cell_right').text().replace('$_', ''), "$\u00a01100.00$\u00a0220.00", "should have 2 created reconcile lines with right column values");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_label').text(), "Create Write-off", "should display 'Create Write-off'");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_left').text(), "145.00", "should display 'Create Write-off' with 145.00 in right column");
|
||||
assert.strictEqual(widget.$('.accounting_view tfoot .cell_left').text(), "$\u00a0145.00", "should display 'Create Write-off' with 145.00 in right column");
|
||||
assert.strictEqual(widget.$('.accounting_view tbody tr').length, 2, "should have 2 created reconcile lines");
|
||||
|
||||
clientAction.destroy();
|
||||
|
|
@ -981,7 +1139,7 @@ QUnit.module('account', {
|
|||
var clientAction = new ReconciliationClientAction.StatementAction(null, this.params.options);
|
||||
|
||||
testUtils.addMockEnvironment(clientAction, {
|
||||
'data': this.params.data,
|
||||
data: this.params.data,
|
||||
});
|
||||
clientAction.appendTo($('#qunit-fixture'));
|
||||
|
||||
|
|
@ -1025,7 +1183,7 @@ QUnit.module('account', {
|
|||
testUtils.addMockEnvironment(clientAction, {
|
||||
'data': this.params.data,
|
||||
});
|
||||
clientAction.appendTo($('body'));
|
||||
clientAction.appendTo($('#qunit-fixture'));
|
||||
|
||||
clientAction.$('button.o_automatic_reconciliation').trigger('click');
|
||||
|
||||
|
|
@ -1049,7 +1207,7 @@ QUnit.module('account', {
|
|||
});
|
||||
|
||||
QUnit.test('Reconciliation manual', function (assert) {
|
||||
assert.expect(8);
|
||||
assert.expect(13);
|
||||
|
||||
var clientAction = new ReconciliationClientAction.ManualAction(null, this.params.options);
|
||||
|
||||
|
|
@ -1079,6 +1237,23 @@ QUnit.module('account', {
|
|||
|
||||
assert.strictEqual(clientAction.$('.accounting_view:first .o_no_valid:visible').length, 1, "should display the skip button");
|
||||
|
||||
clientAction.$('.accounting_view:eq(1) thead td:first').trigger('click');
|
||||
clientAction.$('.o_reconciliation_line:eq(1) [data-line-id="21"] .cell_label').trigger('click');
|
||||
clientAction.$('.o_reconciliation_line:eq(1) [data-line-id="22"] .cell_label').trigger('click');
|
||||
|
||||
assert.strictEqual(clientAction.$('.o_reconciliation_line:eq(1) tfoot tr').length, 0, "should not display the 'Write-off' line because the balance is null in Euro");
|
||||
assert.strictEqual(clientAction.$('.o_reconciliation_line:eq(1) .o_reconcile:visible').length, 1, "should display 'Reconcile' button in green");
|
||||
|
||||
clientAction.$('.o_reconciliation_line:eq(1) .o_reconcile:visible').trigger('click');
|
||||
|
||||
assert.strictEqual(clientAction.$('.o_reconciliation_line[data-mode!="inactive"]').length, 1, "should have only one line open");
|
||||
|
||||
clientAction.$('.o_reconciliation_line:eq(1) [data-line-id="23"] .cell_label').trigger('click');
|
||||
clientAction.$('.o_reconciliation_line:eq(1) [data-line-id="24"] .cell_label').trigger('click');
|
||||
|
||||
assert.strictEqual(clientAction.$('.o_reconciliation_line:eq(1) tfoot tr').length, 1, "should display the 'Write-off' line because the balance is not null in Euro");
|
||||
assert.strictEqual(clientAction.$('.o_reconciliation_line:eq(1) .o_validate:visible').length, 1, "should display 'Reconcile' button");
|
||||
|
||||
clientAction.destroy();
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,9 @@ class TestPayment(AccountingTestCase):
|
|||
self.currency_chf_id = self.env.ref("base.CHF").id
|
||||
self.currency_usd_id = self.env.ref("base.USD").id
|
||||
self.currency_eur_id = self.env.ref("base.EUR").id
|
||||
self.env.ref('base.main_company').write({'currency_id': self.currency_eur_id})
|
||||
|
||||
company = self.env.ref('base.main_company')
|
||||
self.cr.execute("UPDATE res_company SET currency_id = %s WHERE id = %s", [self.currency_eur_id, company.id])
|
||||
self.product = self.env.ref("product.product_product_4")
|
||||
self.payment_method_manual_in = self.env.ref("account.account_payment_method_manual_in")
|
||||
self.payment_method_manual_out = self.env.ref("account.account_payment_method_manual_out")
|
||||
|
|
@ -318,3 +320,53 @@ class TestPayment(AccountingTestCase):
|
|||
self.assertEqual(payment_id.payment_type, 'outbound')
|
||||
self.assertEqual(payment_id.partner_id, self.partner_china_exp)
|
||||
self.assertEqual(payment_id.partner_type, 'supplier')
|
||||
|
||||
def test_payment_and_writeoff_in_other_currency(self):
|
||||
# Use case:
|
||||
# Company is in EUR, create a customer invoice for 25 EUR and register payment of 25 USD.
|
||||
# Mark invoice as fully paid with a write_off
|
||||
# Check that all the aml are correctly created.
|
||||
invoice = self.create_invoice(amount=25, type='out_invoice', currency_id=self.currency_eur_id, partner=self.partner_agrolait.id)
|
||||
# register payment on invoice
|
||||
payment = self.payment_model.create({'payment_type': 'inbound',
|
||||
'payment_method_id': self.env.ref('account.account_payment_method_manual_in').id,
|
||||
'partner_type': 'customer',
|
||||
'partner_id': self.partner_agrolait.id,
|
||||
'amount': 25,
|
||||
'currency_id': self.currency_usd_id,
|
||||
'payment_date': time.strftime('%Y') + '-07-15',
|
||||
'payment_difference_handling': 'reconcile',
|
||||
'writeoff_account_id': self.account_payable.id,
|
||||
'journal_id': self.bank_journal_euro.id,
|
||||
'invoice_ids': [(4, invoice.id, None)]
|
||||
})
|
||||
payment.post()
|
||||
self.check_journal_items(payment.move_line_ids, [
|
||||
{'account_id': self.account_eur.id, 'debit': 16.35, 'credit': 0.0, 'amount_currency': 25.0, 'currency_id': self.currency_usd_id},
|
||||
{'account_id': self.account_payable.id, 'debit': 8.65, 'credit': 0.0, 'amount_currency': 13.22, 'currency_id': self.currency_usd_id},
|
||||
{'account_id': self.account_receivable.id, 'debit': 0.0, 'credit': 25.0, 'amount_currency': -38.22, 'currency_id': self.currency_usd_id},
|
||||
])
|
||||
# Use case:
|
||||
# Company is in EUR, create a vendor bill for 25 EUR and register payment of 25 USD.
|
||||
# Mark invoice as fully paid with a write_off
|
||||
# Check that all the aml are correctly created.
|
||||
invoice = self.create_invoice(amount=25, type='in_invoice', currency_id=self.currency_eur_id, partner=self.partner_agrolait.id)
|
||||
# register payment on invoice
|
||||
payment = self.payment_model.create({'payment_type': 'inbound',
|
||||
'payment_method_id': self.env.ref('account.account_payment_method_manual_in').id,
|
||||
'partner_type': 'supplier',
|
||||
'partner_id': self.partner_agrolait.id,
|
||||
'amount': 25,
|
||||
'currency_id': self.currency_usd_id,
|
||||
'payment_date': time.strftime('%Y') + '-07-15',
|
||||
'payment_difference_handling': 'reconcile',
|
||||
'writeoff_account_id': self.account_payable.id,
|
||||
'journal_id': self.bank_journal_euro.id,
|
||||
'invoice_ids': [(4, invoice.id, None)]
|
||||
})
|
||||
payment.post()
|
||||
self.check_journal_items(payment.move_line_ids, [
|
||||
{'account_id': self.account_eur.id, 'debit': 16.35, 'credit': 0.0, 'amount_currency': 25.0, 'currency_id': self.currency_usd_id},
|
||||
{'account_id': self.account_payable.id, 'debit': 0.0, 'credit': 8.65, 'amount_currency': -13.22, 'currency_id': self.currency_usd_id},
|
||||
{'account_id': self.account_receivable.id, 'debit': 0.0, 'credit': 7.7, 'amount_currency': -11.78, 'currency_id': self.currency_usd_id},
|
||||
])
|
||||
|
|
|
|||
|
|
@ -20,13 +20,15 @@ class TestReconciliation(AccountingTestCase):
|
|||
self.res_currency_model = self.registry('res.currency')
|
||||
self.res_currency_rate_model = self.registry('res.currency.rate')
|
||||
|
||||
self.partner_agrolait_id = self.env.ref("base.res_partner_2").id
|
||||
partner_agrolait = self.env.ref("base.res_partner_2")
|
||||
self.partner_agrolait_id = partner_agrolait.id
|
||||
self.currency_swiss_id = self.env.ref("base.CHF").id
|
||||
self.currency_usd_id = self.env.ref("base.USD").id
|
||||
self.currency_euro_id = self.env.ref("base.EUR").id
|
||||
self.env.ref('base.main_company').write({'currency_id': self.currency_euro_id})
|
||||
self.account_rcv = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_receivable').id)], limit=1)
|
||||
self.account_rsa = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_payable').id)], limit=1)
|
||||
company = self.env.ref('base.main_company')
|
||||
self.cr.execute("UPDATE res_company SET currency_id = %s WHERE id = %s", [self.currency_euro_id, company.id])
|
||||
self.account_rcv = partner_agrolait.property_account_receivable_id or self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_receivable').id)], limit=1)
|
||||
self.account_rsa = partner_agrolait.property_account_payable_id or self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_payable').id)], limit=1)
|
||||
self.product = self.env.ref("product.product_product_4")
|
||||
|
||||
self.bank_journal_euro = self.env['account.journal'].create({'name': 'Bank', 'type': 'bank', 'code': 'BNK67'})
|
||||
|
|
@ -619,3 +621,39 @@ class TestReconciliation(AccountingTestCase):
|
|||
# Checking if the direction of the move is correct
|
||||
full_rec_payable = full_rec_move.line_ids.filtered(lambda l: l.account_id == self.account_rsa)
|
||||
self.assertEqual(full_rec_payable.balance, 18.75)
|
||||
|
||||
def test_unreconcile(self):
|
||||
# Use case:
|
||||
# 2 invoices paid with a single payment. Unreconcile the payment with one invoice, the
|
||||
# other invoice should remain reconciled.
|
||||
inv1 = self.create_invoice(invoice_amount=10, currency_id=self.currency_usd_id)
|
||||
inv2 = self.create_invoice(invoice_amount=20, currency_id=self.currency_usd_id)
|
||||
payment = self.env['account.payment'].create({
|
||||
'payment_type': 'inbound',
|
||||
'payment_method_id': self.env.ref('account.account_payment_method_manual_in').id,
|
||||
'partner_type': 'customer',
|
||||
'partner_id': self.partner_agrolait_id,
|
||||
'amount': 100,
|
||||
'currency_id': self.currency_usd_id,
|
||||
'journal_id': self.bank_journal_usd.id,
|
||||
})
|
||||
payment.post()
|
||||
credit_aml = payment.move_line_ids.filtered('credit')
|
||||
|
||||
# Check residual before assignation
|
||||
self.assertAlmostEquals(inv1.residual, 10)
|
||||
self.assertAlmostEquals(inv2.residual, 20)
|
||||
|
||||
# Assign credit and residual
|
||||
inv1.assign_outstanding_credit(credit_aml.id)
|
||||
inv2.assign_outstanding_credit(credit_aml.id)
|
||||
self.assertAlmostEquals(inv1.residual, 0)
|
||||
self.assertAlmostEquals(inv2.residual, 0)
|
||||
|
||||
# Unreconcile one invoice at a time and check residual
|
||||
credit_aml.with_context(invoice_id=inv1.id).remove_move_reconcile()
|
||||
self.assertAlmostEquals(inv1.residual, 10)
|
||||
self.assertAlmostEquals(inv2.residual, 0)
|
||||
credit_aml.with_context(invoice_id=inv2.id).remove_move_reconcile()
|
||||
self.assertAlmostEquals(inv1.residual, 10)
|
||||
self.assertAlmostEquals(inv2.residual, 20)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from odoo.addons.account.tests.account_test_users import AccountTestUsers
|
||||
|
||||
import time
|
||||
|
||||
|
||||
|
|
@ -28,12 +25,6 @@ class TestTax(AccountTestUsers):
|
|||
'amount': 10,
|
||||
'sequence': 3,
|
||||
})
|
||||
self.percent_tax_bis = self.tax_model.create({
|
||||
'name': "Percent tax bis",
|
||||
'amount_type': 'percent',
|
||||
'amount': 21,
|
||||
'sequence': 3,
|
||||
})
|
||||
self.division_tax = self.tax_model.create({
|
||||
'name': "Division tax",
|
||||
'amount_type': 'division',
|
||||
|
|
@ -74,125 +65,47 @@ class TestTax(AccountTestUsers):
|
|||
self.bank_account = self.bank_journal.default_debit_account_id
|
||||
self.expense_account = self.env['account.account'].search([('user_type_id.type', '=', 'payable')], limit=1) #Should be done by onchange later
|
||||
|
||||
def _check_compute_all_results(self, base, total_included, total_excluded, taxes, res):
|
||||
self.assertAlmostEqual(res['base'], base)
|
||||
self.assertAlmostEqual(res['total_included'], total_included)
|
||||
self.assertAlmostEqual(res['total_excluded'], total_excluded)
|
||||
for i in range(0, len(taxes)):
|
||||
self.assertAlmostEqual(res['taxes'][i]['base'], taxes[i][0])
|
||||
self.assertAlmostEqual(res['taxes'][i]['amount'], taxes[i][1])
|
||||
|
||||
def test_tax_group_of_group_tax(self):
|
||||
self.fixed_tax.include_base_amount = True
|
||||
self.group_tax.include_base_amount = True
|
||||
self.group_of_group_tax.include_base_amount = True
|
||||
res = self.group_of_group_tax.compute_all(200.0)
|
||||
self._check_compute_all_results(
|
||||
220, # 'base'
|
||||
263, # 'total_included'
|
||||
200, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(200.0, 10.0), # | 1 | 10 | | t
|
||||
(210.0, 21.0), # | 3 | 10% | |
|
||||
(210.0, 10.0), # | 1 | 10 | | t
|
||||
(220.0, 22.0), # | 3 | 10% | |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
self.assertEquals(res['total_excluded'], 200.0)
|
||||
# After calculation of first group
|
||||
# base = 210
|
||||
# total_included = 231
|
||||
# Base of the first grouped is passed
|
||||
# Base after the second group (220) is dropped.
|
||||
# Base of the group of groups is passed out,
|
||||
# so we obtain base as after first group
|
||||
self.assertEquals(res['base'], 210.0)
|
||||
self.assertEquals(res['total_included'], 263.0)
|
||||
|
||||
def test_tax_group(self):
|
||||
res = self.group_tax.compute_all(200.0)
|
||||
self._check_compute_all_results(
|
||||
200, # 'base'
|
||||
230, # 'total_included'
|
||||
200, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(200.0, 10.0), # | 1 | 10 | |
|
||||
(200.0, 20.0), # | 3 | 10% | |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
self.assertEquals(res['total_excluded'], 200.0)
|
||||
self.assertEquals(res['total_included'], 230.0)
|
||||
self.assertEquals(len(res['taxes']), 2)
|
||||
self.assertEquals(res['taxes'][0]['amount'], 10.0)
|
||||
self.assertEquals(res['taxes'][1]['amount'], 20.0)
|
||||
|
||||
def test_tax_percent_division(self):
|
||||
self.division_tax.price_include = True
|
||||
self.division_tax.include_base_amount = True
|
||||
res_division = self.division_tax.compute_all(200.0)
|
||||
self._check_compute_all_results(
|
||||
220, # 'base'
|
||||
220, # 'total_included'
|
||||
200, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(200.0, 20.0), # | 4 | 10/ | t | t
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res_division
|
||||
)
|
||||
self.percent_tax.price_include = False
|
||||
self.percent_tax.include_base_amount = False
|
||||
res_division = self.division_tax.compute_all(200.0)
|
||||
res_percent = self.percent_tax.compute_all(200.0)
|
||||
self._check_compute_all_results(
|
||||
200, # 'base'
|
||||
220, # 'total_included'
|
||||
200, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(200.0, 20.0), # | 3 | 10% | |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res_percent
|
||||
)
|
||||
self.assertEquals(res_division['taxes'][0]['amount'], 20.0)
|
||||
self.assertEquals(res_percent['taxes'][0]['amount'], 20.0)
|
||||
self.division_tax.price_include = False
|
||||
self.division_tax.include_base_amount = False
|
||||
res_division = self.division_tax.compute_all(200.0)
|
||||
self._check_compute_all_results(
|
||||
200, # 'base'
|
||||
222.22, # 'total_included'
|
||||
200, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(200.0, 22.22), # | 4 | 10/ | |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res_division
|
||||
)
|
||||
self.percent_tax.price_include = True
|
||||
self.percent_tax.include_base_amount = True
|
||||
res_division = self.division_tax.compute_all(200.0)
|
||||
res_percent = self.percent_tax.compute_all(200.0)
|
||||
self._check_compute_all_results(
|
||||
200, # 'base'
|
||||
200, # 'total_included'
|
||||
181.82, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(181.82, 18.18), # | 3 | 10% | t | t
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res_percent
|
||||
)
|
||||
self.percent_tax_bis.price_include = True
|
||||
self.percent_tax_bis.include_base_amount = True
|
||||
res_percent = self.percent_tax_bis.compute_all(7.0)
|
||||
self._check_compute_all_results(
|
||||
7.0, # 'base'
|
||||
7.0, # 'total_included'
|
||||
5.79, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(5.79, 1.21), # | 3 | 21% | t | t
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res_percent
|
||||
)
|
||||
self.assertEquals(res_division['taxes'][0]['amount'], 22.22)
|
||||
self.assertEquals(res_percent['taxes'][0]['amount'], 18.18)
|
||||
|
||||
def test_tax_sequence_normalized_set(self):
|
||||
self.division_tax.sequence = 1
|
||||
|
|
@ -200,103 +113,19 @@ class TestTax(AccountTestUsers):
|
|||
self.percent_tax.sequence = 3
|
||||
taxes_set = (self.group_tax | self.division_tax)
|
||||
res = taxes_set.compute_all(200.0)
|
||||
self._check_compute_all_results(
|
||||
200, # 'base'
|
||||
252.22, # 'total_included'
|
||||
200, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(200.0, 22.22), # | 1 | 10/ | |
|
||||
(200.0, 10.0), # | 2 | 10 | |
|
||||
(200.0, 20.0), # | 3 | 10% | |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
self.assertEquals(res['taxes'][0]['amount'], 22.22)
|
||||
self.assertEquals(res['taxes'][1]['amount'], 10.0)
|
||||
self.assertEquals(res['taxes'][2]['amount'], 20.0)
|
||||
|
||||
def test_tax_include_base_amount(self):
|
||||
self.fixed_tax.include_base_amount = True
|
||||
res = self.group_tax.compute_all(200.0)
|
||||
self._check_compute_all_results(
|
||||
210, # 'base'
|
||||
231, # 'total_included'
|
||||
200, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(200.0, 10.0), # | 1 | 10 | | t
|
||||
(210.0, 21.0), # | 3 | 10% | |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
|
||||
self.fixed_tax.price_include = True
|
||||
self.fixed_tax.include_base_amount = False
|
||||
res = self.fixed_tax.compute_all(100.0, quantity=2.0)
|
||||
self._check_compute_all_results(
|
||||
180, # 'base'
|
||||
200, # 'total_included'
|
||||
180, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(180.0, 20.0), # | 1 | 20 | | t
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
|
||||
def test_tax_include_base_amount_2(self):
|
||||
self.percent_tax.price_include = True
|
||||
self.percent_tax.amount = 21.0
|
||||
res = self.percent_tax.compute_all(7.0)
|
||||
self._check_compute_all_results(
|
||||
5.79, # 'base'
|
||||
7.0, # 'total_included'
|
||||
5.79, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(5.79, 1.21), # | 3 | 10% | t |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
|
||||
def test_tax_include_base_amount_3(self):
|
||||
self.percent_tax.price_include = True
|
||||
self.percent_tax.amount = 20.0
|
||||
res = self.percent_tax.compute_all(399.99)
|
||||
self._check_compute_all_results(
|
||||
333.33, # 'base'
|
||||
399.99, # 'total_included'
|
||||
333.33, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(333.33, 66.66), # | 3 | 10% | t |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
self.assertEquals(res['total_included'], 231.0)
|
||||
|
||||
def test_tax_currency(self):
|
||||
self.division_tax.amount = 15.0
|
||||
res = self.division_tax.compute_all(200.0, currency=self.env.ref('base.VEF'))
|
||||
self._check_compute_all_results(
|
||||
200, # 'base'
|
||||
235.2941, # 'total_included'
|
||||
200, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(200.0, 35.2941), # | 4 | 15/ | |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
self.assertAlmostEqual(res['total_included'], 235.2941)
|
||||
|
||||
def test_tax_move_lines_creation(self):
|
||||
""" Test that creating a move.line with tax_ids generates the tax move lines and adjust line amount when a tax is price_include """
|
||||
|
|
@ -327,7 +156,6 @@ class TestTax(AccountTestUsers):
|
|||
}
|
||||
move = self.env['account.move'].with_context(apply_taxes=True).create(vals)
|
||||
|
||||
|
||||
aml_fixed_tax = move.line_ids.filtered(lambda l: l.tax_line_id.id == self.fixed_tax.id)
|
||||
aml_percent_tax = move.line_ids.filtered(lambda l: l.tax_line_id.id == self.percent_tax.id)
|
||||
aml_fixed_tax_bis = move.line_ids.filtered(lambda l: l.tax_line_id.id == self.fixed_tax_bis.id)
|
||||
|
|
@ -341,58 +169,3 @@ class TestTax(AccountTestUsers):
|
|||
aml_with_taxes = move.line_ids.filtered(lambda l: set(l.tax_ids.ids) == set([self.group_tax.id, self.fixed_tax_bis.id]))
|
||||
self.assertEquals(len(aml_with_taxes), 1)
|
||||
self.assertEquals(aml_with_taxes.credit, 190)
|
||||
|
||||
def test_advanced_taxes_computation_0(self):
|
||||
'''Test more advanced taxes computation (see issue 34471).'''
|
||||
tax_1 = self.env['account.tax'].create({
|
||||
'name': 'test_advanced_taxes_computation_0_1',
|
||||
'amount_type': 'percent',
|
||||
'amount': 10,
|
||||
'price_include': True,
|
||||
'include_base_amount': True,
|
||||
'sequence': 1,
|
||||
})
|
||||
tax_2 = self.env['account.tax'].create({
|
||||
'name': 'test_advanced_taxes_computation_0_2',
|
||||
'amount_type': 'percent',
|
||||
'amount': 10,
|
||||
'sequence': 2,
|
||||
})
|
||||
tax_3 = self.env['account.tax'].create({
|
||||
'name': 'test_advanced_taxes_computation_0_3',
|
||||
'amount_type': 'percent',
|
||||
'amount': 10,
|
||||
'price_include': True,
|
||||
'sequence': 3,
|
||||
})
|
||||
tax_4 = self.env['account.tax'].create({
|
||||
'name': 'test_advanced_taxes_computation_0_4',
|
||||
'amount_type': 'percent',
|
||||
'amount': 10,
|
||||
'sequence': 4,
|
||||
})
|
||||
tax_5 = self.env['account.tax'].create({
|
||||
'name': 'test_advanced_taxes_computation_0_5',
|
||||
'amount_type': 'percent',
|
||||
'amount': 10,
|
||||
'price_include': True,
|
||||
'sequence': 5,
|
||||
})
|
||||
taxes = tax_1 + tax_2 + tax_3 + tax_4 + tax_5
|
||||
res = taxes.compute_all(132.0)
|
||||
self._check_compute_all_results(
|
||||
110, # 'base'
|
||||
154, # 'total_included'
|
||||
100, # 'total_excluded'
|
||||
[
|
||||
# base , amount | seq | amount | incl | incl_base
|
||||
# ---------------------------------------------------
|
||||
(100.0, 10.0), # | 1 | 10% | t | t
|
||||
(110.0, 11.0), # | 2 | 10% | |
|
||||
(110.0, 11.0), # | 3 | 10% | t |
|
||||
(110.0, 11.0), # | 4 | 10% | |
|
||||
(110.0, 11.0), # | 5 | 10% | t |
|
||||
# ---------------------------------------------------
|
||||
],
|
||||
res
|
||||
)
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
</group>
|
||||
<group>
|
||||
<field domain="[('company_id', '=', parent.company_id)]" name="account_id" groups="account.group_account_user"/>
|
||||
<field name="invoice_line_tax_ids" context="{'type':parent.get('type')}" domain="[('type_tax_use','!=','none'),('company_id', '=', parent.company_id)]" widget="many2many_tags" options="{'no_create': True}"/>
|
||||
<field name="invoice_line_tax_ids" context="{'type':parent.type}" domain="[('type_tax_use','!=','none'),('company_id', '=', parent.company_id)]" widget="many2many_tags" options="{'no_create': True}"/>
|
||||
<field domain="[('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
|
||||
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
|
||||
</group>
|
||||
|
|
@ -251,7 +251,7 @@
|
|||
<group>
|
||||
<field name="origin" attrs="{'invisible': [('origin', '=', False)]}"/>
|
||||
<field name="date_invoice" string="Bill Date"/>
|
||||
<field name="date_due" attrs="{'readonly': [('payment_term_id','!=',False)]}"/>
|
||||
<field name="date_due" attrs="{'readonly': ['|',('payment_term_id','!=',False), ('state', 'in', ['open', 'paid'])]}" force_save="1"/>
|
||||
<field name="move_name" invisible="1"/>
|
||||
<field name="currency_id" options="{'no_create': True, 'no_open': True}" groups="base.group_multi_currency"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
|
|
@ -297,7 +297,7 @@
|
|||
<field name="amount"/>
|
||||
<field name="amount_rounding" invisible="1"/>
|
||||
<field name="amount_total" invisible="1"/>
|
||||
<field name="currency_id" invisible="1"/>
|
||||
<field name="currency_id" invisible="1" force_save="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</div>
|
||||
|
|
@ -395,7 +395,7 @@
|
|||
</group>
|
||||
<group>
|
||||
<field name="date_invoice"/>
|
||||
<field name="date_due" attrs="{'readonly': [('payment_term_id','!=',False)]}" force_save="1"/>
|
||||
<field name="date_due" attrs="{'readonly': ['|',('payment_term_id','!=',False), ('state', 'in', ['open', 'paid'])]}" force_save="1"/>
|
||||
<field name="move_name" invisible="1"/>
|
||||
<field name="user_id" groups="base.group_user"/>
|
||||
<label for="currency_id" groups="base.group_multi_currency"/>
|
||||
|
|
@ -497,7 +497,7 @@
|
|||
<field name="amount" invisible="1"/>
|
||||
<field name="amount_rounding" invisible="1"/>
|
||||
<field name="amount_total"/>
|
||||
<field name="currency_id" invisible="1"/>
|
||||
<field name="currency_id" invisible="1" force_save="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
|
|
@ -528,10 +528,8 @@
|
|||
<field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('reference', 'ilike', self), ('partner_id', 'child_of', self)]"/>
|
||||
<field name="journal_id" />
|
||||
<filter name="draft" string="Draft" domain="[('state','=','draft')]"/>
|
||||
<filter name="invoices" string="Invoices" domain="['&', ('state','in',['draft','open','paid']),('type','in',('out_invoice','in_invoice'))]"/>
|
||||
<filter name="refunds" string="Credit Notes" domain="['&', ('state','in',['draft','open','paid']),('type','in',('out_refund','in_refund'))]"/>
|
||||
<separator/>
|
||||
<filter name="unpaid" string="Not Paid" domain="[('state','=','open')]"/>
|
||||
<filter name="unpaid" string="Open" domain="[('state', '=', 'open')]"/>
|
||||
<filter name="paid" string="Paid" domain="[('state', '=', 'paid')]"/>
|
||||
<filter name="late" string="Overdue" domain="['&', ('date_due', '<', time.strftime('%%Y-%%m-%%d')), ('state', '=', 'open')]" help="Overdue invoices, maturity date passed"/>
|
||||
<separator/>
|
||||
<field name="partner_id" operator="child_of"/>
|
||||
|
|
@ -563,33 +561,25 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<!-- TODO: remove in master -->
|
||||
<record id="view_account_invoice_filter_inherit_invoices" model="ir.ui.view">
|
||||
<field name="name">account.invoice.select.invoices</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="mode">primary</field>
|
||||
<field name="inherit_id" ref="view_account_invoice_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="filter[@name='invoices']" position="attributes">
|
||||
<attribute name="string">Not Draft</attribute>
|
||||
</xpath>
|
||||
<filter name="refunds" position="replace"/>
|
||||
</data>
|
||||
<data/>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- TODO: remove in master -->
|
||||
<record id="view_account_invoice_filter_inherit_credit_notes" model="ir.ui.view">
|
||||
<field name="name">account.invoice.select.credit.notes</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="mode">primary</field>
|
||||
<field name="inherit_id" ref="view_account_invoice_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="filter[@name='refunds']" position="attributes">
|
||||
<attribute name="string">Not Draft</attribute>
|
||||
</xpath>
|
||||
<filter name="invoices" position="replace"/>
|
||||
</data>
|
||||
<data/>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
@ -660,7 +650,7 @@
|
|||
<field eval="False" name="view_id"/>
|
||||
<field name="domain">[('type','=','out_invoice')]</field>
|
||||
<field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
|
||||
<field name="search_view_id" ref="view_account_invoice_filter_inherit_invoices"/>
|
||||
<field name="search_view_id" ref="view_account_invoice_filter"/>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to create a customer invoice.
|
||||
|
|
@ -701,7 +691,7 @@
|
|||
<field eval="False" name="view_id"/>
|
||||
<field name="domain">[('type','=','out_refund')]</field>
|
||||
<field name="context">{'default_type': 'out_refund', 'type': 'out_refund', 'journal_type': 'sale'}</field>
|
||||
<field name="search_view_id" ref="view_account_invoice_filter_inherit_credit_notes"/>
|
||||
<field name="search_view_id" ref="view_account_invoice_filter"/>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to create a credit note.
|
||||
|
|
@ -739,7 +729,7 @@
|
|||
<field eval="False" name="view_id"/>
|
||||
<field name="domain">[('type','=','in_invoice')]</field>
|
||||
<field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
|
||||
<field name="search_view_id" ref="view_account_invoice_filter_inherit_invoices"/>
|
||||
<field name="search_view_id" ref="view_account_invoice_filter"/>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to record a new vendor bill.
|
||||
|
|
@ -775,7 +765,7 @@
|
|||
<field eval="False" name="view_id"/>
|
||||
<field name="domain">[('type','=','in_refund')]</field>
|
||||
<field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase'}</field>
|
||||
<field name="search_view_id" ref="view_account_invoice_filter_inherit_credit_notes"/>
|
||||
<field name="search_view_id" ref="view_account_invoice_filter"/>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to record a new vendor credit note.
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue