From 09675bb86c882ec6d934580ff9693c93f95f07ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 28 Sep 2018 23:02:31 +0200 Subject: [PATCH] Update translations --- locale/bg.po | 377 ++++++++++++++++++---------------- locale/ca.po | 322 +++++++++++++++-------------- locale/cs.po | 360 +++++++++++++++++--------------- locale/de.po | 362 ++++++++++++++++---------------- locale/es.po | 320 +++++++++++++++-------------- locale/es_419.po | 525 +++++++++++++++++++++++++++-------------------- locale/fa.po | 358 ++++++++++++++++++-------------- locale/fr.po | 352 +++++++++++++++---------------- locale/hu_HU.po | 380 ++++++++++++++++++---------------- locale/it_IT.po | 372 +++++++++++++++++---------------- locale/ja_JP.po | 331 +++++++++++++++--------------- locale/lo.po | 371 +++++++++++++++++---------------- locale/lt.po | 360 +++++++++++++++++--------------- locale/nl.po | 373 +++++++++++++++++---------------- locale/pl.po | 360 +++++++++++++++++--------------- locale/pt_BR.po | 360 +++++++++++++++++--------------- locale/ru.po | 378 ++++++++++++++++++---------------- locale/sl.po | 360 +++++++++++++++++--------------- locale/zh_CN.po | 375 +++++++++++++++++---------------- 19 files changed, 3702 insertions(+), 3294 deletions(-) diff --git a/locale/bg.po b/locale/bg.po index 0df2c72e9a..d61695c423 100644 --- a/locale/bg.po +++ b/locale/bg.po @@ -90,10 +90,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "" -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "" @@ -128,10 +124,6 @@ msgid "" "account." msgstr "" -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "" @@ -324,9 +316,15 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Отложени плащания" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Крайна дата" + +#, fuzzy msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.account,id:" msgid "ID" @@ -364,6 +362,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Съгласуване" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Десен" @@ -377,6 +379,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Цифри за втора валута" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Начална дата" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Данъци по подразбиране" @@ -522,9 +529,15 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "С отложено плащане" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Крайна дата" + +#, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.account.template,id:" msgid "ID" @@ -554,6 +567,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Съгласуване" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Начална дата" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Данъци по подразбиране" @@ -1222,13 +1244,19 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Крайна дата" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" +#, fuzzy msgctxt "field:account.general_ledger.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" #, fuzzy msgctxt "field:account.general_ledger.account,id:" @@ -1258,6 +1286,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Начална дата" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1527,11 +1560,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "До дата" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Сметки" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Активен" @@ -1556,10 +1584,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Кредит" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Кредитна сметка по подразбиране" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Цифри за валута" @@ -1568,10 +1592,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Дебит" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Дебитна сметка по подразбиране" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1605,55 +1625,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Променено от" -#, fuzzy -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Фирма" - -#, fuzzy -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Създадено на" - -#, fuzzy -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Създадено от" - -#, fuzzy -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Кредитна сметка по подразбиране" - -#, fuzzy -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Дебитна сметка по подразбиране" - -#, fuzzy -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Дневник" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Променено на" - -#, fuzzy -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Променено от" - #, fuzzy msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" @@ -1757,38 +1728,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Променено от" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Код" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Създадено на" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Създадено от" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Име" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Променено на" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Променено от" - #, fuzzy msgctxt "field:account.move,company:" msgid "Company" @@ -2098,11 +2037,73 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "До дата" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Активен" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Фирма" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Създадено на" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Създадено от" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Дневник" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Име" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Променено на" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Променено от" + #, fuzzy msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Сума" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Фирма" + #, fuzzy msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" @@ -2121,9 +2122,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Дневник" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Анулиран" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2417,11 +2419,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Дневник" - #, fuzzy msgctxt "field:account.reconcile.show,lines:" msgid "Lines" @@ -2439,9 +2436,14 @@ msgstr "Управление на партньор" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Анулиран" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Сума" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Активен" @@ -2602,6 +2604,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Описание" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Крайна дата" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2623,6 +2630,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Начална дата" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Шаблон" @@ -2794,6 +2806,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Описание" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Крайна дата" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2815,6 +2832,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Начална дата" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Променено на" @@ -2996,6 +3018,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Шаблон" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Променено на" @@ -3048,6 +3074,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Шаблон" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Променено на" @@ -3427,10 +3457,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Променено от" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3494,10 +3520,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - #, fuzzy msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" @@ -3557,6 +3579,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Показване само на публикувани движения" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3604,10 +3630,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3628,6 +3650,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3639,6 +3665,10 @@ msgstr "" "Ако е попълнен оригиналния данък правилото ще бъде изпълено само за този " "данък." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3787,10 +3817,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3803,40 +3829,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Вид дневник" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Анулиран" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Движение по сметка" @@ -3863,6 +3855,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Отпечатване на основен дневник" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Съгласуване на редове на отписване" @@ -4098,11 +4094,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -4179,6 +4170,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4493,11 +4488,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4551,6 +4541,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -5052,6 +5046,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Публикуван" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Анулиран" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Затваряне" @@ -5392,11 +5416,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Шаблон" -#, fuzzy -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Сума" - #, fuzzy msgctxt "view:account.tax.template:" msgid "%" diff --git a/locale/ca.po b/locale/ca.po index f28ad3d66e..92e77ac716 100644 --- a/locale/ca.po +++ b/locale/ca.po @@ -108,10 +108,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Només podeu obrir un diari per període." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "El codi ha de ser únic." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "L'apunt \"%s\" (%d) ja està conciliat." @@ -146,10 +142,6 @@ msgid "" "account." msgstr "No podeu crear un apunt amb compte \"%s\" perquè és un compte de vista." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "No podeu crear un apunt amb el compte \"%s\" perquè està inactiu." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "No podeu modificar l'apunt \"%s\" perquè ja està conciliat." @@ -371,6 +363,10 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Tancaments" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Data final" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Saldo en el llibre major" @@ -411,6 +407,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Concilia" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "Substituït per" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Dreta" @@ -423,6 +423,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Decimals de la segona moneda" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Data inicial" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Impostos per defecte" @@ -563,6 +567,10 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Tancament" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Data final" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Saldo en el llibre major" @@ -595,6 +603,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Concilia" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "Substituït per" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Data inicial" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Impostos per defecte" @@ -1110,7 +1126,7 @@ msgstr "Compte haver" msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:" msgid "Debit Account" -msgstr "Compte deure " +msgstr "Compte deure" msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:" msgid "Fiscal Year" @@ -1196,6 +1212,10 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "Haver final" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Data final" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "Deure final" @@ -1228,6 +1248,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "Haver inicial" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Data inicial" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "Deure inicial" @@ -1448,10 +1472,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Fins a la data" -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Comptes" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Actiu" @@ -1476,10 +1496,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Haver" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Compte haver per defecte" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Decimals de la moneda" @@ -1488,10 +1504,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Deure" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Compte deure per defecte" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1524,46 +1536,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Usuari de modificació" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Empresa" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Data de creació" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Usuari de creació" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Compte haver per defecte" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Compte deure per defecte" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Diari" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "Nom del registre" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Data de modificació" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Usuari de modificació" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "Data final" @@ -1656,38 +1628,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Usuari de modificació" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Codi" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Data de creació" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Usuari de creació" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Nom" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "Nom del registre" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Data de modificació" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Usuari de modificació" - msgctxt "field:account.move,company:" msgid "Company" msgstr "Empresa" @@ -1976,10 +1916,62 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Fins a la data" +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Actiu" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Empresa" + +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Data de creació" + +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Usuari de creació" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Compte haver" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Compte deure" + +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Diari" + +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Nom" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "Nom del registre" + +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Data de modificació" + +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Usuari de modificació" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Import" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Empresa" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "Decimals de la moneda" @@ -1996,9 +1988,9 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Diari" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Desajust" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2256,10 +2248,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Diari" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Apunts" @@ -2273,9 +2261,13 @@ msgid "Party" msgstr "Tercer" msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Desajust" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Import" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Actiu" @@ -2432,6 +2424,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Descripció" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Data final" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2452,6 +2448,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "Nom del registre" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Data inicial" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Plantilla" @@ -2604,6 +2604,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Descripció" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Data final" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2624,6 +2628,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "Nom del registre" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Data inicial" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Data de modificació" @@ -2792,6 +2800,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Plantilla" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "Sobreescriu plantilla" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Data de modificació" @@ -2844,6 +2856,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Plantilla" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "Sobreescriu plantilla" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Data de modificació" @@ -3196,10 +3212,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Usuari de modificació" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "Desmarca per eliminar l'ús del registre en el futur." - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "Només mostra el saldo en el llibre major." @@ -3258,10 +3270,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "Si es marca es crearà noves seqüences" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "Desmarca per eliminar l'ús del registre en el futur." - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "Mostra només assentaments comptabilitzats." @@ -3320,6 +3328,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Mostra només assentaments comptabilitzats." +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "Desmarca per eliminar l'ús del registre en el futur." + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "Data major dels apunts conciliats." @@ -3370,10 +3382,6 @@ msgstr "" "Si es marca, aquest impost modificarà el preu unitat pels càlculs d'impostos" " posteriors." -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "Desmarca per eliminar l'ús del registre en el futur." - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "Marca per sobreescriure la definició de la plantilla" @@ -3395,6 +3403,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "Una expressió python que s'avaluarà amb les paraules clau." +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "Marca per sobreescriure la definició de la plantilla" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "Marca per afegir el impost original al impost substituït." @@ -3405,6 +3417,10 @@ msgid "" msgstr "" "Si s'emplena l'impost original, la regla s'aplicarà només per aquest impost." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "Marca per sobreescriure la definició de la plantilla" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "Marca per afegir el impost original al impost substituït." @@ -3545,10 +3561,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Existències" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "Comptes del diari" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "Context del diari de caixa" @@ -3561,34 +3573,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "Seqüencies del diari" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Tipus de diari" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Efectiu" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Despesa" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Ingressos" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situació" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Desajust" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Assentament comptable" @@ -3613,6 +3597,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Imprimeix llibre diari" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "Desajust de concilació" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Concilia apunts amb desajust" @@ -3821,10 +3809,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Diaris - Períodes" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Tipus de diari" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Assentaments comptables" @@ -3889,6 +3873,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Concilia apunts" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "Mètodes de desajust" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renova exercici fiscal" @@ -4153,10 +4141,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Diaris - Períodes" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Tipus de diari" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Assentaments comptables" @@ -4201,6 +4185,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Concilia comptes" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "Mètodes de desajust" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renova exercici fiscal" @@ -4665,6 +4653,30 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Comptabilitzat" +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Efectiu" + +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Despesa" + +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Ingressos" + +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situació" + +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Desajust" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Tancat" @@ -4969,10 +4981,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Plantilla" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Import" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/cs.po b/locale/cs.po index 66333feadd..5acff77ddd 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -90,10 +90,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "" -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "" @@ -128,10 +124,6 @@ msgid "" "account." msgstr "" -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "" @@ -323,9 +315,14 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "" + +#, fuzzy msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.account,id:" msgid "ID" @@ -364,6 +361,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "" @@ -376,6 +377,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "" @@ -520,9 +525,14 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "" + +#, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.account.template,id:" msgid "ID" @@ -553,6 +563,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "" @@ -1172,13 +1190,18 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" +#, fuzzy msgctxt "field:account.general_ledger.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.general_ledger.account,id:" msgid "ID" @@ -1205,6 +1228,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1430,11 +1457,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Accounts" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "" @@ -1459,10 +1481,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1471,10 +1489,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "" @@ -1508,47 +1522,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Journals" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "" @@ -1644,39 +1617,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Namu" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "" - msgctxt "field:account.move,company:" msgid "Company" msgstr "" @@ -1975,10 +1915,64 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "" +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Journals" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Namu" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1996,9 +1990,9 @@ msgid "ID" msgstr "" #, fuzzy -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Journals" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Write-Off" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2267,11 +2261,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Journals" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "" @@ -2286,9 +2275,13 @@ msgstr "" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Write-Off" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "" @@ -2447,6 +2440,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "" @@ -2468,6 +2465,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code,template:" msgid "Template" @@ -2625,6 +2626,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "" @@ -2646,6 +2651,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "" @@ -2817,6 +2826,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "" @@ -2871,6 +2884,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "" @@ -3234,10 +3251,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3292,10 +3305,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "" @@ -3350,6 +3359,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3396,10 +3409,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3420,6 +3429,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3429,6 +3442,10 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "" +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3452,9 +3469,10 @@ msgctxt "model:account.account,name:" msgid "Account" msgstr "Accounts" +#, fuzzy msgctxt "model:account.account-account.tax,name:" msgid "Account - Tax" -msgstr "" +msgstr "Account Types" msgctxt "model:account.account.deferral,name:" msgid "Account Deferral" @@ -3578,10 +3596,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3595,35 +3609,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -#, fuzzy -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Journal Types" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - #, fuzzy msgctxt "model:account.move,name:" msgid "Account Move" @@ -3654,6 +3639,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Print General Journal" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "" @@ -3696,9 +3685,10 @@ msgctxt "model:account.reconcile.show,name:" msgid "Reconcile" msgstr "" +#, fuzzy msgctxt "model:account.tax,name:" msgid "Account Tax" -msgstr "" +msgstr "Account Types" #, fuzzy msgctxt "model:account.tax.code,name:" @@ -3709,9 +3699,10 @@ msgctxt "model:account.tax.code.line,name:" msgid "Tax Code Line" msgstr "" +#, fuzzy msgctxt "model:account.tax.code.line.template,name:" msgid "Tax Code Line Template" -msgstr "" +msgstr "Tax Codes Templates" #, fuzzy msgctxt "model:account.tax.code.open_chart.start,name:" @@ -3733,9 +3724,10 @@ msgctxt "model:account.tax.line,name:" msgid "Tax Line" msgstr "Tax Lines" +#, fuzzy msgctxt "model:account.tax.line.template,name:" msgid "Account Tax Line Template" -msgstr "" +msgstr "Account Move Template" #, fuzzy msgctxt "model:account.tax.rule,name:" @@ -3746,9 +3738,10 @@ msgctxt "model:account.tax.rule.line,name:" msgid "Tax Rule Line" msgstr "" +#, fuzzy msgctxt "model:account.tax.rule.line.template,name:" msgid "Tax Rule Line Template" -msgstr "" +msgstr "Tax Rule Templates" #, fuzzy msgctxt "model:account.tax.rule.template,name:" @@ -3878,10 +3871,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -3946,6 +3935,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4210,10 +4203,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -4258,6 +4247,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4749,6 +4742,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Write-Off" + #, fuzzy msgctxt "selection:account.journal.period,state:" msgid "Close" @@ -4889,9 +4912,10 @@ msgctxt "selection:account.tax.code.line.template,type:" msgid "Invoice" msgstr "" +#, fuzzy msgctxt "selection:account.tax.code.open_chart.start,method:" msgid "By Fiscal Year" -msgstr "" +msgstr "Fiscal Years" msgctxt "selection:account.tax.code.open_chart.start,method:" msgid "By Periods" @@ -5060,10 +5084,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Templates" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "" - #, fuzzy msgctxt "view:account.tax.template:" msgid "%" diff --git a/locale/de.po b/locale/de.po index 0392b554d2..109e4d033c 100644 --- a/locale/de.po +++ b/locale/de.po @@ -112,10 +112,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Es kann nur ein Journal pro Buchungszeitraum eröffnet werden." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "Der Code kann nur einmal vergeben werden." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "Die Buchungszeile \"%s\" (%d) ist bereits abgestimmt." @@ -155,10 +151,6 @@ msgstr "" "Buchungszeile kann nicht angelegt werden mit Konto \"%s\", da es eine Sicht " "ist." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "Buchungszeile kann nicht angelegt werden mit inaktivem Konto \"%s\"." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "Änderung von Position \"%s\" nicht möglich, da diese abgestimmt ist." @@ -394,6 +386,10 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Saldenvorträge" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Enddatum" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Kontenblattsaldo" @@ -434,6 +430,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Abstimmen" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "Ersetzt durch" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Rechts" @@ -446,6 +446,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Nachkommastellen Fremdwährung" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Anfangsdatum" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Standardsteuern" @@ -586,6 +590,10 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Saldenvortrag" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Enddatum" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Kontenblattsaldo" @@ -618,6 +626,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Abstimmen" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "Ersetzt durch" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Anfangsdatum" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Standardsteuern" @@ -676,7 +692,7 @@ msgstr "Betrag" msgctxt "field:account.account.type,balance_sheet:" msgid "Balance Sheet" -msgstr "Bilanzbogen" +msgstr "Bilanz" msgctxt "field:account.account.type,childs:" msgid "Children" @@ -744,7 +760,7 @@ msgstr "Letzte Änderung durch" msgctxt "field:account.account.type.template,balance_sheet:" msgid "Balance Sheet" -msgstr "Bilanzbogen" +msgstr "Bilanz" msgctxt "field:account.account.type.template,childs:" msgid "Children" @@ -1219,6 +1235,10 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "Haben bei Ende" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Enddatum" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "Soll bei Ende" @@ -1251,6 +1271,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "Haben bei Beginn" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Anfangsdatum" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "Soll bei Beginn" @@ -1471,10 +1495,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Enddatum" -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Konten" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Aktiv" @@ -1499,10 +1519,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Haben" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Habenkonto" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Nachkommastellen Währung" @@ -1511,10 +1527,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Soll" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Sollkonto" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1547,46 +1559,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Letzte Änderung durch" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Unternehmen" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Erstellungsdatum" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Erstellt durch" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Standard Habenkonto" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Standard Sollkonto" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Journal" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "Bezeichnung des Datensatzes" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Zuletzt geändert" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Letzte Änderung durch" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "Enddatum" @@ -1679,38 +1651,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Letzte Änderung durch" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Code" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Erstellungsdatum" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Erstellt durch" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Name" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "Bezeichnung des Datensatzes" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Zuletzt geändert" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Letzte Änderung durch" - msgctxt "field:account.move,company:" msgid "Company" msgstr "Unternehmen" @@ -1999,10 +1939,62 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Bis Datum" +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Aktiv" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Unternehmen" + +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Erstellungsdatum" + +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Erstellt durch" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Habenkonto" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Sollkonto" + +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Journal" + +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Name" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "Bezeichnung des Datensatzes" + +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Zuletzt geändert" + +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Letzte Änderung durch" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Betrag" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Unternehmen" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "Nachkommastellen Währung" @@ -2019,9 +2011,9 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Journal" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Ausbuchung" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2279,10 +2271,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Journal" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Positionen" @@ -2296,9 +2284,13 @@ msgid "Party" msgstr "Partei" msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Ausbuchung" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Betrag" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Aktiv" @@ -2455,6 +2447,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Beschreibung" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Enddatum" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2475,6 +2471,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "Bezeichnung des Datensatzes" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Anfangsdatum" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Kontenvorlage" @@ -2627,6 +2627,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Beschreibung" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Enddatum" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2647,6 +2651,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "Bezeichnung des Datensatzes" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Anfangsdatum" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Zuletzt geändert" @@ -2815,6 +2823,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Vorlage" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "Vorlage überschreiben" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Zuletzt geändert" @@ -2867,6 +2879,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Vorlage" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "Vorlage überschreiben" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Zuletzt geändert" @@ -3219,10 +3235,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Letzte Änderung durch" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "Deaktivieren um die zukünftige Nutzung zu verhindern." - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "Nur Salden in Kontenblättern anzeigen" @@ -3283,10 +3295,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "Wenn aktiviert werden neue Sequenzen erstellt." -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "Deaktivieren um die zukünftige Nutzung zu verhindern." - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "Nur festgeschriebene Buchungen anzeigen" @@ -3346,6 +3354,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Nur festgeschriebene Buchungen anzeigen" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "Deaktivieren um die zukünftige Nutzung zu verhindern." + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "Letztes Datum der abgestimmten Position" @@ -3396,10 +3408,6 @@ msgstr "" "Bei Aktivierung wird für die folgende Steuerberechnung der geänderte " "Einzelpreis zugrundegelegt" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "Deaktivieren um die zukünftige Nutzung zu verhindern. " - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "Aktivieren um die Vorlage zu überschreiben" @@ -3421,6 +3429,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "Ein Python-Ausdruck der mit den Schlüsselwörtern ausgewertet wird." +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "Aktivieren um die Vorlage zu überschreiben" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3433,6 +3445,10 @@ msgstr "" "Wenn das Feld Ursprungssteuer ausgefüllt ist, wird die Steuerregel " "ausschließlich auf diese Steuer angewendet." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "Aktivieren um die Vorlage zu überschreiben" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3492,11 +3508,11 @@ msgstr "Fälligkeitsliste Kontext" msgctxt "model:account.balance_sheet.comparision.context,name:" msgid "Balance Sheet Context" -msgstr "Bilanzbogen Kontext" +msgstr "Bilanz Kontext" msgctxt "model:account.balance_sheet.context,name:" msgid "Balance Sheet Context" -msgstr "Bilanzbogen Kontext" +msgstr "Bilanz Kontext" msgctxt "model:account.configuration,name:" msgid "Account Configuration" @@ -3528,11 +3544,11 @@ msgstr "Geschäftsjahr" msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:" msgid "Balance Non-Deferral" -msgstr "Abgleich Saldenvortrag" +msgstr "Erfolgskonten abschließen" msgctxt "model:account.fiscalyear.renew.start,name:" msgid "Renew Fiscal Year Start" -msgstr "Geschäftsjahr erneuern" +msgstr "Neues Geschäftsjahr anlegen" msgctxt "model:account.general_ledger.account,name:" msgid "General Ledger Account" @@ -3574,10 +3590,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Lager" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "Buchungsjournal" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "Journal Barvermögen Kontext" @@ -3590,34 +3602,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "Nummernkreis Journal" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Journal Typ" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Kasse" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Aufwand" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "Allgemein" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Ertrag" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Saldenvortrag" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Ausbuchung" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Buchungssatz" @@ -3636,12 +3620,16 @@ msgstr "Buchungszeilenvorlage" msgctxt "model:account.move.open_journal.ask,name:" msgid "Open Journal Ask" -msgstr "Nachfrage Dialogbuchen" +msgstr "Nachfrage Buchungen erfassen" msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Journal Allgemein drucken" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "Abstimmung Ausbuchung" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Abstimmung Buchungszeilen Ausbuchung" @@ -3696,7 +3684,7 @@ msgstr "Vorlage Position Steuerregel" msgctxt "model:account.tax.code.open_chart.start,name:" msgid "Open Chart of Tax Codes" -msgstr "Kennzifferntabelle öffnen" +msgstr "Steuerkennzifferntabelle öffnen" msgctxt "model:account.tax.code.template,name:" msgid "Tax Code Template" @@ -3756,7 +3744,7 @@ msgstr "Konten" msgctxt "model:ir.action,name:act_account_balance_sheet_tree" msgid "Balance Sheet" -msgstr "Bilanzbogen" +msgstr "Bilanz" msgctxt "model:ir.action,name:act_account_general_ledger" msgid "Accounts" @@ -3800,7 +3788,7 @@ msgstr "Fälligkeitsliste" msgctxt "model:ir.action,name:act_balance_non_deferral" msgid "Balance Non-Deferral" -msgstr "Abgleich Saldenvortrag" +msgstr "Erfolgskonten abschließen" msgctxt "model:ir.action,name:act_cancel_moves" msgid "Cancel Moves" @@ -3808,7 +3796,7 @@ msgstr "Buchungssätze stornieren" msgctxt "model:ir.action,name:act_code_tax_open_chart" msgid "Open Chart of Tax Codes" -msgstr "Kennzifferntabelle öffnen" +msgstr "Steuerkennzifferntabelle öffnen" msgctxt "model:ir.action,name:act_configuration_form" msgid "Account Configuration" @@ -3850,10 +3838,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journale - Buchungszeiträume" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journaltypen" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Kontenbewegungen" @@ -3918,9 +3902,13 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Buchungspositionen abstimmen" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "Ausbuchungsmethoden" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" -msgstr "Geschäftsjahr wieder eröffnen" +msgstr "Neues Geschäftsjahr anlegen" msgctxt "model:ir.action,name:act_tax_code_list" msgid "Tax Codes" @@ -4116,7 +4104,7 @@ msgstr "Fälligkeitsliste" msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral" msgid "Balance Non-Deferral" -msgstr "Abgleich Saldenvortrag" +msgstr "Erfolgskonten abschließen" msgctxt "model:ir.ui.menu,name:menu_charts" msgid "Charts" @@ -4136,7 +4124,7 @@ msgstr "Buchungszeiträume abschließen" msgctxt "model:ir.ui.menu,name:menu_code_tax_open_chart" msgid "Open Chart of Tax Codes" -msgstr "Kennzifferntabelle öffnen" +msgstr "Steuerkennzifferntabelle öffnen" msgctxt "model:ir.ui.menu,name:menu_create_chart" msgid "Create Chart of Accounts from Template" @@ -4156,7 +4144,7 @@ msgstr "Geschäftsjahre" msgctxt "model:ir.ui.menu,name:menu_general_account_configuration" msgid "General Account" -msgstr "Allgemeine Konten" +msgstr "Konten" msgctxt "model:ir.ui.menu,name:menu_general_ledger" msgid "General Ledger" @@ -4182,10 +4170,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journale - Buchungszeiträume" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journaltypen" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Buchungssätze" @@ -4196,11 +4180,11 @@ msgstr "Buchungssatz von Vorlage erstellen" msgctxt "model:ir.ui.menu,name:menu_move_template_form" msgid "Account Move Template" -msgstr "Buchungssatzvorlage" +msgstr "Buchungssatzvorlagen" msgctxt "model:ir.ui.menu,name:menu_open_balance_sheet" msgid "Balance Sheet" -msgstr "Bilanzbogen" +msgstr "Bilanz" msgctxt "model:ir.ui.menu,name:menu_open_chart" msgid "Open Chart of Accounts" @@ -4212,7 +4196,7 @@ msgstr "Gewinn- und Verlustrechnung (GuV)" msgctxt "model:ir.ui.menu,name:menu_open_journal" msgid "Open Journal" -msgstr "Journal eröffnen" +msgstr "Buchungen erfassen" msgctxt "model:ir.ui.menu,name:menu_period_form" msgid "Periods" @@ -4224,19 +4208,23 @@ msgstr "Journal Allgemein drucken" msgctxt "model:ir.ui.menu,name:menu_processing" msgid "Processing" -msgstr "In Ausführung" +msgstr "Abschlussarbeiten" msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Konten abstimmen" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "Ausbuchungsmethoden" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" -msgstr "Geschäftsjahr wiedereröffnen" +msgstr "Neues Geschäftsjahr anlegen" msgctxt "model:ir.ui.menu,name:menu_reporting" msgid "Reporting" -msgstr "Berichte" +msgstr "Auswertungen" msgctxt "model:ir.ui.menu,name:menu_tax_code_list" msgid "Tax Codes" @@ -4694,6 +4682,30 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Festgeschrieben" +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Kasse" + +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Aufwand" + +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "Allgemein" + +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Ertrag" + +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Saldenvortrag" + +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Ausbuchung" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Geschlossen" @@ -4998,10 +5010,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Vorlage" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Betrag" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/es.po b/locale/es.po index a341940b41..949a053ee3 100644 --- a/locale/es.po +++ b/locale/es.po @@ -108,10 +108,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Sólo puede abrir un diario por período." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "El código debe ser único." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "El apunte \"%s\" (%d) ya está conciliado." @@ -148,10 +144,6 @@ msgid "" msgstr "" "No puede crear un apunte con cuenta \"%s\" porque es una cuenta tipo vista." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "No puede crear un apunte con la cuenta \"%s\" porque está inactiva." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "No puede modificar el apunte \"%s\" porque ya está conciliado." @@ -372,6 +364,10 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Cierres" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Fecha final" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Saldo en el libro mayor" @@ -412,6 +408,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Conciliar" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "Reemplazado por" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Derecha" @@ -424,6 +424,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Decimales de la segunda moneda" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Fecha inicial" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Impuestos por defecto" @@ -564,6 +568,10 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Cierre" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Fecha final" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Saldo en el libro mayor" @@ -596,6 +604,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Conciliar" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "Reemplazado por" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Fecha inicial" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Impuestos por defecto" @@ -1197,6 +1213,10 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "Haber final" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Fecha final" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "Debe final" @@ -1229,6 +1249,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "Haber inicial" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Fecha inicial" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "Debe inicial" @@ -1449,10 +1473,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Hasta la fecha" -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Cuentas" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Activo" @@ -1477,10 +1497,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Haber" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Cuenta haber por defecto" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Decimales de la moneda" @@ -1489,10 +1505,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Debe" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Cuenta debe por defecto" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1525,46 +1537,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Usuario de modificación" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Empresa" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Fecha de creación" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Usuario de creación" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Cuenta haber por defecto" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Cuenta debe por defecto" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Diario" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "Nombre del registro" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Fecha de modificación" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Usuario de modificación" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "Fecha final" @@ -1657,38 +1629,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Usuario de modificación" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Código" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Fecha de creación" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Usuario de creación" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Nombre" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "Nombre del registro" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Fecha de modificación" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Usuario de modificación" - msgctxt "field:account.move,company:" msgid "Company" msgstr "Empresa" @@ -1977,10 +1917,62 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Hasta la fecha" +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Activo" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Empresa" + +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Fecha de creación" + +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Usuario de creación" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Cuenta haber" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Cuenta debe" + +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Diario" + +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "Nombre del registro" + +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Fecha de modificación" + +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Usuario de modificación" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Importe" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Empresa" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "Decimales de la moneda" @@ -1997,9 +1989,9 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Diario" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Desajuste" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2257,10 +2249,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Diario" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Apuntes" @@ -2274,9 +2262,13 @@ msgid "Party" msgstr "Tercero" msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Desajuste" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Importe" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Activo" @@ -2433,6 +2425,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Descripción" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Fecha final" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2453,6 +2449,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "Nombre del registro" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Fecha inicial" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Plantilla" @@ -2605,6 +2605,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Descripción" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Fecha final" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2625,6 +2629,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "Nombre del registro" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Fecha inicial" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Fecha de modificación" @@ -2793,6 +2801,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Plantilla" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "Sobrescribir plantilla" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Fecha de modificación" @@ -2845,6 +2857,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Plantilla" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "Sobrescribir plantilla" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Fecha de modificación" @@ -3197,10 +3213,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Usuario de modificación" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "Desmarcar para eliminar el uso del registro en el futuro." - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "Sólo muestra el saldo en el libro mayor." @@ -3259,10 +3271,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "Si se marca se van a crear nuevas secuencias." -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "Desmarcar para eliminar el uso del registro en el futuro." - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "Muestra sólo asientos contabilizados." @@ -3321,6 +3329,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Muestra sólo asientos contabilizados." +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "Desmarcar para eliminar el uso del registro en el futuro." + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "Fecha mayor de los apuntes conciliados." @@ -3371,10 +3383,6 @@ msgstr "" "Si se marca, este impuesto modificará el precio unidad para los cálculos de " "impuestos posteriores." -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "Desmarcar para eliminar el uso del registro en el futuro." - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "Marcar para sobrescribir la definición de la plantilla" @@ -3397,6 +3405,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "Una expresión de python que se va a evaluar con las palabras clave." +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "Marcar para sobrescribir la definición de la plantilla" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "Marcar para añadir el impuesto original al impuesto substituido." @@ -3408,6 +3420,10 @@ msgstr "" "Si se rellena el impuesto original, la regla se aplicará sólo para este " "impuesto." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "Marcar para sobrescribir la definición de la plantilla" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "Marcar para añadir el impuesto original al impuesto substituido." @@ -3549,10 +3565,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Existencias" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "Cuentas del diario" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "Contexto diario de caja" @@ -3565,34 +3577,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "Secuencias del diario" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Tipo de diario" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Efectivo" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Gastos" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Ingresos" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situación" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Desajuste" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Asiento contable" @@ -3617,6 +3601,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Imprimir libro diario" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "Desajuste de conciliación" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Conciliar apuntes con desajuste" @@ -3825,10 +3813,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Diarios - Períodos" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Tipos de diarios" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Asientos contables" @@ -3893,6 +3877,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Conciliar apuntes" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "Métodos de desajuste" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renovar ejercicio fiscal" @@ -4157,10 +4145,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Diarios - Períodos" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Tipos de diarios" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Asientos contables" @@ -4205,6 +4189,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Conciliar cuentas" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "Métodos de desajuste" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renovar ejercicio fiscal" @@ -4669,6 +4657,30 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Contabilizado" +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Efectivo" + +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Gastos" + +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Ingresos" + +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situación" + +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Desajuste" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Cerrado" @@ -4973,10 +4985,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Plantilla" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Importe" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/es_419.po b/locale/es_419.po index 33d900f685..687ce20ee4 100644 --- a/locale/es_419.po +++ b/locale/es_419.po @@ -108,10 +108,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Solo puede abrir un libro diario por período." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "La línea \"%s\" (%d) ya está conciliada." @@ -152,12 +148,6 @@ msgstr "" "No puede crear una línea de asiento con la cuenta \"%s\" porque es una " "cuenta de clase vista." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" -"No puede crear una línea de asiento con la cuenta \"%s\" porque esta " -"inactiva." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "No puede modificar la línea \"%s\" porque está conciliada." @@ -372,6 +362,10 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Diferidos" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Saldo en Línea Mayor" @@ -413,6 +407,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "" @@ -425,6 +423,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "" @@ -569,6 +571,10 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Diferido" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Saldo en Libro mayor" @@ -603,6 +609,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "" @@ -1101,9 +1115,10 @@ msgctxt "field:account.fiscalyear,name:" msgid "Name" msgstr "Nombre" +#, fuzzy msgctxt "field:account.fiscalyear,periods:" msgid "Periods" -msgstr "" +msgstr "Periods" msgctxt "field:account.fiscalyear,post_move_sequence:" msgid "Post Move Sequence" @@ -1228,6 +1243,10 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "Saldo Crédito" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "Saldo Débito" @@ -1261,6 +1280,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "Crédito inicial" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "Débito inicial" @@ -1488,11 +1511,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "A la Fecha" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Cuentas" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "" @@ -1517,10 +1535,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Crédito" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Cuenta Crédito por Defecto" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1529,10 +1543,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Débito" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Cuenta Débito por Defecto" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "" @@ -1569,47 +1579,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Modificado por usuario" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Cuenta Crédito por Defecto" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Cuenta Débito por Defecto" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Libro diario" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Modificado por usuario" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "" @@ -1646,9 +1615,10 @@ msgctxt "field:account.journal.period,journal:" msgid "Journal" msgstr "Libro diario" +#, fuzzy msgctxt "field:account.journal.period,period:" msgid "Period" -msgstr "" +msgstr "Periods" msgctxt "field:account.journal.period,rec_name:" msgid "Record Name" @@ -1705,40 +1675,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Modificado por usuario" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Nombre" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Modificado por usuario" - msgctxt "field:account.move,company:" msgid "Company" msgstr "" @@ -1780,9 +1716,10 @@ msgctxt "field:account.move,origin:" msgid "Origin" msgstr "" +#, fuzzy msgctxt "field:account.move,period:" msgid "Period" -msgstr "" +msgstr "Periods" msgctxt "field:account.move,post_date:" msgid "Post Date" @@ -1903,9 +1840,10 @@ msgctxt "field:account.move.line,party_required:" msgid "Party Required" msgstr "Tercero requerido" +#, fuzzy msgctxt "field:account.move.line,period:" msgid "Period" -msgstr "" +msgstr "Periods" msgctxt "field:account.move.line,rec_name:" msgid "Record Name" @@ -2011,9 +1949,10 @@ msgctxt "field:account.move.open_journal.ask,journal:" msgid "Journal" msgstr "Libro Diario" +#, fuzzy msgctxt "field:account.move.open_journal.ask,period:" msgid "Period" -msgstr "" +msgstr "Periods" msgctxt "field:account.move.print_general_journal.start,company:" msgid "Company" @@ -2035,10 +1974,67 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "A la Fecha" +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Cuenta Crédito" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Cuenta Débito" + +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Libro Diario" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Nombre" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Modificado por usuario" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "" @@ -2056,9 +2052,9 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Libro diario" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2169,9 +2165,10 @@ msgctxt "field:account.move.template.create.template,id:" msgid "ID" msgstr "" +#, fuzzy msgctxt "field:account.move.template.create.template,period:" msgid "Period" -msgstr "" +msgstr "Periods" #, fuzzy msgctxt "field:account.move.template.create.template,template:" @@ -2334,11 +2331,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Libro Diario" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Líneas" @@ -2352,7 +2344,11 @@ msgid "Party" msgstr "" msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" +msgstr "" + +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" msgstr "" msgctxt "field:account.tax,active:" @@ -2519,6 +2515,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Descripción" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "" @@ -2541,6 +2541,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code,template:" msgid "Template" @@ -2670,9 +2674,10 @@ msgctxt "field:account.tax.code.open_chart.start,method:" msgid "Method" msgstr "" +#, fuzzy msgctxt "field:account.tax.code.open_chart.start,periods:" msgid "Periods" -msgstr "" +msgstr "Periods" #, fuzzy msgctxt "field:account.tax.code.template,account:" @@ -2700,6 +2705,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Descripción" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "" @@ -2722,6 +2731,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "" @@ -2901,6 +2914,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Plantilla" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "" @@ -2956,6 +2973,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Plantilla" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "" @@ -3327,10 +3348,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Modificado por usuario" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "Mostrar sólo el saldo en el informe del libro mayor" @@ -3387,10 +3404,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "" @@ -3449,6 +3462,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "Fecha mayor de las líneas conciliadas" @@ -3499,10 +3516,6 @@ msgstr "" "Si se marca, este impuesto modificará el precio unitario para los cálculos " "de impuestos posteriores" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3524,6 +3537,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3533,6 +3550,10 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "" +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3677,10 +3698,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "Cuenta del libro diario" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3693,34 +3710,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "Secuencia del libro diario" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Tipo de libro diario" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Asiento Contable" @@ -3745,6 +3734,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Imprimir libro diario general" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Conciliar líneas con desajuste" @@ -3774,9 +3767,10 @@ msgctxt "model:account.open_chart.start,name:" msgid "Open Chart of Accounts" msgstr "Abrir plan de cuentas" +#, fuzzy msgctxt "model:account.period,name:" msgid "Period" -msgstr "" +msgstr "Periods" msgctxt "model:account.reconcile.show,name:" msgid "Reconcile" @@ -3857,21 +3851,24 @@ msgctxt "model:account.update_chart.succeed,name:" msgid "Update Chart" msgstr "Actualizar plan de cuentas" +#, fuzzy msgctxt "model:ir.action,name:act_account_balance_sheet" msgid "Accounts" -msgstr "" +msgstr "Cuentas" +#, fuzzy msgctxt "model:ir.action,name:act_account_balance_sheet_tree" msgid "Balance Sheet" -msgstr "" +msgstr "Estado de Situación Financiera" msgctxt "model:ir.action,name:act_account_general_ledger" msgid "Accounts" msgstr "Accounts" +#, fuzzy msgctxt "model:ir.action,name:act_account_income_statement_tree" msgid "Income Statement" -msgstr "" +msgstr "Estado de Resultado Integral" #, fuzzy msgctxt "model:ir.action,name:act_account_list" @@ -3906,13 +3903,15 @@ msgctxt "model:ir.action,name:act_account_type_tree" msgid "Account Types" msgstr "Tipos de Cuenta" +#, fuzzy msgctxt "model:ir.action,name:act_aged_balance_list" msgid "Aged Balance" -msgstr "" +msgstr "Cartera vencida" +#, fuzzy msgctxt "model:ir.action,name:act_balance_non_deferral" msgid "Balance Non-Deferral" -msgstr "" +msgstr "Saldo Diferido" msgctxt "model:ir.action,name:act_cancel_moves" msgid "Cancel Moves" @@ -3922,49 +3921,54 @@ msgctxt "model:ir.action,name:act_code_tax_open_chart" msgid "Open Chart of Tax Codes" msgstr "" +#, fuzzy msgctxt "model:ir.action,name:act_configuration_form" msgid "Account Configuration" -msgstr "" +msgstr "Configuración contable" +#, fuzzy msgctxt "model:ir.action,name:act_fiscalyear_form" msgid "Fiscal Years" -msgstr "" +msgstr "Año fiscal" +#, fuzzy msgctxt "model:ir.action,name:act_fiscalyear_form_close" msgid "Close Fiscal Years" -msgstr "" +msgstr "Cerrar año fiscal" +#, fuzzy msgctxt "model:ir.action,name:act_general_ledger_account_form" msgid "General Ledger - Accounts" -msgstr "" +msgstr "Contabilidad Libro Mayor" +#, fuzzy msgctxt "model:ir.action,name:act_general_ledger_line_form" msgid "General Ledger - Lines" -msgstr "" +msgstr "Línea de libro mayor" +#, fuzzy msgctxt "model:ir.action,name:act_journal_form" msgid "Journals" -msgstr "" +msgstr "Libro Diario" msgctxt "model:ir.action,name:act_journal_open_cash" msgid "Journals Cash" msgstr "" +#, fuzzy msgctxt "model:ir.action,name:act_journal_period_form_close" msgid "Close Journals - Periods" -msgstr "" +msgstr "Cerrar libros diarios - períodos" +#, fuzzy msgctxt "model:ir.action,name:act_journal_period_tree" msgid "Journals - Periods" -msgstr "" +msgstr "Libro diario - Período" +#, fuzzy msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" -msgstr "" - -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "" +msgstr "Libro diario - Período" msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -3974,9 +3978,10 @@ msgctxt "model:ir.action,name:act_move_from_template" msgid "Account Move" msgstr "Asiento contable" +#, fuzzy msgctxt "model:ir.action,name:act_move_line_form" msgid "Account Move Lines" -msgstr "" +msgstr "Línea de asiento contable" msgctxt "model:ir.action,name:act_move_line_payable_receivable" msgid "Payable/Receivable Lines" @@ -3999,13 +4004,15 @@ msgctxt "model:ir.action,name:act_open_account" msgid "Open Move Account" msgstr "" +#, fuzzy msgctxt "model:ir.action,name:act_open_chart" msgid "Open Chart of Accounts" -msgstr "" +msgstr "Abrir plan de cuentas" +#, fuzzy msgctxt "model:ir.action,name:act_open_journal" msgid "Open Journal" -msgstr "" +msgstr "Abrir libro diario - Solicitar" msgctxt "model:ir.action,name:act_open_tax_code" msgid "Open Tax Code" @@ -4015,9 +4022,10 @@ msgctxt "model:ir.action,name:act_open_type" msgid "Open Type" msgstr "" +#, fuzzy msgctxt "model:ir.action,name:act_period_form" msgid "Periods" -msgstr "" +msgstr "Periods" msgctxt "model:ir.action,name:act_period_form_close" msgid "Close Periods" @@ -4031,6 +4039,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4045,13 +4057,15 @@ msgctxt "model:ir.action,name:act_tax_code_template_tree" msgid "Tax Codes Templates" msgstr "" +#, fuzzy msgctxt "model:ir.action,name:act_tax_code_tree" msgid "Tax Codes" -msgstr "" +msgstr "Códigos de impuesto" +#, fuzzy msgctxt "model:ir.action,name:act_tax_code_tree2" msgid "Tax Codes" -msgstr "" +msgstr "Códigos de impuesto" msgctxt "model:ir.action,name:act_tax_group_form" msgid "Tax Groups" @@ -4081,29 +4095,33 @@ msgctxt "model:ir.action,name:act_unreconcile_lines" msgid "Unreconcile Lines" msgstr "" +#, fuzzy msgctxt "model:ir.action,name:report_aged_balance" msgid "Aged Balance" -msgstr "" +msgstr "Cartera vencida" +#, fuzzy msgctxt "model:ir.action,name:report_general_journal" msgid "General Journal" -msgstr "" +msgstr "Libro diario general" msgctxt "model:ir.action,name:report_general_ledger" msgid "General Ledger" msgstr "" +#, fuzzy msgctxt "model:ir.action,name:report_trial_balance" msgid "Trial Balance" -msgstr "" +msgstr "Balance de comprobación" msgctxt "model:ir.action,name:wizard_create_chart" msgid "Create Chart of Accounts from Template" msgstr "" +#, fuzzy msgctxt "model:ir.action,name:wizard_print_general_journal" msgid "Print General Journal" -msgstr "" +msgstr "Imprimir libro diario general" #, fuzzy msgctxt "model:ir.action,name:wizard_tax_test" @@ -4119,27 +4137,32 @@ msgctxt "" msgid "All" msgstr "" +#, fuzzy msgctxt "" "model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable" msgid "Payable" -msgstr "" +msgstr "Por pagar" +#, fuzzy msgctxt "" "model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable" msgid "Receivable" -msgstr "" +msgstr "Por cobrar" +#, fuzzy msgctxt "model:ir.model.button,confirm:fiscalyear_lock_button" msgid "Are you sure to lock the fiscal year?" -msgstr "" +msgstr "¿Está seguro que quiere cerrar el año fiscal?" +#, fuzzy msgctxt "model:ir.model.button,confirm:period_lock_button" msgid "Are you sure to lock the period?" -msgstr "" +msgstr "Esta seguro que desea bloquear el periodo?" +#, fuzzy msgctxt "model:ir.model.button,string:fiscalyear_close_button" msgid "Close" -msgstr "" +msgstr "Close" msgctxt "model:ir.model.button,string:fiscalyear_create_period_3_button" msgid "Create 3 Monthly Periods" @@ -4161,9 +4184,10 @@ msgctxt "model:ir.model.button,string:move_post_button" msgid "Post" msgstr "" +#, fuzzy msgctxt "model:ir.model.button,string:period_close_button" msgid "Close" -msgstr "" +msgstr "Close" msgctxt "model:ir.model.button,string:period_lock_button" msgid "Lock" @@ -4177,9 +4201,10 @@ msgctxt "model:ir.sequence,name:sequence_account_journal" msgid "Default Account Journal" msgstr "" +#, fuzzy msgctxt "model:ir.sequence,name:sequence_account_move_reconciliation" msgid "Default Account Move Reconciliation" -msgstr "" +msgstr "Líneas de conciliación de asientos contables" msgctxt "model:ir.sequence.type,name:sequence_type_account_journal" msgid "Account Journal" @@ -4189,10 +4214,11 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_move" msgid "Account Move" msgstr "Asiento contable" +#, fuzzy msgctxt "" "model:ir.sequence.type,name:sequence_type_account_move_reconciliation" msgid "Account Move Reconciliation" -msgstr "" +msgstr "Líneas de conciliación de asientos contables" msgctxt "model:ir.ui.menu,name:menu_account" msgid "Financial" @@ -4228,25 +4254,29 @@ msgctxt "model:ir.ui.menu,name:menu_account_type_tree" msgid "Account Types" msgstr "Tipos de cuenta" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_aged_balance" msgid "Aged Balance" -msgstr "" +msgstr "Cartera vencida" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral" msgid "Balance Non-Deferral" -msgstr "" +msgstr "Saldo Diferido" msgctxt "model:ir.ui.menu,name:menu_charts" msgid "Charts" msgstr "" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_close_fiscalyear" msgid "Close Fiscal Years" -msgstr "" +msgstr "Cerrar año fiscal" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_close_journal_period" msgid "Close Journals - Periods" -msgstr "" +msgstr "Cerrar libros diarios - períodos" msgctxt "model:ir.ui.menu,name:menu_close_period" msgid "Close Periods" @@ -4264,13 +4294,15 @@ msgctxt "model:ir.ui.menu,name:menu_entries" msgid "Entries" msgstr "" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_fiscalyear_configuration" msgid "Fiscal Years" -msgstr "" +msgstr "Año fiscal" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_fiscalyear_form" msgid "Fiscal Years" -msgstr "" +msgstr "Año fiscal" msgctxt "model:ir.ui.menu,name:menu_general_account_configuration" msgid "General Account" @@ -4280,29 +4312,29 @@ msgctxt "model:ir.ui.menu,name:menu_general_ledger" msgid "General Ledger" msgstr "" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_journal_configuration" msgid "Journals" -msgstr "" +msgstr "Libro Diario" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_journal_form" msgid "Journals" -msgstr "" +msgstr "Libro Diario" msgctxt "model:ir.ui.menu,name:menu_journal_open_cash" msgid "Journals Cash" msgstr "" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_journal_period_tree" msgid "Journals - Periods" -msgstr "" +msgstr "Libro diario - Período" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" -msgstr "" - -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "" +msgstr "Libro diario - Período" msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4317,29 +4349,35 @@ msgctxt "model:ir.ui.menu,name:menu_move_template_form" msgid "Account Move Template" msgstr "Plantilla de cuenta de impuesto" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_open_balance_sheet" msgid "Balance Sheet" -msgstr "" +msgstr "Estado de Situación Financiera" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_open_chart" msgid "Open Chart of Accounts" -msgstr "" +msgstr "Abrir plan de cuentas" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_open_income_statement" msgid "Income Statement" -msgstr "" +msgstr "Estado de Resultado Integral" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_open_journal" msgid "Open Journal" -msgstr "" +msgstr "Abrir libro diario - Solicitar" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_period_form" msgid "Periods" -msgstr "" +msgstr "Periods" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_print_general_journal" msgid "Print General Journal" -msgstr "" +msgstr "Imprimir libro diario general" msgctxt "model:ir.ui.menu,name:menu_processing" msgid "Processing" @@ -4349,6 +4387,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4392,9 +4434,10 @@ msgctxt "model:ir.ui.menu,name:menu_tax_template_list" msgid "Taxes Templates" msgstr "" +#, fuzzy msgctxt "model:ir.ui.menu,name:menu_tax_test" msgid "Test Tax" -msgstr "" +msgstr "Test de Impuesto" msgctxt "model:ir.ui.menu,name:menu_taxes" msgid "Taxes" @@ -4409,17 +4452,19 @@ msgctxt "model:ir.ui.menu,name:menu_update_chart" msgid "Update Chart of Accounts from Template" msgstr "" +#, fuzzy msgctxt "model:ir.ui.menu,name:menuitem_account_configuration" msgid "Account Configuration" -msgstr "" +msgstr "Configuración contable" msgctxt "model:party.party.account,name:" msgid "Party Account" msgstr "" +#, fuzzy msgctxt "model:res.group,name:group_account" msgid "Account" -msgstr "" +msgstr "Cuenta" msgctxt "model:res.group,name:group_account_admin" msgid "Account Administration" @@ -4805,9 +4850,10 @@ msgctxt "selection:account.configuration.tax_rounding,tax_rounding:" msgid "Per Line" msgstr "" +#, fuzzy msgctxt "selection:account.fiscalyear,state:" msgid "Close" -msgstr "" +msgstr "Close" msgctxt "selection:account.fiscalyear,state:" msgid "Locked" @@ -4825,9 +4871,35 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "" +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "" + +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "" + +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "" + +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "" + +#, fuzzy msgctxt "selection:account.journal.period,state:" msgid "Close" -msgstr "" +msgstr "Close" msgctxt "selection:account.journal.period,state:" msgid "Open" @@ -5073,9 +5145,10 @@ msgstr "" "Ahora puede crear un plan de cuentas para su empresa seleccionando una " "plantilla de plan de cuentas." +#, fuzzy msgctxt "view:account.fiscalyear:" msgid "Periods" -msgstr "" +msgstr "Periods" #, fuzzy msgctxt "view:account.fiscalyear:" @@ -5106,9 +5179,10 @@ msgctxt "view:account.general_ledger.line:" msgid "Debit" msgstr "Débito" +#, fuzzy msgctxt "view:account.journal.period:" msgid "Close" -msgstr "" +msgstr "Close" msgctxt "view:account.journal.period:" msgid "Re-Open" @@ -5138,10 +5212,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Plantilla" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "" - msgctxt "view:account.tax.template:" msgid "%" msgstr "" @@ -5290,9 +5360,10 @@ msgctxt "wizard_button:account.tax.code.open_chart,start,open_:" msgid "Open" msgstr "" +#, fuzzy msgctxt "wizard_button:account.tax.test,test,end:" msgid "Close" -msgstr "" +msgstr "Close" msgctxt "wizard_button:account.update_chart,start,end:" msgid "Cancel" diff --git a/locale/fa.po b/locale/fa.po index 7e42b0497e..1bafe35f91 100644 --- a/locale/fa.po +++ b/locale/fa.po @@ -100,10 +100,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "شما از هر دوره فقط میتوانید یک روزنامه باز کنید." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "کد باید منحصر بفرد باشد." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "سطر \"%s\" (%d) مطابقت داده شده است." @@ -142,11 +138,6 @@ msgstr "" "شما نمی توانید یک سطر جابجایی با حساب \"٪ s\" ایجاد کنید زیرا آن یک حساب " "نمایشی است." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" -"شما نمی توانید یک سطر جابجایی با حساب \"٪ s\" ایجاد کنید زیرا غیرفعال است." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "شمانمی توانید سطر \"%s\" را تغییر دهید چونکه مطابقت داده شده است." @@ -367,6 +358,11 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "بازپرداخت ها" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "تاریخ پایان" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "تراز دفتر کل" @@ -407,6 +403,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "تطبیق" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "راست" @@ -419,6 +419,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "رقم های پول دوم" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "تاریخ شروع" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "مالیات های پیش فرض" @@ -559,6 +564,11 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "بازپرداخت" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "تاریخ پایان" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "تراز دفتر کل" @@ -591,6 +601,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "تطبیق" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "تاریخ شروع" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "مالیات های پیش فرض" @@ -1192,6 +1211,11 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "پایان بستانکاری" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "تاریخ پایان" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "پایان بدهی" @@ -1224,6 +1248,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "شروع بستانکاری" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "تاریخ شروع" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "شروع بدهی" @@ -1444,10 +1473,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "تا تاریخ" -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "حساب ها" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "فعال" @@ -1472,10 +1497,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "بستانکاری" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "حساب بستانکاری پیش فرض" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "رقم های واحد پول" @@ -1484,10 +1505,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "بدهی" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "حساب بدهی پیش فرض" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "شناسه" @@ -1520,46 +1537,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "نوشته کاربر" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "شرکت" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "تاریخ ایجاد" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "کاربر ایجاد کننده" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "حساب بستانکاری پیش فرض" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "حساب بدهی پیش فرض" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "شناسه" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "روزنامه" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "نام پرونده" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "تاریخ نوشته" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "نوشته کاربر" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "تاریخ پایان" @@ -1652,38 +1629,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "نوشته کاربر" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "کد" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "تاریخ ایجاد" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "کاربر ایجاد کننده" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "شناسه" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "نام" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "نام پرونده" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "تاریخ نوشته" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "نوشته کاربر" - msgctxt "field:account.move,company:" msgid "Company" msgstr "شرکت" @@ -1972,10 +1917,75 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "تا تاریخ" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "فعال" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "شرکت" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "تاریخ ایجاد" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "کاربر ایجاد کننده" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "حساب بستانکاری" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "حساب بدهی" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "شناسه" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "روزنامه" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "نام" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "نام پرونده" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "تاریخ نوشته" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "نوشته کاربر" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "مقدار" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "شرکت" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "رقم های واحد پول" @@ -1992,9 +2002,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "شناسه" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "روزنامه" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "قلم زده شده" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2252,10 +2263,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "شناسه" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "روزنامه" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "سطرها" @@ -2268,10 +2275,16 @@ msgctxt "field:account.reconcile.show,party:" msgid "Party" msgstr "نهاد/سازمان" +#, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "قلم زده شده" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "مقدار" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "فعال" @@ -2428,6 +2441,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "شرح" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "تاریخ پایان" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "شناسه" @@ -2448,6 +2466,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "نام پرونده" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "تاریخ شروع" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "الگو" @@ -2600,6 +2623,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "شرح" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "تاریخ پایان" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "شناسه" @@ -2620,6 +2648,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "نام پرونده" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "تاریخ شروع" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "تاریخ نوشته" @@ -2788,6 +2821,11 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "الگو" +#, fuzzy +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "بازنویسی الگو" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "تاریخ نوشته" @@ -2840,6 +2878,11 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "الگو" +#, fuzzy +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "بازنویسی الگو" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "تاریخ نوشته" @@ -3192,10 +3235,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "نوشته کاربر" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "برای خارج کردن از استفاده در آینده، علامت را حذف کنید." - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "نمایش فقط تراز در گزارش دفتر کل" @@ -3256,10 +3295,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "اگر کادر را تیک بزنید، توالی های جدید ایجاد خواهند شد." -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "برای خارج کردن از استفاده در آینده، تیک را بردارید." - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "نمایش فقط جابجایی ارسال شده" @@ -3316,6 +3351,11 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "نمایش فقط جابجایی ارسال شده" +#, fuzzy +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "برای خارج کردن از استفاده در آینده، علامت را حذف کنید." + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "بالاترین تاریخ تطبیق دادن سطرها" @@ -3364,10 +3404,6 @@ msgstr "" "اگر کادر را تیک بزنید، قیمت واحد برای محاسبه مالیات بیشتر با این مالیات " "اصلاح خواهد شد" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "برای خارج کردن از استفاده در آینده، تیک را بردارید." - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "برای بازنویسی تعاریف الگو، کادر را تیک بزنید" @@ -3388,6 +3424,11 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "یک عبارت پایتون که با کلمات کلیدی ارزیابی می شود." +#, fuzzy +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "علامت گذاری برای بازنویسی تعاریف الگو" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "برای اضافه کردن مالیات اصلی به مالیات جایگزین، کادر را تیک بزنید." @@ -3397,6 +3438,11 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "اگر مالیات اصلی پر شود، این قانون فقط برای این مالیات اعمال خواهد شد." +#, fuzzy +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "علامت گذاری برای بازنویسی تعاریف الگو" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "برای اضافه کردن مالیات اصلی به مالیات جایگزین، کادر را تیک بزنید." @@ -3538,10 +3584,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "موجودی" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "حساب روزنامه" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "مفاد روزنامه نقدی" @@ -3554,34 +3596,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "ادامه روزنامه" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "نوع روزنامه" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "نقدی" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "هزینه" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "عمومی" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "درآمد" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "وضعیت" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "قلم زده شده" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "حساب جابجایی" @@ -3606,6 +3620,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "چاپ روزنامه کل" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "تطبیق دادن سطرهای قلم زده شده" @@ -3814,10 +3832,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "روزنامه ها - دوره ها" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "انواع روزنامه" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "حساب جابجایی ها" @@ -3882,6 +3896,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "تطبیق دادن سطرها" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "ایجاد مجدد سال مالی" @@ -4146,10 +4164,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "روزنامه ها - دوره ها" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "انواع روزنامه" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "حساب جابجایی ها" @@ -4194,6 +4208,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "تطبیق دادن حساب ها" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "ایجاد مجدد سال مالی" @@ -4658,6 +4676,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "ارسال شده" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "نقدی" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "هزینه" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "عمومی" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "درآمد" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "وضعیت" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "قلم زده شده" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "بسته" @@ -4962,10 +5010,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "الگو" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "میزان" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/fr.po b/locale/fr.po index bf6a986b79..16e767250a 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -112,10 +112,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Vous ne pouvez ouvrir qu'un seul journal par période." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "Le code doit être unique." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "La ligne « %s » (%d) est déjà réconciliée." @@ -156,12 +152,6 @@ msgstr "" "Vous ne pouvez pas créer une ligne de mouvement avec le compte « %s » car " "c'est un compte de type vue." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" -"Vous ne pouvez pas créer une ligne de mouvement avec le compte « %s » car il" -" est inactif." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "Vous ne pouvez modifier la ligne « %s » car elle est réconciliée." @@ -189,24 +179,24 @@ msgid "" "You can not reconcile line \"%(line)s\" because its account \"%(account)s\" " "is configured as not reconcilable." msgstr "" -"Vous ne pouvez réconcilier la ligne « %(line)s » car son compte « " -"%(account)s » est configuré comme non-réconciliable." +"Vous ne pouvez réconcilier la ligne « %(line)s » car son compte " +"« %(account)s » est configuré comme non-réconciliable." msgctxt "error:account.move.reconciliation:" msgid "" "You can not reconcile line \"%(line)s\" because its account \"%(account1)s\"" " is different from \"%(account2)s\"." msgstr "" -"Vous ne pouvez pas réconcilier la ligne « %(line)s » car son compte « " -"%(account1)s » est différent de « %(account2)s »." +"Vous ne pouvez pas réconcilier la ligne « %(line)s » car son compte " +"« %(account1)s » est différent de « %(account2)s »." msgctxt "error:account.move.reconciliation:" msgid "" "You can not reconcile line \"%(line)s\" because its party \"%(party1)s\" is " "different from \"%(party2)s\"." msgstr "" -"Vous ne pouvez pas réconcilier la ligne « %(line)s » car son tiers « " -"%(party1)s » est différent de « %(party2)s »." +"Vous ne pouvez pas réconcilier la ligne « %(line)s » car son tiers " +"« %(party1)s » est différent de « %(party2)s »." msgctxt "error:account.move.reconciliation:" msgid "You can not reconcile line \"%s\" because it is not in valid state." @@ -292,30 +282,30 @@ msgid "" "You can not open period \"%(period)s\" because its fiscal year " "\"%(fiscalyear)s\" is closed." msgstr "" -"Vous ne pouvez ouvrir la période « %(period)s » car son année fiscale « " -"%(fiscalyear)s » est clôturée." +"Vous ne pouvez ouvrir la période « %(period)s » car son année fiscale " +"« %(fiscalyear)s » est clôturée." msgctxt "error:account.tax.line:" msgid "You can not add/modify tax lines in closed period \"%s\"." msgstr "" -"Vous ne pouvez ajouter ou modifier des lignes dans la période clôturée « %s " -"»." +"Vous ne pouvez ajouter ou modifier des lignes dans la période clôturée " +"« %s »." msgctxt "error:account.tax.template:" msgid "" "\"Update Unit Price\" can not be set on tax \"%(template)s\" which has a " "parent." msgstr "" -"« Mettre à jour le prix unitaire » ne peut pas coché sur la taxe « " -"%(template)s » qui a un parent." +"« Mettre à jour le prix unitaire » ne peut pas coché sur la taxe " +"« %(template)s » qui a un parent." msgctxt "error:account.tax:" msgid "" "\"Update Unit Price\" can not be set on tax \"%(template)s\" which has a " "parent." msgstr "" -"« Mettre à jour le prix unitaire » ne peut pas coché sur la taxe « " -"%(template)s » qui a un parent." +"« Mettre à jour le prix unitaire » ne peut pas coché sur la taxe " +"« %(template)s » qui a un parent." msgctxt "error:party.erase:" msgid "" @@ -389,6 +379,10 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Reports" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Date de fin" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Balance du grand livre" @@ -429,6 +423,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "A réconcilier" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "Remplacer par" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Droite" @@ -441,6 +439,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Décimales de la seconde devise" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Date de début" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Taxes par défaut" @@ -581,6 +583,10 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Report" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Date de fin" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Balance du grand livre" @@ -613,6 +619,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "A réconcilier" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "Remplacer par" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Date de début" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Taxes par défaut" @@ -1214,6 +1228,10 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "Crédit final" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Date de fin" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "Débit final" @@ -1246,6 +1264,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "Crédit de départ" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Date de début" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "Débit de départ" @@ -1466,10 +1488,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Date de fin" -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Comptes" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Actif" @@ -1494,10 +1512,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Crédit" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Compte de crédit par défaut" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Décimales de la devise" @@ -1506,10 +1520,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Débit" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Compte de débit par défaut" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1542,46 +1552,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Mis à jour par" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Société" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Date de création" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Créé par" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Compte de crédit par défaut" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Compte de débit par défaut" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Journal" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "Nom de l'enregistrement" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Date de mise à jour" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Mis à jour par" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "Date de fin" @@ -1674,38 +1644,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Mis à jour par" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Code" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Date de création" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Créé par" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Nom" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "Nom de l'enregistrement" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Date de mise à jour" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Mis à jour par" - msgctxt "field:account.move,company:" msgid "Company" msgstr "Société" @@ -1994,10 +1932,62 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Date de fin" +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Actif" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Société" + +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Date de création" + +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Créé par" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Compte de crédit" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Compte de débit" + +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Journal" + +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Nom" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "Nom de l'enregistrement" + +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Date de mise à jour" + +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Mis à jour par" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Montant" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Société" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "Décimales de la devise" @@ -2014,9 +2004,9 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Journal" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Pertes et profits" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2274,10 +2264,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Journal" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Lignes" @@ -2291,9 +2277,13 @@ msgid "Party" msgstr "Tiers" msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Pertes et profits" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Montant" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Actif" @@ -2450,6 +2440,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Description" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Date de fin" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2470,6 +2464,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "Nom de l'enregistrement" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Date de début" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Modèle" @@ -2622,6 +2620,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Description" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Date de fin" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2642,6 +2644,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "Nom de l'enregistrement" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Date de début" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Date de mise à jour" @@ -2810,6 +2816,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Modèle" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "Surcharger le modèle" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Date de mise à jour" @@ -2862,6 +2872,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Modèle" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "Surcharger le modèle" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Date de mise à jour" @@ -3214,10 +3228,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Mis à jour par" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "Décocher pour exclure d'une utilisation future." - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "Afficher seulement la balance dans le grand livre" @@ -3278,10 +3288,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "Si cochée, de nouvelles séquences seront créées." -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "Décocher pour exclure d'une utilisation future." - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "Montrer seulement les mouvements postés" @@ -3340,6 +3346,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Montrer seulement les mouvements postés" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "Décocher pour exclure d'une utilisation future." + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "La plus grande date des lignes réconciliées" @@ -3390,10 +3400,6 @@ msgstr "" "Si coché alors le prix unitaire est modifié par cette taxe pour la suite du " "calcul de taxe" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "Décocher pour exclure d'une utilisation future." - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "Cocher pour surcharger la définition du modèle" @@ -3414,6 +3420,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "Une expression python qui sera évaluée avec les mot-clés." +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "Cocher pour surcharger la définition du modèle" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "Cocher pour ajouter la taxe originale à la taxe substituée." @@ -3425,6 +3435,10 @@ msgstr "" "Si la taxe d'origine est spécifiée, la règle ne sera appliquée que sur " "celle-ci." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "Cocher pour surcharger la définition du modèle" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "Cocher pour ajouter la taxe originale à la taxe substituée." @@ -3455,7 +3469,7 @@ msgstr "Compte - taxe" msgctxt "model:account.account.deferral,name:" msgid "Account Deferral" -msgstr "Compte Report" +msgstr "Compte de report" msgctxt "model:account.account.template,name:" msgid "Account Template" @@ -3565,10 +3579,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "Journal comptable" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "Contexte du journal d'espèces" @@ -3581,34 +3591,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "Séquence de journal" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Type de journal" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Espèces" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Charge" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "Général" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Produit" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Pertes et profits" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Mouvement comptable" @@ -3633,6 +3615,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Imprimer le journal général" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "Réconcilier Pertes et profits" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Réconcilier les lignes de pertes et profits" @@ -3841,10 +3827,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journaux - périodes" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Types de journal" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Mouvements comptables" @@ -3909,6 +3891,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Réconcilier les lignes" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "Méthodes de pertes et profits" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renouveler une année fiscale" @@ -4173,10 +4159,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journaux - périodes" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Types de journaux" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Mouvements comptables" @@ -4221,6 +4203,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Réconcilier les comptes" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "Méthodes de pertes et profits" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renouveler une année fiscale" @@ -4685,6 +4671,30 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Posté" +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Espèces" + +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Charge" + +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "Général" + +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Produit" + +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Pertes et profits" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Clôturée" @@ -4989,10 +4999,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Modèle" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Montant" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/hu_HU.po b/locale/hu_HU.po index 4c9938907f..88320366b5 100644 --- a/locale/hu_HU.po +++ b/locale/hu_HU.po @@ -90,10 +90,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "" -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "" @@ -128,10 +124,6 @@ msgid "" "account." msgstr "" -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "" @@ -330,9 +322,14 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "" + +#, fuzzy msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" #, fuzzy msgctxt "field:account.account,id:" @@ -374,6 +371,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "" @@ -386,6 +387,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "" @@ -548,9 +553,14 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "" + +#, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" #, fuzzy msgctxt "field:account.account.template,id:" @@ -583,6 +593,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "" @@ -1285,13 +1303,18 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" +#, fuzzy msgctxt "field:account.general_ledger.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" #, fuzzy msgctxt "field:account.general_ledger.account,id:" @@ -1320,6 +1343,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1573,11 +1600,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Dátumig" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Számlák" - #, fuzzy msgctxt "field:account.journal,active:" msgid "Active" @@ -1606,10 +1628,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1618,10 +1636,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "" - #, fuzzy msgctxt "field:account.journal,id:" msgid "ID" @@ -1661,53 +1675,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Által módosítva" -#, fuzzy -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Társaság" - -#, fuzzy -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Létrehozás détuma" - -#, fuzzy -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Által létrehozva " - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Journals" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "utolsó módosítás dátuma" - -#, fuzzy -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Által módosítva" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "" @@ -1819,45 +1786,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Által módosítva" -#, fuzzy -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Partner kód" - -#, fuzzy -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Létrehozás détuma" - -#, fuzzy -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Által létrehozva " - -#, fuzzy -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -#, fuzzy -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Név" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "utolsó módosítás dátuma" - -#, fuzzy -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Által módosítva" - #, fuzzy msgctxt "field:account.move,company:" msgid "Company" @@ -2188,10 +2116,72 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Dátumig" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Aktív" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Társaság" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Létrehozás détuma" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Által létrehozva " + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Journals" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Név" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "utolsó módosítás dátuma" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Által módosítva" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Társaság" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "" @@ -2212,9 +2202,9 @@ msgid "ID" msgstr "ID" #, fuzzy -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Journals" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Write-Off" #, fuzzy msgctxt "field:account.move.reconciliation,create_date:" @@ -2527,11 +2517,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Journals" - #, fuzzy msgctxt "field:account.reconcile.show,lines:" msgid "Lines" @@ -2548,9 +2533,13 @@ msgstr "Harmadik" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Write-Off" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "" + #, fuzzy msgctxt "field:account.tax,active:" msgid "Active" @@ -2730,6 +2719,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Leírás" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code,id:" msgid "ID" @@ -2754,6 +2747,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code,template:" msgid "Template" @@ -2933,6 +2930,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Leírás" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code.template,id:" msgid "ID" @@ -2957,6 +2958,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" @@ -3155,6 +3160,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Űrlap adószámlához" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + #, fuzzy msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" @@ -3216,6 +3225,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Űrlap adószámlához" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + #, fuzzy msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" @@ -3620,10 +3633,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Által módosítva" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3678,10 +3687,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "" @@ -3736,6 +3741,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3782,10 +3791,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3806,6 +3811,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3815,6 +3824,10 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "" +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3838,9 +3851,10 @@ msgctxt "model:account.account,name:" msgid "Account" msgstr "Számla" +#, fuzzy msgctxt "model:account.account-account.tax,name:" msgid "Account - Tax" -msgstr "" +msgstr "Account Types" msgctxt "model:account.account.deferral,name:" msgid "Account Deferral" @@ -3964,10 +3978,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3981,35 +3991,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -#, fuzzy -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Journal Types" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - #, fuzzy msgctxt "model:account.move,name:" msgid "Account Move" @@ -4040,6 +4021,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Print General Journal" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "" @@ -4082,9 +4067,10 @@ msgctxt "model:account.reconcile.show,name:" msgid "Reconcile" msgstr "" +#, fuzzy msgctxt "model:account.tax,name:" msgid "Account Tax" -msgstr "" +msgstr "Account Types" #, fuzzy msgctxt "model:account.tax.code,name:" @@ -4095,9 +4081,10 @@ msgctxt "model:account.tax.code.line,name:" msgid "Tax Code Line" msgstr "" +#, fuzzy msgctxt "model:account.tax.code.line.template,name:" msgid "Tax Code Line Template" -msgstr "" +msgstr "Tax Codes Templates" #, fuzzy msgctxt "model:account.tax.code.open_chart.start,name:" @@ -4119,9 +4106,10 @@ msgctxt "model:account.tax.line,name:" msgid "Tax Line" msgstr "Tax Lines" +#, fuzzy msgctxt "model:account.tax.line.template,name:" msgid "Account Tax Line Template" -msgstr "" +msgstr "Account Move Template" #, fuzzy msgctxt "model:account.tax.rule,name:" @@ -4132,9 +4120,10 @@ msgctxt "model:account.tax.rule.line,name:" msgid "Tax Rule Line" msgstr "" +#, fuzzy msgctxt "model:account.tax.rule.line.template,name:" msgid "Tax Rule Line Template" -msgstr "" +msgstr "Tax Rule Templates" #, fuzzy msgctxt "model:account.tax.rule.template,name:" @@ -4267,10 +4256,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -4336,6 +4321,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4604,10 +4593,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -4653,6 +4638,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -5170,6 +5159,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Write-Off" + #, fuzzy msgctxt "selection:account.journal.period,state:" msgid "Close" @@ -5318,9 +5337,10 @@ msgctxt "selection:account.tax.code.line.template,type:" msgid "Invoice" msgstr "" +#, fuzzy msgctxt "selection:account.tax.code.open_chart.start,method:" msgid "By Fiscal Year" -msgstr "" +msgstr "Fiscal Years" msgctxt "selection:account.tax.code.open_chart.start,method:" msgid "By Periods" @@ -5497,10 +5517,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Űrlap adószámlához" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "" - #, fuzzy msgctxt "view:account.tax.template:" msgid "%" diff --git a/locale/it_IT.po b/locale/it_IT.po index 7a33d2b420..10fc70b0c9 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -102,10 +102,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Puoi aprire solo un registro per periodo" -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "Il codice dev'essere unico" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "Riga \"%s\" (%d) già riconciliata" @@ -141,10 +137,6 @@ msgid "" "account." msgstr "Movimento non scrivibile nel conto \"%s\" in quanto conto vista" -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "Riga con movimento non creabile in conto \"%s\" perché inattivo. " - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "Riga \"%s\" non modificabile perché riconciliata" @@ -350,6 +342,11 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Differimenti" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Data fine" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Saldo Mastro" @@ -390,6 +387,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Riconciliazione" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Destra" @@ -403,6 +404,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Posizioni seconda valuta" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Data inizio" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Imposte predefinite" @@ -558,6 +564,11 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Differimento" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Data fine" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Saldo Mastro" @@ -590,6 +601,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Riconciliazione" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Data inizio" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Imposte predefinite" @@ -1238,6 +1258,11 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Data fine" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" @@ -1270,6 +1295,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Data inizio" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1503,11 +1533,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "a data" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Conti" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Attivo" @@ -1534,10 +1559,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "AVERE" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Conto AVERE predefinito" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Posizioni Valuta" @@ -1546,10 +1567,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "DARE" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Conto DARE predefinito" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1584,55 +1601,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Scrivente" -#, fuzzy -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Azienda" - -#, fuzzy -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Creazione Data" - -#, fuzzy -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Creazione Utente" - -#, fuzzy -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Conto AVERE predefinito" - -#, fuzzy -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Conto DARE predefinito" - -#, fuzzy -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Registro" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Data di Scrittura" - -#, fuzzy -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Scrivente" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "Data fine" @@ -1738,42 +1706,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Scrivente" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Codice" - -#, fuzzy -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Creazione Data" - -#, fuzzy -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Creazione Utente" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Nome" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Data di Scrittura" - -#, fuzzy -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Scrivente" - msgctxt "field:account.move,company:" msgid "Company" msgstr "Azienda" @@ -2071,10 +2003,74 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "a data" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Attivo" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Azienda" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Creazione Data" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Creazione Utente" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Conto AVERE" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Conto DARE" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Registro" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Nome" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Data di Scrittura" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Scrivente" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Importo" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Azienda" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "Posizioni Valuta" @@ -2091,9 +2087,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Registro" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Svalutazione" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2372,10 +2369,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Registro" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Righe" @@ -2390,9 +2383,14 @@ msgstr "Controparti" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Svalutazione" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Importo" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Attivo" @@ -2562,6 +2560,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Descrizione" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Data fine" + #, fuzzy msgctxt "field:account.tax.code,id:" msgid "ID" @@ -2584,6 +2587,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Data inizio" + #, fuzzy msgctxt "field:account.tax.code,template:" msgid "Template" @@ -2764,6 +2772,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Descrizione" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Data fine" + #, fuzzy msgctxt "field:account.tax.code.template,id:" msgid "ID" @@ -2786,6 +2799,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Data inizio" + #, fuzzy msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" @@ -2973,6 +2991,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + #, fuzzy msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" @@ -3028,6 +3050,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + #, fuzzy msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" @@ -3419,10 +3445,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Scrivente" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "Indica solo il saldo nel libro Mastro" @@ -3480,10 +3502,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - #, fuzzy msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" @@ -3543,6 +3561,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Mostra solo movimento registrato" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3592,10 +3614,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3616,6 +3634,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3627,6 +3649,10 @@ msgstr "" "Se l'imposta iniziale è valorizzata, la regola verrà applicata solo per " "questa imposta" +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3774,10 +3800,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3790,40 +3812,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Tipo Registro" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "Generale" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Movimento contabile" @@ -3848,6 +3836,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Stampa registro riepilogativo" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Riconciliazione Righe con write - off" @@ -4083,11 +4075,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -4167,6 +4154,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4483,11 +4474,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4543,6 +4529,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -5053,6 +5043,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Registrato" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cassa" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Costo" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "Generale" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Svalutazione" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Chiusura" @@ -5381,10 +5401,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Templates" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Importo" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/ja_JP.po b/locale/ja_JP.po index 1c98f6f695..408a68a1b6 100644 --- a/locale/ja_JP.po +++ b/locale/ja_JP.po @@ -90,10 +90,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "" -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "" @@ -128,10 +124,6 @@ msgid "" "account." msgstr "" -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "" @@ -323,6 +315,10 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "" + #, fuzzy msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" @@ -364,6 +360,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "" @@ -376,6 +376,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "" @@ -520,6 +524,10 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "" + #, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" @@ -553,6 +561,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "" @@ -1168,6 +1184,10 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" @@ -1201,6 +1221,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1426,11 +1450,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Accounts" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "" @@ -1455,10 +1474,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1467,10 +1482,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "" @@ -1503,47 +1514,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Journals" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "" @@ -1639,38 +1609,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "" - msgctxt "field:account.move,company:" msgid "Company" msgstr "" @@ -1969,10 +1907,63 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "" +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Journals" + +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1990,9 +1981,9 @@ msgid "ID" msgstr "" #, fuzzy -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Journals" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Write-Off" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2257,11 +2248,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Journals" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "" @@ -2276,9 +2262,13 @@ msgstr "" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Write-Off" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "" @@ -2436,6 +2426,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "" @@ -2456,6 +2450,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code,template:" msgid "Template" @@ -2613,6 +2611,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "" @@ -2633,6 +2635,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "" @@ -2802,6 +2808,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "" @@ -2856,6 +2866,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "" @@ -3217,10 +3231,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3275,10 +3285,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "" @@ -3333,6 +3339,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3379,10 +3389,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3403,6 +3409,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3412,6 +3422,10 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "" +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3562,10 +3576,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3579,35 +3589,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -#, fuzzy -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Journal Types" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - #, fuzzy msgctxt "model:account.move,name:" msgid "Account Move" @@ -3638,6 +3619,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Print General Journal" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "" @@ -3868,10 +3853,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -3938,6 +3919,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4205,10 +4190,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -4253,6 +4234,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4737,6 +4722,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Write-Off" + #, fuzzy msgctxt "selection:account.journal.period,state:" msgid "Close" @@ -5049,10 +5064,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Templates" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "" - msgctxt "view:account.tax.template:" msgid "%" msgstr "" diff --git a/locale/lo.po b/locale/lo.po index ed4ccf409a..b5f1f6e639 100644 --- a/locale/lo.po +++ b/locale/lo.po @@ -106,10 +106,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "ທ່ານສາມາດໄຂພຽງແຕ່ບັນຊີປະຈຳວັນດຽວເທົ່ານັ້ນສຳລັບໜຶ່ງໄລຍະ" -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "ລະຫັດຕ້ອງຊໍ້າກັນ" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "ແຖວລາຍການ \"%s\" (%d)ນີ້ ພິສູດຍອດແລ້ວ." @@ -147,12 +143,6 @@ msgstr "" "ທ່ານບໍ່ສາມາດ ສ້າງ ລາຍການເຄື່ອນໄຫວ ກັບ ບັນຊີ \"%s\" ນີ້ໄດ້ ເພາະວ່າມັນ " "ເປັນບັນຊີສຳລັບເບິ່ງເທົ່ານັ້ນ." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" -"ທ່ານບໍ່ສາມາດ ສ້າງ ລາຍການເຄື່ອນໄຫວ ກັບ ບັນຊີ \"%s\" ນີ້ໄດ້ ເພາະວ່າມັນ " -"ເປັນບັນຊີທີ່ບໍ່ໄດ້ເຄື່ອນໄຫວ." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "" @@ -372,6 +362,11 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "ເຍື້ອນຊໍາລະ" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "ວັນທີສິ້ນສຸດ" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "ດຸນບັນຊີແຍກປະເພດທົ່ວໄປ" @@ -412,6 +407,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "ພິສູດຍອດ" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "ຂວາ" @@ -424,6 +423,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "ເລກເສດສະກຸນເງິນທີສອງ" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "ວັນທີເລີ່ມ" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "ພາສີ ເດີມ" @@ -564,6 +568,11 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "ບັນຊີເຍື້ອນຊໍາລະ" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "ວັນທີສິ້ນສຸດ" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "ດຸນບັນຊີແຍກປະເພດທົ່ວໄປ" @@ -596,6 +605,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "ພິສູດຍອດ" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "ວັນທີເລີ່ມ" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "ພາສີ ເດີມ" @@ -1218,6 +1236,11 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "ຍອດມີຍົກໄປ" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "ວັນທີສິ້ນສຸດ" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "ຍອດໜີ້ຍົກໄປ" @@ -1250,6 +1273,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "ຍອດມີຍົກມາ" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "ວັນທີເລີ່ມ" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "ຍອດໜີ້ຍົກມາ" @@ -1479,11 +1507,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "ເຖິງວັນທີ" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "ບັນຊີ" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "ໃຊ້ຢູ່" @@ -1508,10 +1531,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "ມີ" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "ບັນຊີມີ ເດີມ" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "ເລກເສດສະຸກນເງິນ" @@ -1520,10 +1539,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "ໜີ້" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "ບັນຊີໜີ້ ເດີມ" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ເລກລຳດັບ" @@ -1557,55 +1572,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "ຜູ້ບັນທຶກ" -#, fuzzy -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "ສຳນັກງານ/ຫ້ອງການ" - -#, fuzzy -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "ວັນທີສ້າງ" - -#, fuzzy -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "ຜູ້ສ້າງ" - -#, fuzzy -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "ບັນຊີມີ ເດີມ" - -#, fuzzy -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "ບັນຊີໜີ້ ເດີມ" - -#, fuzzy -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ເລກລຳດັບ" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "ບັນຊີປະຈໍາວັນ" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "ວັນທີບັນທຶກ" - -#, fuzzy -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "ຜູ້ບັນທຶກ" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "ວັນທີສິ້ນສຸດ" @@ -1706,38 +1672,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "ຜູ້ບັນທຶກ" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "ລະຫັດ" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "ວັນທີສ້າງ" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "ຜູ້ສ້າງ" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ເລກລຳດັບ" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "ຊື່" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "ວັນທີບັນທຶກ" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "ຜູ້ບັນທຶກ" - msgctxt "field:account.move,company:" msgid "Company" msgstr "ສຳນັກງານ/ຫ້ອງການ" @@ -2026,10 +1960,74 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "ເຖິງວັນທີ" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "ໃຊ້ຢູ່" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "ສຳນັກງານ/ຫ້ອງການ" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "ວັນທີສ້າງ" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "ຜູ້ສ້າງ" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "ບັນຊີ ມີ" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "ບັນຊີ ໜີ້" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ເລກລຳດັບ" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "ບັນຊີປະຈໍາວັນ" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "ຊື່" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "ວັນທີບັນທຶກ" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "ຜູ້ບັນທຶກ" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "ມູນຄ່າ" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "ສຳນັກງານ/ຫ້ອງການ" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "ເລກເສດສະຸກນເງິນ" @@ -2046,9 +2044,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ເລກລຳດັບ" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "ບັນຊີປະຈໍາວັນ" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "ເພີກຖອນ" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2307,10 +2306,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ເລກລຳດັບ" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "ບັນຊີປະຈໍາວັນ" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "ລາຍການ" @@ -2323,10 +2318,16 @@ msgctxt "field:account.reconcile.show,party:" msgid "Party" msgstr "ພາກສ່ວນ" +#, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "ເພີກຖອນ" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "ມູນຄ່າ" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "ໃຊ້ຢູ່" @@ -2484,6 +2485,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "ເນື້ອໃນລາຍການ" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "ວັນທີສິ້ນສຸດ" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ເລກລຳດັບ" @@ -2505,6 +2511,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "ວັນທີເລີ່ມ" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "ຮ່າງແບບ" @@ -2678,6 +2689,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "ຄຳອະທິບາຍ" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "ວັນທີສິ້ນສຸດ" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ເລກລຳດັບ" @@ -2699,6 +2715,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "ວັນທີເລີ່ມ" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "ວັນທີບັນທຶກ" @@ -2869,6 +2890,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "ຮ່າງແບບ" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "ວັນທີບັນທຶກ" @@ -2921,6 +2946,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "ຮ່າງແບບ" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "ວັນທີບັນທຶກ" @@ -3286,10 +3315,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "ຜູ້ບັນທຶກ" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "ສະແດງແຕ່ດຸນດ່ຽງເທົ່ານັ້ນໃນບົດສະຫຼຸບບັນຊີແຍກປະເພດທົ່ວໄປ" @@ -3347,10 +3372,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "ສະແດງບັນຊີເຄື່ອນໄຫວທີ່ປະກາດແລ້ວເທົ່ານັ້ນ" @@ -3408,6 +3429,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "ສະແດງບັນຊີເຄື່ອນໄຫວທີ່ປະກາດແລ້ວເທົ່ານັ້ນ" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "ວັນທີສູງສຸດຂອງລາຍການກວດສອບຍອດ" @@ -3456,10 +3481,6 @@ msgid "" "by this tax" msgstr "ຖ້າໝາຍເອົາແລ້ວຫົວໜ່ວຍລາຄາສຳລັບການຄິດໄລ່ພາສີຈະຖືກແກ້ໄຂດ້ວຍພາສີນີ້" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3480,6 +3501,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3491,6 +3516,10 @@ msgstr "" "ຖ້າຫາກວ່າອັດຕາພາສີເດີມຖືກປ້ອນເຂົ້າ " "ສູດຄິດໄລ່ກໍຈະປັບໃຊ້ກັບອັດຕາພາສີນີ້ເທົ່ານັ້ນ." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3634,10 +3663,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "ບໍລິບົດບັນຊີເງິນສົດປະຈຳວັນ" @@ -3650,40 +3675,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "ປະເພດບັນຊີປະຈຳວັນ" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "ບັນຊີເຄື່ອນຍ້າຍ" @@ -3708,6 +3699,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "ພິມບັນຊີປະຈຳວັນທົ່ວໄປ" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "ເພີກຖອນລາຍການພິສູດຍອດ" @@ -3941,11 +3936,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -4025,6 +4015,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4343,11 +4337,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4403,6 +4392,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4889,6 +4882,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "ປະກາດແລ້ວ" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "ເພີກຖອນ" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "ອັດ" @@ -5209,10 +5232,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "ຮ່າງແບບ" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "ມູນຄ່າ" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/lt.po b/locale/lt.po index 66333feadd..5acff77ddd 100644 --- a/locale/lt.po +++ b/locale/lt.po @@ -90,10 +90,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "" -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "" @@ -128,10 +124,6 @@ msgid "" "account." msgstr "" -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "" @@ -323,9 +315,14 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "" + +#, fuzzy msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.account,id:" msgid "ID" @@ -364,6 +361,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "" @@ -376,6 +377,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "" @@ -520,9 +525,14 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "" + +#, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.account.template,id:" msgid "ID" @@ -553,6 +563,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "" @@ -1172,13 +1190,18 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" +#, fuzzy msgctxt "field:account.general_ledger.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.general_ledger.account,id:" msgid "ID" @@ -1205,6 +1228,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1430,11 +1457,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Accounts" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "" @@ -1459,10 +1481,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1471,10 +1489,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "" @@ -1508,47 +1522,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Journals" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "" @@ -1644,39 +1617,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Namu" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "" - msgctxt "field:account.move,company:" msgid "Company" msgstr "" @@ -1975,10 +1915,64 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "" +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Journals" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Namu" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1996,9 +1990,9 @@ msgid "ID" msgstr "" #, fuzzy -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Journals" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Write-Off" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2267,11 +2261,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Journals" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "" @@ -2286,9 +2275,13 @@ msgstr "" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Write-Off" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "" @@ -2447,6 +2440,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "" @@ -2468,6 +2465,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code,template:" msgid "Template" @@ -2625,6 +2626,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "" @@ -2646,6 +2651,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "" @@ -2817,6 +2826,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "" @@ -2871,6 +2884,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "" @@ -3234,10 +3251,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3292,10 +3305,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "" @@ -3350,6 +3359,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3396,10 +3409,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3420,6 +3429,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3429,6 +3442,10 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "" +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3452,9 +3469,10 @@ msgctxt "model:account.account,name:" msgid "Account" msgstr "Accounts" +#, fuzzy msgctxt "model:account.account-account.tax,name:" msgid "Account - Tax" -msgstr "" +msgstr "Account Types" msgctxt "model:account.account.deferral,name:" msgid "Account Deferral" @@ -3578,10 +3596,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3595,35 +3609,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -#, fuzzy -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Journal Types" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - #, fuzzy msgctxt "model:account.move,name:" msgid "Account Move" @@ -3654,6 +3639,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Print General Journal" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "" @@ -3696,9 +3685,10 @@ msgctxt "model:account.reconcile.show,name:" msgid "Reconcile" msgstr "" +#, fuzzy msgctxt "model:account.tax,name:" msgid "Account Tax" -msgstr "" +msgstr "Account Types" #, fuzzy msgctxt "model:account.tax.code,name:" @@ -3709,9 +3699,10 @@ msgctxt "model:account.tax.code.line,name:" msgid "Tax Code Line" msgstr "" +#, fuzzy msgctxt "model:account.tax.code.line.template,name:" msgid "Tax Code Line Template" -msgstr "" +msgstr "Tax Codes Templates" #, fuzzy msgctxt "model:account.tax.code.open_chart.start,name:" @@ -3733,9 +3724,10 @@ msgctxt "model:account.tax.line,name:" msgid "Tax Line" msgstr "Tax Lines" +#, fuzzy msgctxt "model:account.tax.line.template,name:" msgid "Account Tax Line Template" -msgstr "" +msgstr "Account Move Template" #, fuzzy msgctxt "model:account.tax.rule,name:" @@ -3746,9 +3738,10 @@ msgctxt "model:account.tax.rule.line,name:" msgid "Tax Rule Line" msgstr "" +#, fuzzy msgctxt "model:account.tax.rule.line.template,name:" msgid "Tax Rule Line Template" -msgstr "" +msgstr "Tax Rule Templates" #, fuzzy msgctxt "model:account.tax.rule.template,name:" @@ -3878,10 +3871,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -3946,6 +3935,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4210,10 +4203,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -4258,6 +4247,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4749,6 +4742,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Write-Off" + #, fuzzy msgctxt "selection:account.journal.period,state:" msgid "Close" @@ -4889,9 +4912,10 @@ msgctxt "selection:account.tax.code.line.template,type:" msgid "Invoice" msgstr "" +#, fuzzy msgctxt "selection:account.tax.code.open_chart.start,method:" msgid "By Fiscal Year" -msgstr "" +msgstr "Fiscal Years" msgctxt "selection:account.tax.code.open_chart.start,method:" msgid "By Periods" @@ -5060,10 +5084,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Templates" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "" - #, fuzzy msgctxt "view:account.tax.template:" msgid "%" diff --git a/locale/nl.po b/locale/nl.po index 1d68fbe603..af87dd061f 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -102,10 +102,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Je kunt slechts één dagboek per periode openen." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "De code moet uniek zijn." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "Regel \"%s\" (%d) is reeds afgeletterd." @@ -144,12 +140,6 @@ msgstr "" "U kunt geen boeking maken op grootboekrekening \"%s\" omdat dit een " "gesaldeerde grootboekrekening is." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" -"U kunt geen boeking maken op grootboekrekening \"%s\" omdat deze inactief " -"is." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "U kut boeking \"%s\" niet wijzigen omdat deze afgeletterd is." @@ -357,6 +347,11 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Historie" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Eind datum" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Grootboek balans" @@ -397,6 +392,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Afletteren" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Rechts" @@ -410,6 +409,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Tweede valuta decimalen" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Start datum" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Standaard belastingen" @@ -555,6 +559,11 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Historisch" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Eind datum" + #, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" @@ -588,6 +597,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Afletteren" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Start datum" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Standaard belastingen" @@ -1234,6 +1252,11 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "Einde credit" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Eind datum" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "Einde debet" @@ -1268,6 +1291,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "Begin credit" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Start datum" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "Begin debet" @@ -1514,11 +1542,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Einddatum" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Grootboekrekeningen" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Actief" @@ -1543,10 +1566,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Credit" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Standaard creditrekening" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Valuta decimalen" @@ -1555,10 +1574,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Debit" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Standaard debitrekening" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1592,55 +1607,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Gebruiker" -#, fuzzy -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Bedrijf" - -#, fuzzy -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Datum" - -#, fuzzy -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Gebruiker" - -#, fuzzy -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Standaard creditrekening" - -#, fuzzy -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Standaard debitrekening" - -#, fuzzy -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Dagboek" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Schrijfdatum" - -#, fuzzy -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Gebruiker" - #, fuzzy msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" @@ -1744,38 +1710,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Gebruiker" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Code" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Datum" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Gebruiker" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Naam" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Datum" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Gebruiker" - #, fuzzy msgctxt "field:account.move,company:" msgid "Company" @@ -2073,11 +2007,75 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Einddatum" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Actief" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Bedrijf" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Datum" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Gebruiker" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Credit grootboekkaart" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Debet grootboekkaart" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Dagboek" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Naam" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Schrijfdatum" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Gebruiker" + #, fuzzy msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Bedrag" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Bedrijf" + #, fuzzy msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" @@ -2095,9 +2093,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Dagboek" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Afboeken" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2369,11 +2368,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Dagboek" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Boekingsregels" @@ -2387,10 +2381,16 @@ msgctxt "field:account.reconcile.show,party:" msgid "Party" msgstr "Relatie" +#, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Afboeken" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Bedrag" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Actief" @@ -2550,6 +2550,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Omschrijving" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Eind datum" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2571,6 +2576,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Start datum" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Sjabloon" @@ -2743,6 +2753,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Omschrijving" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Eind datum" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2764,6 +2779,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Start datum" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Datum" @@ -2939,6 +2959,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Sjabloon" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Datum" @@ -2991,6 +3015,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Sjabloon" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Datum" @@ -3369,10 +3397,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Gebruiker" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3430,10 +3454,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "Alleen bevestigde boekingen weergeven." @@ -3490,6 +3510,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Alleen bevestigde boekingen weergeven." +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3537,10 +3561,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3561,6 +3581,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3572,6 +3596,10 @@ msgstr "" "Als de basisbelasting is ingevuld zal de regel alleen toegepast worden voor " "deze belasting." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3719,10 +3747,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3735,40 +3759,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Dagboektype" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Boeking" @@ -3793,6 +3783,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Dagboek afdrukken" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Afschrijving boekingen afletteren" @@ -4030,11 +4024,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -4114,6 +4103,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4429,11 +4422,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4489,6 +4477,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -5009,6 +5001,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Geboekt" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Afboeken" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Sluiten" @@ -5332,11 +5354,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Sjabloon" -#, fuzzy -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Bedrag" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/pl.po b/locale/pl.po index 842e55e8c1..6a50f4bd42 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -107,10 +107,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Można otworzyć tylko jeden dziennik dla okresu." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "Kod musi być unikatowy." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "Zapis księgowy \"%s\" (%d) został już uzgodniony." @@ -151,12 +147,6 @@ msgstr "" "Nie można tworzyć zapisów księgowych dla konta \"%s\" ponieważ jest to konto" " podglądowe." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" -"Nie można tworzyć zapisów księgowych dla konta \"%s\" ponieważ jest ono " -"nieaktywne." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "Nie można modyfikować zapisu \"%s\" ponieważ jest on uzgodniony." @@ -369,6 +359,11 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Przeniesienia sald" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Data ukończenia" + #, fuzzy msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" @@ -410,6 +405,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Uzgodnienie" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "W prawo" @@ -422,6 +421,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Data rozpoczęcia" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "" @@ -563,6 +567,11 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Przeniesienie salda" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Data ukończenia" + #, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" @@ -596,6 +605,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Uzgodnienie" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Data rozpoczęcia" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "" @@ -1208,6 +1226,11 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Data ukończenia" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" @@ -1242,6 +1265,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Data rozpoczęcia" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1472,10 +1500,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Do dnia" -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Konta" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Aktywny" @@ -1500,10 +1524,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Ma" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Domyślne konto Ma" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1512,10 +1532,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Wn" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Domyślne konto Wn" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1548,46 +1564,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Zapisał" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Firma" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Data utworzenia" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Utworzył" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Domyślne konto Ma" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Domyślne konto Wn" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Rejestr" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "Nazwa rekordu" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Data zapisu" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Zapisał" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "Data ukończenia" @@ -1680,38 +1656,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Zapisał" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Kod" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Data utworzenia" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Utworzył" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Nazwa" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "Nazwa rekordu" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Data zapisu" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Zapisał" - msgctxt "field:account.move,company:" msgid "Company" msgstr "Firma" @@ -2001,10 +1945,75 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Do dnia" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Aktywne" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Firma" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Data utworzenia" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Utworzył" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Konto Ma" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Konto Wn" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Rejestr" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Nazwa" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "Nazwa rekordu" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Data zapisu" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Zapisał" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Wartość" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Firma" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "" @@ -2021,9 +2030,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Rejestr" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Write-Off" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2282,10 +2292,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Rejestr" - #, fuzzy msgctxt "field:account.reconcile.show,lines:" msgid "Lines" @@ -2301,9 +2307,14 @@ msgstr "Strona" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Write-Off" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Ilość" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Aktywny" @@ -2462,6 +2473,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Opis" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Data ukończenia" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2483,6 +2499,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "Nazwa rekordu" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Data rozpoczęcia" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Szablon" @@ -2658,6 +2679,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Opis" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Data ukończenia" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2679,6 +2705,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "Nazwa rekordu" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Data rozpoczęcia" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Data zapisu" @@ -2851,6 +2882,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Szablon" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Data zapisu" @@ -2903,6 +2938,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Szablon" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Data zapisu" @@ -3257,10 +3296,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Zapisał" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3318,10 +3353,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "Pokaż tylko zaksięgowany dowód" @@ -3376,6 +3407,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Pokaż tylko zaksięgowany dowód" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3422,10 +3457,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3446,6 +3477,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3455,6 +3490,10 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "" +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3600,10 +3639,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3616,39 +3651,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -#, fuzzy -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Journal Types" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - #, fuzzy msgctxt "model:account.move,name:" msgid "Account Move" @@ -3678,6 +3680,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Print General Journal" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "" @@ -3926,11 +3932,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -4006,6 +4007,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4314,11 +4319,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4373,6 +4373,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4867,6 +4871,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Zaksięgowany" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Write-Off" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Zamknięty" @@ -5180,10 +5214,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Szablon" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Wartość" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 042025be2e..87fce5b002 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -109,10 +109,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Apenas um diário pode ser aberto por período." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "O código deve ser único." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "Lançamento \"%s\" (%d) já foi reconciliado" @@ -150,10 +146,6 @@ msgid "" "account." msgstr "Não é possível atribuir lançamento à conta sintética \"%s\"." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "Não é possível atribuir lançamento à conta inativa \"%s\"." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "Lançamento \"%s\" já foi reconciliado - impossível alterá-lo." @@ -378,6 +370,11 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Apurações" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Data de término" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Exibir Saldo no Livro Razão" @@ -418,6 +415,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Reconciliar" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Direita" @@ -430,6 +431,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Casas Decimais da Moeda Secundária" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Data de início" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Tributos Padrão" @@ -570,6 +576,11 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Patrimonial" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Data de término" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Exibir Saldo no Livro Razão" @@ -602,6 +613,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Reconciliar" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Data de início" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Tributos Padrão" @@ -1209,6 +1229,11 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "Crédito Final" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Data de término" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "Débito Final" @@ -1241,6 +1266,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "Crédito Inicial" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Data de início" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "Débito Inicial" @@ -1462,10 +1492,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Até" -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Contas" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Ativo" @@ -1490,10 +1516,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Crédito" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Conta padrão para Créditos" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Dígitos da moeda" @@ -1502,10 +1524,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Débito" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Conta padrão para Débitos" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1538,46 +1556,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Editado por" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Empresa" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Data de criação" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Criado por" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Conta de Crédito Padrão" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Conta de Débito Padrão" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Diário" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "Nome do Registro" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Data de edição" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Editado por" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "Data de fim" @@ -1670,38 +1648,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Editado por" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Código" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Data de criação" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Criado por" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Nome" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "Nome do Registro" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Data de edição" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Editado por" - msgctxt "field:account.move,company:" msgid "Company" msgstr "Empresa" @@ -1990,10 +1936,75 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Data final" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Ativo" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Empresa" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Data de criação" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Criado por" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Conta de crédito" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Conta de débito" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Diário" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Nome" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "Nome do Registro" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Data de edição" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Editado por" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Quantidade" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Empresa" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "Dígitos da moeda" @@ -2010,9 +2021,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Diário" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Perdas e lucros" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2270,10 +2282,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Diário" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Linhas" @@ -2286,10 +2294,16 @@ msgctxt "field:account.reconcile.show,party:" msgid "Party" msgstr "Pessoa" +#, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Perdas e lucros" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Quantidade" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Ativo" @@ -2447,6 +2461,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Descrição" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Data de término" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2468,6 +2487,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "Nome do Registro" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Data de início" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Modelo" @@ -2643,6 +2667,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Descrição" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Data de término" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2664,6 +2693,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "Nome do Registro" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Data de início" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Data de edição" @@ -2834,6 +2868,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Modelo" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Data de edição" @@ -2886,6 +2924,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Modelo" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Data de edição" @@ -3238,10 +3280,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Editado por" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "Regra de tributo de fornecedor" @@ -3303,10 +3341,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "Se marcado, novas sequências serão criadas." -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "Exibir apenas lançamentos confirmados" @@ -3365,6 +3399,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Exibir apenas lançamentos confirmados" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "Maior data de linha conciliada" @@ -3413,10 +3451,6 @@ msgid "" "by this tax" msgstr "Use para ordenar os tributos" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3439,6 +3473,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "Uma expressão em python que será processada com as palavras chave." +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "Marque para adicionar o tributo original ao tributo substituído." @@ -3450,6 +3488,10 @@ msgstr "" "Se o tributo original está preenchido, a regra será aplicada apenas para " "este tributo." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "Marque para adicionar o tributo original ao tributo substituído." @@ -3595,10 +3637,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "Conta do Diário" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "Contexto do Caixa do Diário" @@ -3611,40 +3649,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "Sequência do Diário" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Tipo de Diário" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Lançamento Contábil" @@ -3669,6 +3673,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Imprimir Diário Geral" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Conciliar Linhas de Write-Off" @@ -3902,11 +3910,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -3986,6 +3989,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4304,11 +4311,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4364,6 +4366,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4845,6 +4851,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Confirmado" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Perdas e lucros" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Fechado" @@ -5163,10 +5199,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Modelo" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Quantidade" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/ru.po b/locale/ru.po index 9a18c15f0e..0a986ab8a7 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -100,10 +100,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Вы можете открыть только один журнал за период." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "Код должен быть уникальным." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "Строка \"%s\" (%d) уже сверена." @@ -141,11 +137,6 @@ msgid "" msgstr "" "Вы не можете создать строчку у счета \"%s\" так как это счет для просмотра." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" -"Вы не можете создать строку проводки у счета \"%s\" так как он не активен." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "Вы не можете изменить строчку \"%s\" так как она сверена." @@ -356,9 +347,15 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Отсрочки" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Дата окончания" + +#, fuzzy msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.account,id:" msgid "ID" @@ -396,6 +393,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Сверка" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Правая сторона" @@ -409,6 +410,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Кол-во цифр вторичной валюты" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Дата начала" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Налоги по умолчанию" @@ -554,9 +560,15 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Отсрочка" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Дата окончания" + +#, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" msgctxt "field:account.account.template,id:" msgid "ID" @@ -586,6 +598,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Сверка" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Дата начала" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Налоги по умолчанию" @@ -1254,13 +1275,19 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Дата окончания" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" +#, fuzzy msgctxt "field:account.general_ledger.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" #, fuzzy msgctxt "field:account.general_ledger.account,id:" @@ -1290,6 +1317,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Дата начала" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1559,11 +1591,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Конечная дата" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Счета" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Действующий" @@ -1588,10 +1615,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Кредит" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Кредитный счет по умолчанию" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Кол-во цифр валюты" @@ -1600,10 +1623,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Дебет" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Дебетовый счет по умолчанию" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1637,55 +1656,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Изменено пользователем" -#, fuzzy -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Организация" - -#, fuzzy -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Дата создания" - -#, fuzzy -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Создано пользователем" - -#, fuzzy -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Кредитный счет по умолчанию" - -#, fuzzy -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Дебетовый счет по умолчанию" - -#, fuzzy -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Журнал" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Дата изменения" - -#, fuzzy -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Изменено пользователем" - #, fuzzy msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" @@ -1789,38 +1759,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Изменено пользователем" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Код" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Дата создания" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Создано пользователем" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Наименование" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Дата изменения" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Изменено пользователем" - #, fuzzy msgctxt "field:account.move,company:" msgid "Company" @@ -2125,11 +2063,73 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Конечная дата" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Действующий" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Организация" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Дата создания" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Создано пользователем" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Журнал" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Наименование" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Дата изменения" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Изменено пользователем" + #, fuzzy msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Сумма" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Организация" + #, fuzzy msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" @@ -2148,9 +2148,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Журнал" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Списание" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2444,11 +2445,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Журнал" - #, fuzzy msgctxt "field:account.reconcile.show,lines:" msgid "Lines" @@ -2466,9 +2462,14 @@ msgstr "Организации" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Списание" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Сумма" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Действующий" @@ -2629,6 +2630,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Описание" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Дата окончания" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2650,6 +2656,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Дата начала" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Шаблон" @@ -2821,6 +2832,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Описание" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Дата окончания" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2842,6 +2858,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Дата начала" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Дата изменения" @@ -3021,6 +3042,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Шаблон" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Дата изменения" @@ -3073,6 +3098,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Шаблон" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Дата изменения" @@ -3451,10 +3480,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Изменено пользователем" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3514,10 +3539,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - #, fuzzy msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" @@ -3577,6 +3598,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Показать только завершенные проводки" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3624,10 +3649,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3648,6 +3669,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3659,6 +3684,10 @@ msgstr "" "Если исходный налог заполнен, то правило будет применено только для этого " "налога." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3807,10 +3836,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3823,40 +3848,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Тип журнала" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Списание" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Проводка" @@ -3883,6 +3874,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Распечатать основной журнал" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Списание строк сверки" @@ -4118,11 +4113,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -4199,6 +4189,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4514,11 +4508,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4572,6 +4561,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -5067,6 +5060,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Проведен" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Списание" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Закрыть" @@ -5396,11 +5419,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Шаблон" -#, fuzzy -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Сумма" - #, fuzzy msgctxt "view:account.tax.template:" msgid "%" diff --git a/locale/sl.po b/locale/sl.po index 3aca147275..8f37e86b01 100644 --- a/locale/sl.po +++ b/locale/sl.po @@ -102,10 +102,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "Na obdobje je možen samo en dnevnik." -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "Šifra mora biti enolična." - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "Postavka \"%s\" (%d) je že usklajena." @@ -142,10 +138,6 @@ msgid "" "account." msgstr "Knjižbe na konto \"%s\" ni možno izdelati, ker je konto samo za vpogled." -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "Knjižbe na konto \"%s\" ni možno izdelati, ker je neaktiven." - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "Postavke \"%s\" ni možno popravljati, ker je že usklajena." @@ -355,6 +347,11 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "Odlogi" +#, fuzzy +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "Končni datum" + msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Bilance glavne knjige" @@ -395,6 +392,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "Uskladitev" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "Desno" @@ -407,6 +408,11 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "Decimalke druge valute" +#, fuzzy +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "Začetni datum" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "Privzeti davki" @@ -547,6 +553,11 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "Odlog" +#, fuzzy +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "Končni datum" + msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" msgstr "Bilance glavne knjige" @@ -579,6 +590,15 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "Uskladitev" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +#, fuzzy +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "Začetni datum" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "Privzeti davki" @@ -1191,6 +1211,11 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "Končni kredit" +#, fuzzy +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "Končni datum" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "Končni debet" @@ -1223,6 +1248,11 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "Začetni kredit" +#, fuzzy +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "Začetni datum" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "Začetni debet" @@ -1452,10 +1482,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "Do" -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Konti" - msgctxt "field:account.journal,active:" msgid "Active" msgstr "Aktivno" @@ -1480,10 +1506,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "Kredit" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "Privzeti kreditni konto" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "Decimalke" @@ -1492,10 +1514,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "Debet" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "Privzeti debetni konto" - msgctxt "field:account.journal,id:" msgid "ID" msgstr "ID" @@ -1528,46 +1546,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "Zapisal" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "Družba" - -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "Izdelano" - -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "Izdelal" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "Privzeti kreditni konto" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "Privzeti debetni konto" - -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Dnevnik" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "Ime" - -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "Zapisano" - -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "Zapisal" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "Končni datum" @@ -1660,38 +1638,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "Zapisal" -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "Šifra" - -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "Izdelano" - -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "Izdelal" - -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "ID" - -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "Naziv" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "Ime" - -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "Zapisano" - -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "Zapisal" - msgctxt "field:account.move,company:" msgid "Company" msgstr "Družba" @@ -1980,10 +1926,75 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "Do" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "Aktivno" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "Družba" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "Izdelano" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "Izdelal" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "Kreditni konto" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "Debetni konto" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "ID" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Dnevnik" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "Naziv" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "Ime" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "Zapisano" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "Zapisal" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "Znesek" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "Družba" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "Decimalke" @@ -2000,9 +2011,10 @@ msgctxt "field:account.move.reconcile_lines.writeoff,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Dnevnik" +#, fuzzy +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Odpis" msgctxt "field:account.move.reconciliation,create_date:" msgid "Create Date" @@ -2260,10 +2272,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "ID" -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Dnevnik" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "Postavke" @@ -2276,10 +2284,16 @@ msgctxt "field:account.reconcile.show,party:" msgid "Party" msgstr "Partner" +#, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Odpis" +#, fuzzy +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "Znesek" + msgctxt "field:account.tax,active:" msgid "Active" msgstr "Aktivno" @@ -2437,6 +2451,11 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "Opis" +#, fuzzy +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "Končni datum" + msgctxt "field:account.tax.code,id:" msgid "ID" msgstr "ID" @@ -2458,6 +2477,11 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "Ime" +#, fuzzy +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "Začetni datum" + msgctxt "field:account.tax.code,template:" msgid "Template" msgstr "Predloga" @@ -2633,6 +2657,11 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "Opis" +#, fuzzy +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "Končni datum" + msgctxt "field:account.tax.code.template,id:" msgid "ID" msgstr "ID" @@ -2654,6 +2683,11 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "Ime" +#, fuzzy +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "Začetni datum" + msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" msgstr "Zapisano" @@ -2824,6 +2858,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Predloga" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" msgstr "Zapisano" @@ -2876,6 +2914,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Predloga" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" msgstr "Zapisano" @@ -3228,10 +3270,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "Zapisal" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "Prikaži samo bilanco na izpisu glavne knjige" @@ -3289,10 +3327,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "Prikaži samo knjižene postavke" @@ -3350,6 +3384,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "Prikaži samo knjižene postavke" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "Najstarejši datum v usklajenih postavkah" @@ -3397,10 +3435,6 @@ msgid "" "by this tax" msgstr "Če je vključeno, se bo cena osveževala pri bodočih izračunih davkov" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3421,6 +3455,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "Pythonski izraz, preračunan s ključnimi besedami." +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3430,6 +3468,10 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "Če je izvorni davek vnešen, velja predpis samo za ta davek." +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3575,10 +3617,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "Dnevniški konto" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "Kontekst dnevnika gotovine" @@ -3591,40 +3629,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "Štetje dnevnikov" -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Tip dnevnika" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "General" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - msgctxt "model:account.move,name:" msgid "Account Move" msgstr "Knjižba" @@ -3649,6 +3653,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Izpis glavnega dnevnika" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "Odpis usklajenih postavk" @@ -3882,11 +3890,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" @@ -3966,6 +3969,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4284,11 +4291,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -#, fuzzy -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - #, fuzzy msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" @@ -4344,6 +4346,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + #, fuzzy msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" @@ -4828,6 +4834,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "Knjiženo" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "General" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Odpis" + msgctxt "selection:account.journal.period,state:" msgid "Close" msgstr "Zaprto" @@ -5144,10 +5180,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Predloga" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "Znesek" - msgctxt "view:account.tax.template:" msgid "%" msgstr "%" diff --git a/locale/zh_CN.po b/locale/zh_CN.po index c377ca8c2c..68c1408563 100644 --- a/locale/zh_CN.po +++ b/locale/zh_CN.po @@ -90,10 +90,6 @@ msgctxt "error:account.journal.period:" msgid "You can only open one journal per period." msgstr "" -msgctxt "error:account.journal.type:" -msgid "The code must be unique." -msgstr "" - msgctxt "error:account.move.line:" msgid "Line \"%s\" (%d) already reconciled." msgstr "" @@ -128,10 +124,6 @@ msgid "" "account." msgstr "" -msgctxt "error:account.move.line:" -msgid "You can not create a move line with account \"%s\" because it is inactive." -msgstr "" - msgctxt "error:account.move.line:" msgid "You can not modify line \"%s\" because it is reconciled." msgstr "" @@ -328,9 +320,14 @@ msgctxt "field:account.account,deferrals:" msgid "Deferrals" msgstr "" +msgctxt "field:account.account,end_date:" +msgid "End Date" +msgstr "" + +#, fuzzy msgctxt "field:account.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" #, fuzzy msgctxt "field:account.account,id:" @@ -372,6 +369,10 @@ msgctxt "field:account.account,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account,replaced_by:" +msgid "Replaced By" +msgstr "" + msgctxt "field:account.account,right:" msgid "Right" msgstr "" @@ -384,6 +385,10 @@ msgctxt "field:account.account,second_currency_digits:" msgid "Second Currency Digits" msgstr "" +msgctxt "field:account.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account,taxes:" msgid "Default Taxes" msgstr "" @@ -545,9 +550,14 @@ msgctxt "field:account.account.template,deferral:" msgid "Deferral" msgstr "" +msgctxt "field:account.account.template,end_date:" +msgid "End Date" +msgstr "" + +#, fuzzy msgctxt "field:account.account.template,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" #, fuzzy msgctxt "field:account.account.template,id:" @@ -580,6 +590,14 @@ msgctxt "field:account.account.template,reconcile:" msgid "Reconcile" msgstr "" +msgctxt "field:account.account.template,replaced_by:" +msgid "Replaced By" +msgstr "" + +msgctxt "field:account.account.template,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.account.template,taxes:" msgid "Default Taxes" msgstr "" @@ -1267,13 +1285,18 @@ msgctxt "field:account.general_ledger.account,end_credit:" msgid "End Credit" msgstr "" +msgctxt "field:account.general_ledger.account,end_date:" +msgid "End Date" +msgstr "" + msgctxt "field:account.general_ledger.account,end_debit:" msgid "End Debit" msgstr "" +#, fuzzy msgctxt "field:account.general_ledger.account,general_ledger_balance:" msgid "General Ledger Balance" -msgstr "" +msgstr "General Ledger - Lines" #, fuzzy msgctxt "field:account.general_ledger.account,id:" @@ -1301,6 +1324,10 @@ msgctxt "field:account.general_ledger.account,start_credit:" msgid "Start Credit" msgstr "" +msgctxt "field:account.general_ledger.account,start_date:" +msgid "Start Date" +msgstr "" + msgctxt "field:account.general_ledger.account,start_debit:" msgid "Start Debit" msgstr "" @@ -1540,11 +1567,6 @@ msgctxt "field:account.income_statement.context,to_date_cmp:" msgid "To Date" msgstr "" -#, fuzzy -msgctxt "field:account.journal,accounts:" -msgid "Accounts" -msgstr "Accounts" - #, fuzzy msgctxt "field:account.journal,active:" msgid "Active" @@ -1573,10 +1595,6 @@ msgctxt "field:account.journal,credit:" msgid "Credit" msgstr "" -msgctxt "field:account.journal,credit_account:" -msgid "Default Credit Account" -msgstr "" - msgctxt "field:account.journal,currency_digits:" msgid "Currency Digits" msgstr "" @@ -1585,10 +1603,6 @@ msgctxt "field:account.journal,debit:" msgid "Debit" msgstr "" -msgctxt "field:account.journal,debit_account:" -msgid "Default Debit Account" -msgstr "" - #, fuzzy msgctxt "field:account.journal,id:" msgid "ID" @@ -1628,52 +1642,6 @@ msgctxt "field:account.journal,write_uid:" msgid "Write User" msgstr "写入帐号" -msgctxt "field:account.journal.account,company:" -msgid "Company" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,create_date:" -msgid "Create Date" -msgstr "创建日期:" - -#, fuzzy -msgctxt "field:account.journal.account,create_uid:" -msgid "Create User" -msgstr "添加用户" - -msgctxt "field:account.journal.account,credit_account:" -msgid "Default Credit Account" -msgstr "" - -msgctxt "field:account.journal.account,debit_account:" -msgid "Default Debit Account" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,id:" -msgid "ID" -msgstr "编号" - -#, fuzzy -msgctxt "field:account.journal.account,journal:" -msgid "Journal" -msgstr "Journals" - -msgctxt "field:account.journal.account,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.account,write_date:" -msgid "Write Date" -msgstr "写入日期" - -#, fuzzy -msgctxt "field:account.journal.account,write_uid:" -msgid "Write User" -msgstr "写入帐号" - msgctxt "field:account.journal.open_cash.context,end_date:" msgid "End Date" msgstr "" @@ -1784,45 +1752,6 @@ msgctxt "field:account.journal.sequence,write_uid:" msgid "Write User" msgstr "写入帐号" -#, fuzzy -msgctxt "field:account.journal.type,code:" -msgid "Code" -msgstr "语言编码" - -#, fuzzy -msgctxt "field:account.journal.type,create_date:" -msgid "Create Date" -msgstr "创建日期:" - -#, fuzzy -msgctxt "field:account.journal.type,create_uid:" -msgid "Create User" -msgstr "添加用户" - -#, fuzzy -msgctxt "field:account.journal.type,id:" -msgid "ID" -msgstr "编号" - -#, fuzzy -msgctxt "field:account.journal.type,name:" -msgid "Name" -msgstr "纳木" - -msgctxt "field:account.journal.type,rec_name:" -msgid "Record Name" -msgstr "" - -#, fuzzy -msgctxt "field:account.journal.type,write_date:" -msgid "Write Date" -msgstr "写入日期" - -#, fuzzy -msgctxt "field:account.journal.type,write_uid:" -msgid "Write User" -msgstr "写入帐号" - msgctxt "field:account.move,company:" msgid "Company" msgstr "" @@ -2145,10 +2074,70 @@ msgctxt "field:account.move.print_general_journal.start,to_date:" msgid "To Date" msgstr "" +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,active:" +msgid "Active" +msgstr "启用" + +msgctxt "field:account.move.reconcile.write_off,company:" +msgid "Company" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_date:" +msgid "Create Date" +msgstr "创建日期:" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,create_uid:" +msgid "Create User" +msgstr "添加用户" + +msgctxt "field:account.move.reconcile.write_off,credit_account:" +msgid "Credit Account" +msgstr "" + +msgctxt "field:account.move.reconcile.write_off,debit_account:" +msgid "Debit Account" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,id:" +msgid "ID" +msgstr "编号" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,journal:" +msgid "Journal" +msgstr "Journals" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,name:" +msgid "Name" +msgstr "纳木" + +msgctxt "field:account.move.reconcile.write_off,rec_name:" +msgid "Record Name" +msgstr "" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_date:" +msgid "Write Date" +msgstr "写入日期" + +#, fuzzy +msgctxt "field:account.move.reconcile.write_off,write_uid:" +msgid "Write User" +msgstr "写入帐号" + msgctxt "field:account.move.reconcile_lines.writeoff,amount:" msgid "Amount" msgstr "" +msgctxt "field:account.move.reconcile_lines.writeoff,company:" +msgid "Company" +msgstr "" + msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:" msgid "Currency Digits" msgstr "" @@ -2169,9 +2158,9 @@ msgid "ID" msgstr "编号" #, fuzzy -msgctxt "field:account.move.reconcile_lines.writeoff,journal:" -msgid "Journal" -msgstr "Journals" +msgctxt "field:account.move.reconcile_lines.writeoff,writeoff:" +msgid "Write Off" +msgstr "Write-Off" #, fuzzy msgctxt "field:account.move.reconciliation,create_date:" @@ -2476,11 +2465,6 @@ msgctxt "field:account.reconcile.show,id:" msgid "ID" msgstr "编号" -#, fuzzy -msgctxt "field:account.reconcile.show,journal:" -msgid "Journal" -msgstr "Journals" - msgctxt "field:account.reconcile.show,lines:" msgid "Lines" msgstr "" @@ -2495,9 +2479,13 @@ msgstr "" #, fuzzy msgctxt "field:account.reconcile.show,write_off:" -msgid "Write-Off" +msgid "Write Off" msgstr "Write-Off" +msgctxt "field:account.reconcile.show,write_off_amount:" +msgid "Amount" +msgstr "" + #, fuzzy msgctxt "field:account.tax,active:" msgid "Active" @@ -2675,6 +2663,10 @@ msgctxt "field:account.tax.code,description:" msgid "Description" msgstr "描述" +msgctxt "field:account.tax.code,end_date:" +msgid "End Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code,id:" msgid "ID" @@ -2698,6 +2690,10 @@ msgctxt "field:account.tax.code,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code,start_date:" +msgid "Start Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code,template:" msgid "Template" @@ -2877,6 +2873,10 @@ msgctxt "field:account.tax.code.template,description:" msgid "Description" msgstr "描述" +msgctxt "field:account.tax.code.template,end_date:" +msgid "End Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code.template,id:" msgid "ID" @@ -2900,6 +2900,10 @@ msgctxt "field:account.tax.code.template,rec_name:" msgid "Record Name" msgstr "" +msgctxt "field:account.tax.code.template,start_date:" +msgid "Start Date" +msgstr "" + #, fuzzy msgctxt "field:account.tax.code.template,write_date:" msgid "Write Date" @@ -3094,6 +3098,10 @@ msgctxt "field:account.tax.rule,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule,template_override:" +msgid "Override Template" +msgstr "" + #, fuzzy msgctxt "field:account.tax.rule,write_date:" msgid "Write Date" @@ -3155,6 +3163,10 @@ msgctxt "field:account.tax.rule.line,template:" msgid "Template" msgstr "Templates" +msgctxt "field:account.tax.rule.line,template_override:" +msgid "Override Template" +msgstr "" + #, fuzzy msgctxt "field:account.tax.rule.line,write_date:" msgid "Write Date" @@ -3555,10 +3567,6 @@ msgctxt "field:party.party.account,write_uid:" msgid "Write User" msgstr "写入帐号" -msgctxt "help:account.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.account,general_ledger_balance:" msgid "Display only the balance in the general ledger report" msgstr "" @@ -3613,10 +3621,6 @@ msgctxt "help:account.fiscalyear.renew.start,reset_sequences:" msgid "If checked, new sequences will be created." msgstr "" -msgctxt "help:account.general_ledger.account,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.general_ledger.account.context,posted:" msgid "Show only posted move" msgstr "" @@ -3671,6 +3675,10 @@ msgctxt "help:account.move.print_general_journal.start,posted:" msgid "Show only posted move" msgstr "" +msgctxt "help:account.move.reconcile.write_off,active:" +msgid "Uncheck to exclude from future use." +msgstr "" + msgctxt "help:account.move.reconciliation,date:" msgid "Highest date of the reconciled lines" msgstr "" @@ -3717,10 +3725,6 @@ msgid "" "by this tax" msgstr "" -msgctxt "help:account.tax.code,active:" -msgid "Uncheck to exclude from future use." -msgstr "" - msgctxt "help:account.tax.code,template_override:" msgid "Check to override template definition" msgstr "" @@ -3741,6 +3745,10 @@ msgctxt "help:account.tax.line.template,amount:" msgid "A python expression that will be evaluated with the keywords." msgstr "" +msgctxt "help:account.tax.rule,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3750,6 +3758,10 @@ msgid "" "If the original tax is filled, the rule will be applied only for this tax." msgstr "" +msgctxt "help:account.tax.rule.line,template_override:" +msgid "Check to override template definition" +msgstr "" + msgctxt "help:account.tax.rule.line.template,keep_origin:" msgid "Check to append the original tax to substituted tax." msgstr "" @@ -3773,9 +3785,10 @@ msgctxt "model:account.account,name:" msgid "Account" msgstr "Accounts" +#, fuzzy msgctxt "model:account.account-account.tax,name:" msgid "Account - Tax" -msgstr "" +msgstr "Account Types" msgctxt "model:account.account.deferral,name:" msgid "Account Deferral" @@ -3899,10 +3912,6 @@ msgctxt "model:account.journal,name:journal_stock" msgid "Stock" msgstr "Stock" -msgctxt "model:account.journal.account,name:" -msgid "Journal Account" -msgstr "" - msgctxt "model:account.journal.open_cash.context,name:" msgid "Journal Cash Context" msgstr "" @@ -3916,36 +3925,6 @@ msgctxt "model:account.journal.sequence,name:" msgid "Journal Sequence" msgstr "" -#, fuzzy -msgctxt "model:account.journal.type,name:" -msgid "Journal Type" -msgstr "Journal Types" - -msgctxt "model:account.journal.type,name:journal_type_cash" -msgid "Cash" -msgstr "Cash" - -msgctxt "model:account.journal.type,name:journal_type_expense" -msgid "Expense" -msgstr "Expense" - -#, fuzzy -msgctxt "model:account.journal.type,name:journal_type_general" -msgid "General" -msgstr "基本" - -msgctxt "model:account.journal.type,name:journal_type_revenue" -msgid "Revenue" -msgstr "Revenue" - -msgctxt "model:account.journal.type,name:journal_type_situation" -msgid "Situation" -msgstr "Situation" - -msgctxt "model:account.journal.type,name:journal_type_write_off" -msgid "Write-Off" -msgstr "Write-Off" - #, fuzzy msgctxt "model:account.move,name:" msgid "Account Move" @@ -3976,6 +3955,10 @@ msgctxt "model:account.move.print_general_journal.start,name:" msgid "Print General Journal" msgstr "Print General Journal" +msgctxt "model:account.move.reconcile.write_off,name:" +msgid "Reconcile Write Off" +msgstr "" + msgctxt "model:account.move.reconcile_lines.writeoff,name:" msgid "Reconcile Lines Write-Off" msgstr "" @@ -4018,9 +4001,10 @@ msgctxt "model:account.reconcile.show,name:" msgid "Reconcile" msgstr "" +#, fuzzy msgctxt "model:account.tax,name:" msgid "Account Tax" -msgstr "" +msgstr "Account Types" #, fuzzy msgctxt "model:account.tax.code,name:" @@ -4031,9 +4015,10 @@ msgctxt "model:account.tax.code.line,name:" msgid "Tax Code Line" msgstr "" +#, fuzzy msgctxt "model:account.tax.code.line.template,name:" msgid "Tax Code Line Template" -msgstr "" +msgstr "Tax Codes Templates" #, fuzzy msgctxt "model:account.tax.code.open_chart.start,name:" @@ -4055,9 +4040,10 @@ msgctxt "model:account.tax.line,name:" msgid "Tax Line" msgstr "Tax Lines" +#, fuzzy msgctxt "model:account.tax.line.template,name:" msgid "Account Tax Line Template" -msgstr "" +msgstr "Account Move Template" #, fuzzy msgctxt "model:account.tax.rule,name:" @@ -4068,9 +4054,10 @@ msgctxt "model:account.tax.rule.line,name:" msgid "Tax Rule Line" msgstr "" +#, fuzzy msgctxt "model:account.tax.rule.line.template,name:" msgid "Tax Rule Line Template" -msgstr "" +msgstr "Tax Rule Templates" #, fuzzy msgctxt "model:account.tax.rule.template,name:" @@ -4201,10 +4188,6 @@ msgctxt "model:ir.action,name:act_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.action,name:act_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.action,name:act_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -4269,6 +4252,10 @@ msgctxt "model:ir.action,name:act_reconcile_lines" msgid "Reconcile Lines" msgstr "Reconcile Lines" +msgctxt "model:ir.action,name:act_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.action,name:act_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -4537,10 +4524,6 @@ msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2" msgid "Journals - Periods" msgstr "Journals - Periods" -msgctxt "model:ir.ui.menu,name:menu_journal_type_form" -msgid "Journal Types" -msgstr "Journal Types" - msgctxt "model:ir.ui.menu,name:menu_move_form" msgid "Account Moves" msgstr "Account Moves" @@ -4585,6 +4568,10 @@ msgctxt "model:ir.ui.menu,name:menu_reconcile" msgid "Reconcile Accounts" msgstr "Reconcile Accounts" +msgctxt "model:ir.ui.menu,name:menu_reconcile_writeoff_form" +msgid "WriteOff Methods" +msgstr "" + msgctxt "model:ir.ui.menu,name:menu_renew_fiscalyear" msgid "Renew Fiscal Year" msgstr "Renew Fiscal Year" @@ -5087,6 +5074,36 @@ msgctxt "selection:account.general_ledger.line,state:" msgid "Posted" msgstr "" +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Cash" +msgstr "Cash" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Expense" +msgstr "Expense" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "General" +msgstr "基本" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Revenue" +msgstr "Revenue" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Situation" +msgstr "Situation" + +#, fuzzy +msgctxt "selection:account.journal,type:" +msgid "Write-Off" +msgstr "Write-Off" + #, fuzzy msgctxt "selection:account.journal.period,state:" msgid "Close" @@ -5408,10 +5425,6 @@ msgctxt "view:account.move.template:" msgid "Template" msgstr "Templates" -msgctxt "view:account.reconcile.show:" -msgid "Amount" -msgstr "" - #, fuzzy msgctxt "view:account.tax.template:" msgid "%"