[tryton-debian-vcs] tryton-modules-account branch debian updated. debian/3.2.1-2-4-g8cc6fd0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:11:43 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=debian/3.2.1-2-4-g8cc6fd0
commit 8cc6fd05999b6373176a47a2593fb8817ead3530
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:31:55 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 2396a67..c41585d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account (3.4.0-1) unstable; urgency=medium
+
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:23:38 +0200
+
tryton-modules-account (3.2.1-2) unstable; urgency=medium
* Removing TODO from docs, it is no more in the package.
commit 34725c96f72bd4c1609cc41336ac71fb1ba778de
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:03 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index e0e008f..65a8a6a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
-Version 3.2.1 - 2014-08-03
+Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
+* Add option on Account for party required
+* Add wizard to reconcile all accounts
+* Add cancel to Account Move
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 01238f2..7284c22 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.2.1
+Version: 3.4.0
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_account
===============
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..27c43ef
--- /dev/null
+++ b/TODO
@@ -0,0 +1,2 @@
+- Change code rules on taxes to use a one2many instead of fixed fields
+- Add a sequence on tax code
diff --git a/__init__.py b/__init__.py
index b616999..c38770f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -46,8 +46,7 @@ def register():
Line,
OpenJournalAsk,
ReconcileLinesWriteOff,
- UnreconcileLinesStart,
- OpenReconcileLinesStart,
+ ReconcileShow,
FiscalYearLine,
FiscalYear2,
PrintGeneralJournalStart,
@@ -89,7 +88,8 @@ def register():
OpenAccount,
ReconcileLines,
UnreconcileLines,
- OpenReconcileLines,
+ Reconcile,
+ CancelMoves,
PrintGeneralJournal,
OpenChartTaxCode,
OpenTaxCode,
diff --git a/account.py b/account.py
index 11b39b9..a424592 100644
--- a/account.py
+++ b/account.py
@@ -12,7 +12,7 @@ from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateView, StateAction, StateTransition, \
Button
from trytond.report import Report
-from trytond.tools import reduce_ids
+from trytond.tools import reduce_ids, grouped_slice
from trytond.pyson import Eval, PYSONEncoder, Date
from trytond.transaction import Transaction
from trytond.pool import Pool
@@ -372,6 +372,11 @@ class AccountTemplate(ModelSQL, ModelView):
deferral = fields.Boolean('Deferral', states={
'invisible': Eval('kind') == 'view',
}, depends=['kind'])
+ party_required = fields.Boolean('Party Required',
+ states={
+ 'invisible': Eval('kind') == 'view',
+ },
+ depends=['kind'])
@classmethod
def __setup__(cls):
@@ -424,6 +429,8 @@ class AccountTemplate(ModelSQL, ModelView):
res['reconcile'] = self.reconcile
if not account or account.deferral != self.deferral:
res['deferral'] = self.deferral
+ if not account or account.party_required != self.party_required:
+ res['party_required'] = self.party_required
if not account or account.template != self:
res['template'] = self.id
return res
@@ -582,6 +589,11 @@ class Account(ModelSQL, ModelView):
'Deferrals', readonly=True, states={
'invisible': Eval('kind') == 'view',
}, depends=['kind'])
+ party_required = fields.Boolean('Party Required',
+ states={
+ 'invisible': Eval('kind') == 'view',
+ },
+ depends=['kind'])
template = fields.Many2One('account.account.template', 'Template')
@classmethod
@@ -643,7 +655,6 @@ class Account(ModelSQL, ModelView):
MoveLine = pool.get('account.move.line')
FiscalYear = pool.get('account.fiscalyear')
cursor = Transaction().cursor
- in_max = cursor.IN_MAX
table_a = cls.__table__()
table_c = cls.__table__()
@@ -651,8 +662,7 @@ class Account(ModelSQL, ModelView):
ids = [a.id for a in accounts]
balances = dict((i, 0) for i in ids)
line_query, fiscalyear_ids = MoveLine.query_get(line)
- for i in range(0, len(ids), in_max):
- sub_ids = ids[i:i + in_max]
+ for sub_ids in grouped_slice(ids):
red_sql = reduce_ids(table_a.id, sub_ids)
cursor.execute(*table_a.join(table_c,
condition=(table_c.left >= table_a.left)
@@ -693,7 +703,6 @@ class Account(ModelSQL, ModelView):
MoveLine = pool.get('account.move.line')
FiscalYear = pool.get('account.fiscalyear')
cursor = Transaction().cursor
- in_max = cursor.IN_MAX
result = {}
ids = [a.id for a in accounts]
@@ -708,8 +717,7 @@ class Account(ModelSQL, ModelView):
columns = [table.id]
for name in names:
columns.append(Sum(Coalesce(Column(line, name), 0)))
- for i in range(0, len(ids), in_max):
- sub_ids = ids[i:i + in_max]
+ for sub_ids in grouped_slice(ids):
red_sql = reduce_ids(table.id, sub_ids)
cursor.execute(*table.join(line, 'LEFT',
condition=line.account == table.id
@@ -745,7 +753,6 @@ class Account(ModelSQL, ModelView):
pool = Pool()
FiscalYear = pool.get('account.fiscalyear')
Deferral = pool.get('account.account.deferral')
- in_max = Transaction().cursor.IN_MAX
names = values.keys()
youngest_fiscalyear = None
@@ -770,11 +777,10 @@ class Account(ModelSQL, ModelView):
if fiscalyear.state == 'close':
id2deferral = {}
ids = [a.id for a in accounts]
- for i in range(0, len(ids), in_max):
- sub_ids = ids[i:i + in_max]
+ for sub_ids in grouped_slice(ids):
deferrals = Deferral.search([
('fiscalyear', '=', fiscalyear.id),
- ('account', 'in', sub_ids),
+ ('account', 'in', list(sub_ids)),
])
for deferral in deferrals:
id2deferral[deferral.account.id] = deferral
@@ -1725,15 +1731,14 @@ class CreateChart(Wizard):
('res', '=', None),
('company', '=', self.properties.company.id),
])
- with Transaction().set_user(0):
- Property.delete(properties)
- if self.properties.account_receivable:
- Property.create([{
- 'field': account_receivable_field.id,
- 'value': str(
- self.properties.account_receivable),
- 'company': self.properties.company.id,
- }])
+ Property.delete(properties)
+ if self.properties.account_receivable:
+ Property.create([{
+ 'field': account_receivable_field.id,
+ 'value': str(
+ self.properties.account_receivable),
+ 'company': self.properties.company.id,
+ }])
account_payable_field, = ModelField.search([
('model.model', '=', 'party.party'),
@@ -1744,14 +1749,13 @@ class CreateChart(Wizard):
('res', '=', None),
('company', '=', self.properties.company.id),
])
- with Transaction().set_user(0):
- Property.delete(properties)
- if self.properties.account_payable:
- Property.create([{
- 'field': account_payable_field.id,
- 'value': str(self.properties.account_payable),
- 'company': self.properties.company.id,
- }])
+ Property.delete(properties)
+ if self.properties.account_payable:
+ Property.create([{
+ 'field': account_payable_field.id,
+ 'value': str(self.properties.account_payable),
+ 'company': self.properties.company.id,
+ }])
return 'end'
diff --git a/account.xml b/account.xml
index c62416d..1ae79ee 100644
--- a/account.xml
+++ b/account.xml
@@ -326,6 +326,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="type" ref="account_type_template_asset_current_receivable"/>
<field name="reconcile" eval="True"/>
<field name="deferral" eval="True"/>
+ <field name="party_required" eval="True"/>
<field name="parent" ref="account_template_root"/>
<field name="kind">receivable</field>
</record>
@@ -334,6 +335,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="type" ref="account_type_template_liability_current_payable"/>
<field name="reconcile" eval="True"/>
<field name="deferral" eval="True"/>
+ <field name="party_required" eval="True"/>
<field name="parent" ref="account_template_root"/>
<field name="kind">payable</field>
</record>
diff --git a/configuration.py b/configuration.py
index e6dcfc6..b7bab77 100644
--- a/configuration.py
+++ b/configuration.py
@@ -59,11 +59,10 @@ class Configuration(ModelSingleton, ModelSQL, ModelView):
('res', '=', None),
('company', '=', company_id),
])
- with Transaction().set_user(0):
- Property.delete(properties)
- if value:
- Property.create([{
- 'field': account_field.id,
- 'value': 'account.account,%s' % value,
- 'company': company_id,
- }])
+ Property.delete(properties)
+ if value:
+ Property.create([{
+ 'field': account_field.id,
+ 'value': 'account.account,%s' % value,
+ 'company': company_id,
+ }])
diff --git a/configuration.xml b/configuration.xml
index 0fb7b1f..5af725a 100644
--- a/configuration.xml
+++ b/configuration.xml
@@ -23,5 +23,24 @@ this repository contains the full copyright notices and license terms. -->
action="act_configuration_form"
id="menuitem_account_configuration"
sequence="0" icon="tryton-list"/>
+
+ <record model="ir.model.access" id="access_account_configuration">
+ <field name="model"
+ search="[('model', '=', 'account.configuration')]"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="False"/>
+ <field name="perm_create" eval="False"/>
+ <field name="perm_delete" eval="False"/>
+ </record>
+ <record model="ir.model.access"
+ id="access_account_configuration_account_admin">
+ <field name="model"
+ search="[('model', '=', 'account.configuration')]"/>
+ <field name="group" ref="group_account_admin"/>
+ <field name="perm_read" eval="True"/>
+ <field name="perm_write" eval="True"/>
+ <field name="perm_create" eval="True"/>
+ <field name="perm_delete" eval="True"/>
+ </record>
</data>
</tryton>
diff --git a/doc/index.rst b/doc/index.rst
index b7195bd..7905b82 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -83,6 +83,7 @@ An Account is defined by these fields:
- Second currency: Force all moves for the account to have this
secondary currency.
- Reconcile: Allow move lines of this account to be reconciled.
+- Party Required: Make party required for move lines of this account.
- Taxes: This list of tax auto-complete move with new moves lines
corresponding to thoses taxes if the user create a line linked to
the current account and if the journal type is *Expense* or
@@ -154,6 +155,9 @@ an account. The fields are:
- Tax Lines. Gives the distribution of the amount line on the account
chart
+The Move Line is displayed using the account's name eventualy surrounded by
+parenthesis when it is a credit line.
+
The *Reconcile Lines* wizard allow to link move lines of the same
acount for whose the credit sum is equal to the debit sum. If the
selected lines are not balanced, the wizard offer to create a
@@ -163,6 +167,12 @@ The *Unreconcile Lines* wizard allow to do the inverse operation (but
doesn't reverse other operations that could have triggered by the
reconciliation).
+The *Reconcile Accounts* wizard allow to process one by one each party and
+account for reconciliation. The wizard tries to propose the best reconciliation
+possible. The configuration `reconciliation_chunk` in `account` section allow
+to define the length of lines that is allowed to search for proposal. The
+default is 10.
+
Tax Code
********
diff --git a/fiscalyear.py b/fiscalyear.py
index 5a96934..f98d0b1 100644
--- a/fiscalyear.py
+++ b/fiscalyear.py
@@ -25,9 +25,11 @@ class FiscalYear(ModelSQL, ModelView):
name = fields.Char('Name', size=None, required=True, depends=DEPENDS)
code = fields.Char('Code', size=None)
start_date = fields.Date('Starting Date', required=True, states=STATES,
- depends=DEPENDS)
+ domain=[('start_date', '<=', Eval('end_date', None))],
+ depends=DEPENDS + ['end_date'])
end_date = fields.Date('Ending Date', required=True, states=STATES,
- depends=DEPENDS)
+ domain=[('end_date', '>=', Eval('start_date', None))],
+ depends=DEPENDS + ['start_date'])
periods = fields.One2Many('account.period', 'fiscalyear', 'Periods',
states=STATES, depends=DEPENDS)
state = fields.Selection([
diff --git a/journal.py b/journal.py
index 9b398ce..38c1cb1 100644
--- a/journal.py
+++ b/journal.py
@@ -142,11 +142,10 @@ class Journal(ModelSQL, ModelView):
Property = Pool().get('ir.property')
table = cls.__table__()
cursor.execute(*table.select(table.id, table.sequence))
- with Transaction().set_user(0):
- for journal_id, sequence_id in cursor.fetchall():
- Property.set('sequence', cls._name,
- journal_id, (sequence_id and
- 'ir.sequence,' + str(sequence_id) or False))
+ for journal_id, sequence_id in cursor.fetchall():
+ Property.set('sequence', cls._name,
+ journal_id, (sequence_id and
+ 'ir.sequence,' + str(sequence_id) or False))
table.drop_column('sequence', exception=True)
@staticmethod
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 864e4d6..0547d97 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -81,6 +81,14 @@ msgid "Move line cannot be created because there is no journal defined."
msgstr ""
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr ""
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr ""
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr ""
@@ -139,6 +147,12 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr ""
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
@@ -208,8 +222,8 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
msgctxt "error:account.period:"
@@ -302,6 +316,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Родител"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Име"
@@ -455,6 +473,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Родител"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Име"
@@ -1180,6 +1202,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Партньор"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Период"
@@ -1228,14 +1254,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Период"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Сметка"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Фирма"
@@ -1315,10 +1333,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Променено от"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Вид"
@@ -1536,6 +1550,61 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Начален период"
+#, fuzzy
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Фактури"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Фактури"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Дата"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Описание"
+
+#, fuzzy
+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"
+msgstr "Транзакции"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Партньори"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Управление на партньор"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Анулиран"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Активен"
@@ -2601,10 +2670,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Запитване за отваряне на дневник"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Отваряне на Съгласуване на редове"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Отпечатване на основен дневник"
@@ -2617,10 +2682,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Редове от съгласуване на движение по сметка"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Разсъгласуване на редове"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Отваряне на хронологичен баланс"
@@ -2653,6 +2714,11 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Отпечатване на пробен баланс"
+#, fuzzy
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Съгласуване"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Данък на сметка"
@@ -2705,6 +2771,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr "Обновяване на графика"
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Дата на баланс"
@@ -2750,6 +2820,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr ""
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr ""
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Затваряне на финансова година"
@@ -2806,12 +2880,8 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Редове от движение на сметка"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
msgstr ""
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
@@ -2830,10 +2900,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Достъп до меню"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Отваряне на Съгласуване на редове"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Отваряне код на данък"
@@ -2858,6 +2924,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Повторно отваряне на периоди"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr ""
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Съгласуване на редове"
@@ -2967,6 +3037,23 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Обновяване на сметкпланове от шаблон"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "Разходен"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "За получаване"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Дневник на сметка по подрабиране"
@@ -2988,6 +3075,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Съгласуване на движение по сметка"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Съгласуване на редове"
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr "Управление на финанси"
@@ -3108,10 +3199,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Достъп до меню"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Съгласуване на редове"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Периоди"
@@ -3137,6 +3224,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Обработване"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Справки"
@@ -3779,6 +3870,11 @@ msgctxt "view:account.account:"
msgid "Accounts"
msgstr "Сметки"
+#, fuzzy
+msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Наследници"
+
msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Отложени плащания"
@@ -3928,10 +4024,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Достъп до меню"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Отваряне на Съгласуване на редове"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Отпечатване на основен дневник"
@@ -4004,6 +4096,16 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Отпечатване на пробен баланс"
+#, fuzzy
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Сума"
+
+#, fuzzy
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Съгласуване"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Отваряне на таблица с кодове на данъци"
@@ -4214,14 +4316,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Отваряне"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Отказ"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Отваряне"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Отказ"
@@ -4294,6 +4388,20 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Печат"
+#, fuzzy
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Отказване"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Съгласуване"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Отказ"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 50e70ee..e9aee1c 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -93,6 +93,14 @@ msgid "Move line cannot be created because there is no journal defined."
msgstr "No es pot crear l'apunt perquè no hi ha definit cap diari."
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr "El tercer és requerit en l'apunt \"%s\"."
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr "No heu d'introduir un tercer en l'apunt \"%s\"."
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr "Valors d'haver/deure erronis."
@@ -108,9 +116,7 @@ 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 una línia de moviment amb el compte \"%s\" perquè està "
-"inactiu."
+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."
@@ -163,17 +169,23 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "No podeu conciliar l'apunt \"%s\" perquè no està en un estat correcte."
msgctxt "error:account.move:"
-msgid "You can not create lines on accountsof different companies in move \"%s\"."
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
msgstr ""
-"No es pot crear línies d'apunts de diferents empreses a l'assentament "
-"\"%s\"."
+"El període de l'assentament \"%s\" està tancat.\n"
+"Voleu utilitzar el període actual?"
+
+msgctxt "error:account.move:"
+msgid "You can not create lines on accountsof different companies in move \"%s\"."
+msgstr "No es pot crear apunts de diferents empreses a l'assentament \"%s\"."
msgctxt "error:account.move:"
msgid ""
"You can not create move \"%(move)s\" because it's date is outside its "
"period."
msgstr ""
-"No podeu crear el moviment \"%(move)s\" perquè la data es troba fora del "
+"No podeu crear l'assentament \"%(move)s\" perquè la data es troba fora del "
"període."
msgctxt "error:account.move:"
@@ -182,7 +194,7 @@ msgstr "No podeu modificar l'assentament \"%s\" perquè ja està confirmat."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is an unbalanced."
-msgstr "No podeu confirmar l'apunt \"% s\" perquè està desquadrat."
+msgstr "No podeu confirmar l'assentament \"% s\" perquè està desquadrat."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is empty."
@@ -246,11 +258,11 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
-"No podeu tancar el període \"%s\" perquè hi ha assentaments sense confirmar "
-"a aquest període."
+"No podeu tancar el període \"%(period)s\" perquè hi ha assentaments no "
+"confirmats \"%(move)s\" en aquest període."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
@@ -344,6 +356,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Pare"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr "Tercer requerit"
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Nom"
@@ -496,6 +512,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Pare"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr "Tercer requerit"
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Nom"
@@ -738,7 +758,7 @@ msgstr "ID"
msgctxt "field:account.fiscalyear,close_lines:"
msgid "Close Lines"
-msgstr "Tanca línies"
+msgstr "Apunts de tancament"
msgctxt "field:account.fiscalyear,code:"
msgid "Code"
@@ -814,7 +834,7 @@ msgstr "ID"
msgctxt "field:account.fiscalyear-account.move.line,line:"
msgid "Line"
-msgstr "Línia"
+msgstr "Apunt"
msgctxt "field:account.fiscalyear-account.move.line,rec_name:"
msgid "Name"
@@ -1212,6 +1232,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Tercer"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr "Tercer requerit"
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Període"
@@ -1260,14 +1284,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Període"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Compte"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Empresa"
@@ -1344,10 +1360,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Tipus"
@@ -1564,6 +1576,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Període inicial"
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Compte"
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Compte"
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimals de la moneda"
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Data"
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Descripció"
+
+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"
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Tercers"
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Tercer"
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Desajust"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Actiu"
@@ -2267,7 +2323,7 @@ msgid ""
"This field is used for payable and receivable lines. \n"
"You can put the limit date for the payment."
msgstr ""
-"Aquest camp s'utilitza per les línies a pagar i a cobrar.\n"
+"Aquest camp s'utilitza pels apunts a pagar i a cobrar.\n"
"Podeu posar la data límit per al pagament."
msgctxt "help:account.move.line,second_currency:"
@@ -2616,10 +2672,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Demana el diari a obrir"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Obre apunts conciliats"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Imprimeix llibre diari"
@@ -2632,10 +2684,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Línies de conciliació d'apunts comptables"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Desconcilia apunts"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Obre balanç històric"
@@ -2668,6 +2716,10 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Imprimeix balanç de sumes i saldos"
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Concilia"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Impost comptable"
@@ -2720,6 +2772,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr "Actualitza pla comptable"
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr "Apunts a pagar"
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Balanç general"
@@ -2764,6 +2820,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr "Crea l'assentament de regularització"
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr "Cancel·la assentaments"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Tanca exercici fiscal"
@@ -2820,13 +2880,9 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Apunts comptables"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Apunts a pagar"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Apunts a cobrar"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr "Apunts a pagar/cobrar"
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
@@ -2834,7 +2890,7 @@ msgstr "Línies de conciliació"
msgctxt "model:ir.action,name:act_open_account"
msgid "Open Move Account"
-msgstr "Obre compte d'assentament"
+msgstr "Obre compte de l'assentament"
msgctxt "model:ir.action,name:act_open_chart"
msgid "Open Chart of Accounts"
@@ -2844,10 +2900,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Obre diari"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Obre apunts conciliats"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Obre codi d'impost"
@@ -2872,6 +2924,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Reobre períodes"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Concilia comptes"
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Concilia apunts"
@@ -2980,6 +3036,21 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Actualitza pla comptable des de plantilla"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Tots"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "A pagar"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "A cobrar"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Diari comptable per defecte"
@@ -3001,6 +3072,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Conciliació d'apunt comptable"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Concilia apunts"
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr "Comptabilitat"
@@ -3121,10 +3196,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Obre diari"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Concilia apunts"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Períodes"
@@ -3149,6 +3220,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Processos"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Concilia comptes"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Informes"
@@ -3311,7 +3386,7 @@ msgstr "Llibre major"
msgctxt "odt:account.general_ledger:"
msgid "Move"
-msgstr "Moviment"
+msgstr "Assentament"
msgctxt "odt:account.general_ledger:"
msgid "Name"
@@ -3399,7 +3474,7 @@ msgstr "Confirmat"
msgctxt "odt:account.move.general_journal:"
msgid "Print Date:"
-msgstr "Data impressió:"
+msgstr "Data d'impressió:"
msgctxt "odt:account.move.general_journal:"
msgid "To Date:"
@@ -3778,6 +3853,10 @@ msgid "Accounts"
msgstr "Comptes"
msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Fills"
+
+msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Pròrrogues"
@@ -3925,10 +4004,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Obre diari"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Obre apunts conciliats"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Imprimeix llibre diari"
@@ -4001,6 +4076,14 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Imprimeix balanç de sumes i saldos"
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Import"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Concilia"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Obre pla de codis d'impost"
@@ -4209,14 +4292,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Obre"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Cancel·la"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Obre"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Cancel·la"
@@ -4289,6 +4364,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Imprimeix"
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Cancel·la"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr "Salta"
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Concilia"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Cancel·la"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 5b1b224..d9993bd 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -81,6 +81,14 @@ msgid "Move line cannot be created because there is no journal defined."
msgstr ""
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr ""
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr ""
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr ""
@@ -139,6 +147,12 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr ""
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
@@ -208,8 +222,8 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
msgctxt "error:account.period:"
@@ -302,6 +316,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr ""
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr ""
@@ -454,6 +472,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr ""
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr ""
@@ -1170,6 +1192,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr ""
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr ""
@@ -1218,14 +1244,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr ""
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr ""
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr ""
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr ""
@@ -1302,10 +1320,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr ""
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr ""
@@ -1522,6 +1536,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr ""
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr ""
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr ""
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr ""
+
+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 ""
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr ""
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr ""
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr ""
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr ""
@@ -2564,10 +2622,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr ""
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr ""
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr ""
@@ -2580,10 +2634,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr ""
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr ""
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr ""
@@ -2616,6 +2666,10 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr ""
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr ""
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr ""
@@ -2668,6 +2722,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr ""
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr ""
@@ -2712,6 +2770,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr ""
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr ""
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr ""
@@ -2768,12 +2830,8 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr ""
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
msgstr ""
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
@@ -2792,10 +2850,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr ""
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr ""
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr ""
@@ -2820,6 +2874,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr ""
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr ""
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr ""
@@ -2928,6 +2986,21 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr ""
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr ""
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr ""
@@ -2949,6 +3022,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr ""
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr ""
@@ -3069,10 +3146,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr ""
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr ""
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr ""
@@ -3097,6 +3170,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr ""
@@ -3726,6 +3803,10 @@ msgid "Accounts"
msgstr ""
msgctxt "view:account.account:"
+msgid "Children"
+msgstr ""
+
+msgctxt "view:account.account:"
msgid "Deferrals"
msgstr ""
@@ -3871,10 +3952,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr ""
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr ""
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr ""
@@ -3947,6 +4024,14 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr ""
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr ""
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr ""
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr ""
@@ -4155,14 +4240,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr ""
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr ""
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr ""
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr ""
@@ -4235,6 +4312,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr ""
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr ""
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr ""
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 9b95a46..534806b 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -98,6 +98,14 @@ msgstr ""
"Buchungszeile kann nicht erzeugt werden, weil kein Journal angegeben ist."
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr "In Zeile \"%s\" muss eine Partei eingetragen werden."
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr "In Zeile \"%s\" darf keine Partei eingetragen werden."
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr "Falsche Haben/Soll-Werte."
@@ -171,6 +179,14 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "Abstimmung von Zeile \"%s\" nicht möglich, weil sie nicht gültig ist."
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+"Der Buchungszeitraum für Buchungssatz \"%s\" ist geschlossen.\n"
+"Soll stattdessen der aktuelle Buchungszeitraum verwendet werden?"
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
"Erstellung von Buchungszeilen mit Konten unterschiedlicher Unternehmen in "
@@ -262,11 +278,11 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
-"Buchungsperiode \"%s\" kann nicht geschlossen werden, weil es noch nicht "
-"festgeschriebene Buchungen in diesem Zeitraum gibt."
+"Buchungszeitraum \"%(period)s\" kann nicht geschlossen werden, weil es nicht"
+" festgeschriebene Buchungssätze \"%(move)s\" in diesem Zeitraum gibt."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
@@ -364,6 +380,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Übergeordnet (Konto)"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr "Partei erforderlich"
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Name"
@@ -516,6 +536,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Übergeordnet (Kontovorlage)"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr "Partei erforderlich"
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Name"
@@ -1232,6 +1256,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Partei"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr "Partei erforderlich"
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Buchungszeitraum"
@@ -1280,14 +1308,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Buchungszeitraum"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Konto"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Unternehmen"
@@ -1364,10 +1384,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Typ"
@@ -1584,6 +1600,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Von Buchungszeitraum"
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Konto"
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Konto"
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Nachkommastellen Währung"
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Beschreibung"
+
+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 "Zeilen"
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Parteien"
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Partei"
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Ausbuchung"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Aktiv"
@@ -2636,10 +2696,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Nachfrage Dialogbuchen"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Buchungszeilen für Abstimmung öffnen"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Journal Allgemein drucken"
@@ -2652,10 +2708,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Buchungssatz Abstimmung Zeilen"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Abstimmung von Buchungszeilen rückgängig machen"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Fälligkeitsliste öffnen"
@@ -2688,6 +2740,10 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Summen- und Saldenliste drucken"
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Abstimmen"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Steuerkonto"
@@ -2740,6 +2796,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr "Kontenplan aktualisieren"
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr "Verbindlichkeiten"
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Bilanzbogen"
@@ -2784,6 +2844,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr "Abgleich Saldenvortrag"
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr "Buchungssätze Annullieren"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Geschäftsjahr abschließen"
@@ -2840,13 +2904,9 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Buchungszeilen"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Verbindlichkeiten"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Forderungen"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr "Verbindlichkeiten/Forderungen"
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
@@ -2864,10 +2924,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Dialogbuchen"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Buchungszeilen für Abstimmung öffnen"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Steuerkennziffern öffnen"
@@ -2892,6 +2948,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Buchungszeiträume wiedereröffnen"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Konten abstimmen"
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Buchungszeilen abstimmen"
@@ -3000,6 +3060,21 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Kontenplan von Vorlage aktualisieren"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Alle"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "Verbindlichkeiten"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "Forderungen"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Standard Journal"
@@ -3021,6 +3096,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Buchungssatz Abstimmung"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Buchungszeilen abstimmen"
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr "Buchhaltung"
@@ -3141,10 +3220,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Dialogbuchen"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Buchungszeilen abstimmen"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Buchungszeiträume"
@@ -3169,6 +3244,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Abschlussarbeiten"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Konten abstimmen"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Auswertungen"
@@ -3798,6 +3877,10 @@ msgid "Accounts"
msgstr "Konten"
msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Untergeordnet (Konten)"
+
+msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Saldenvorträge"
@@ -3945,10 +4028,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Dialogbuchen"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Buchungszeilen für Abstimmung öffnen"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Journal Allgemein drucken"
@@ -4021,6 +4100,14 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Summen- und Saldenliste drucken"
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Abstimmen"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Kennzifferntabelle öffnen"
@@ -4229,14 +4316,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Öffnen"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Abbrechen"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Öffnen"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Abbrechen"
@@ -4309,6 +4388,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Drucken"
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr "Überspringen"
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Abstimmen"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Abbrechen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index d4a2d2e..60aa92f 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -92,6 +92,14 @@ msgstr ""
"No se puede crear el apunte contable porque no se ha definido ningún diario."
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr "Entidad es requerida en la línea «%s»"
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr "Entidad no se debe definir en la línea «%s»"
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr "Valores de haber/debe erróneos."
@@ -161,6 +169,14 @@ msgstr ""
"No puede conciliar el apunte «%s» porque no está en un estado correcto."
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+"El período del movimiento «%s» está cerrado.\n"
+"¿Utilizar el período actual?"
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
"No puede crear líneas de las cuentas de diferentes empresas en el asiento "
@@ -243,11 +259,11 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
-"No puede cerrar el período «%s» porque hay asientos sin confirmar en este "
-"período."
+"No puede cerrar el período «%(period)s» porque hay movimientos no publicados"
+" «%(move)s» en este período."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
@@ -341,6 +357,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Padre"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr "Entidad requerida"
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -493,6 +513,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Padre"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr "Entidad requerida"
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -1209,6 +1233,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Entidad"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr "Entidad requerida"
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Período"
@@ -1257,14 +1285,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Período"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Empresa"
@@ -1341,10 +1361,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Tipo"
@@ -1561,6 +1577,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Período inicial"
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígitos de moneda"
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Descripción"
+
+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 "Transacciones"
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Entidades"
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Entidad"
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Desajuste"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Activo"
@@ -2616,10 +2676,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Solicitar el diario a abrir"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Abrir líneas de conciliación"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Imprimir libro diario"
@@ -2632,10 +2688,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Líneas de conciliación de líneas de asientos contables"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Desconciliar líneas"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Abrir balance histórico"
@@ -2668,6 +2720,10 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Imprimir balance de sumas y saldos"
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Cuenta de impuesto"
@@ -2720,6 +2776,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr "Actualizar plan contable"
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr "Líneas a pagar"
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Balance general"
@@ -2764,6 +2824,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr "Crear asiento de regularización"
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr "Cancela asientos"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Cerrar ejercicio fiscal"
@@ -2820,13 +2884,9 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Líneas de asientos contables"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Líneas Cuentas por Pagar"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Líneas de Cuentas por Cobrar"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr "Líneas a pagar/a cobrar"
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
@@ -2844,10 +2904,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Abrir diario"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Abrir líneas de conciliación"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Abrir código de impuesto"
@@ -2872,6 +2928,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Reabrir períodos"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Conciliar cuentas"
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Conciliar líneas"
@@ -2980,6 +3040,21 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Actualizar plan contable desde plantilla"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "A pagar"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "A cobrar"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Diario contable por defecto"
@@ -3001,6 +3076,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Conciliación de asiento contable"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Conciliar líneas"
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr "Contabilidad"
@@ -3121,10 +3200,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Abrir diario"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Conciliar líneas"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Períodos"
@@ -3149,6 +3224,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Procesamiento"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Conciliar cuentas"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Informes"
@@ -3778,6 +3857,10 @@ msgid "Accounts"
msgstr "Cuentas"
msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Aplazamientos"
@@ -3925,10 +4008,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Abrir diario"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Abrir líneas de conciliación"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Imprimir libro diario"
@@ -4001,6 +4080,14 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Imprimir balance de sumas y saldos"
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Importe"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Abrir plan códigos de impuesto"
@@ -4209,14 +4296,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Abrir"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Abrir"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Cancelar"
@@ -4289,6 +4368,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Imprimir"
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr "Omitir"
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 3650402..41fb1fb 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -39,7 +39,8 @@ msgstr "El balance de la cuenta \"%s\" debe ser cero!"
msgctxt "error:account.fiscalyear:"
msgid "You can not change the post move sequence in fiscal year \"%s\"."
msgstr ""
-"No puede cambiar la secuencia de asiento confirmado en el año fiscal \"%s\"."
+"No puede cambiar la secuencia de asiento contabilizado en el año fiscal "
+"\"%s\"."
msgctxt "error:account.fiscalyear:"
msgid ""
@@ -94,6 +95,14 @@ msgstr ""
"definido."
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr "El tercero es requerido en la linea \"%s\""
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr "El tercero no debe estar fijado en la línea \"%s\""
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr "Valores de haber/debe incorrectos!"
@@ -167,6 +176,14 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "No puede conciliar las líneas \"%s\" porque no estan en estado válido."
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+"El periodo del asiento \"%s\" esta cerrado.\n"
+"Desea usar el actual periodo?"
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
"No puede crear lineas con cuentas de diferentes compañias en el asiento "
@@ -191,7 +208,7 @@ msgstr "No puede contabilizar el asiento \"%s\" porque esta descuadrado."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is empty."
-msgstr "No puede confirmar el asiento \"%s\" porque esta vacío."
+msgstr "No puede contabilizar el asiento \"%s\" porque esta vacío."
msgctxt "error:account.move:"
msgid "You can not set posted move \"%(move)s\" to draft in journal \"%(journal)s\"."
@@ -249,11 +266,11 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
-"No puede cerrar el período \"%s\" porque hay asientos no contabilizados en "
-"este período."
+"No puede cerrar el periodo \"%(period)s\" porque tiene asientos no "
+"contabilizados \"%(move)s\" en este periodo."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
@@ -347,6 +364,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Padre"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr "Tercero Requerido"
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -499,6 +520,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Padre"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr "Tercero Requerido"
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -1125,7 +1150,7 @@ msgstr "Período"
msgctxt "field:account.move,post_date:"
msgid "Post Date"
-msgstr "Fecha Confirmación"
+msgstr "Fecha Contabilización"
msgctxt "field:account.move,post_number:"
msgid "Post Number"
@@ -1215,6 +1240,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Tercero"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr "Tercero Requerido"
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Período"
@@ -1263,14 +1292,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Período"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Compañia"
@@ -1347,10 +1368,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Tipo"
@@ -1567,6 +1584,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Período Inicial"
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de Moneda"
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:account.reconcile.show,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.reconcile.show,journal:"
+msgid "Journal"
+msgstr "Libro Contable"
+
+msgctxt "field:account.reconcile.show,lines:"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Terceros"
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Anulado"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Activo"
@@ -1597,11 +1658,11 @@ msgstr "Cuenta Nota Crédito"
msgctxt "field:account.tax,credit_note_base_code:"
msgid "Credit Note Base Code"
-msgstr "Código Base de la Nota Crédito"
+msgstr "Código de la Base en Nota Crédito"
msgctxt "field:account.tax,credit_note_base_sign:"
msgid "Credit Note Base Sign"
-msgstr "Signo Base de la Nota Crédito"
+msgstr "Signo de la Base en la Nota Crédito"
msgctxt "field:account.tax,credit_note_tax_code:"
msgid "Credit Note Tax Code"
@@ -1609,7 +1670,7 @@ msgstr "Código de Impuesto Nota Crédito"
msgctxt "field:account.tax,credit_note_tax_sign:"
msgid "Credit Note Tax Sign"
-msgstr "Signo de Impuesto Nota Crédito"
+msgstr "Signo del Impuesto en la Nota Crédito"
msgctxt "field:account.tax,currency_digits:"
msgid "Currency Digits"
@@ -1641,15 +1702,15 @@ msgstr "Código de la Base en Factura"
msgctxt "field:account.tax,invoice_base_sign:"
msgid "Invoice Base Sign"
-msgstr "Signo de la Base en Factura"
+msgstr "Signo de la Base en la Factura"
msgctxt "field:account.tax,invoice_tax_code:"
msgid "Invoice Tax Code"
-msgstr "Código del Impuesto de Factura"
+msgstr "Código del Impuesto en la Factura"
msgctxt "field:account.tax,invoice_tax_sign:"
msgid "Invoice Tax Sign"
-msgstr "Signo del Impuesto de la Factura"
+msgstr "Signo del Impuesto en la Factura"
msgctxt "field:account.tax,name:"
msgid "Name"
@@ -1661,7 +1722,7 @@ msgstr "Padre"
msgctxt "field:account.tax,rate:"
msgid "Rate"
-msgstr "Tasa de Cambio"
+msgstr "Porcentaje"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -2101,19 +2162,19 @@ msgstr "Cuenta Nota Crédito"
msgctxt "field:account.tax.template,credit_note_base_code:"
msgid "Credit Note Base Code"
-msgstr "Código Base de la Nota Crédito"
+msgstr "Código de la Base en Nota Crédito"
msgctxt "field:account.tax.template,credit_note_base_sign:"
msgid "Credit Note Base Sign"
-msgstr "Signo Base de la Nota Crédito"
+msgstr "Signo de la Base en la Nota Crédito"
msgctxt "field:account.tax.template,credit_note_tax_code:"
msgid "Credit Note Tax Code"
-msgstr "Código de Impuesto Nota Crédito"
+msgstr "Código de Impuesto en la Nota Crédito"
msgctxt "field:account.tax.template,credit_note_tax_sign:"
msgid "Credit Note Tax Sign"
-msgstr "Signo de Impuesto Nota Crédito"
+msgstr "Signo del Impuesto en la Nota Crédito"
msgctxt "field:account.tax.template,description:"
msgid "Description"
@@ -2141,15 +2202,15 @@ msgstr "Código de la Base en Factura"
msgctxt "field:account.tax.template,invoice_base_sign:"
msgid "Invoice Base Sign"
-msgstr "Signo de la Base en Factura"
+msgstr "Signo de la Base en la Factura"
msgctxt "field:account.tax.template,invoice_tax_code:"
msgid "Invoice Tax Code"
-msgstr "Código del Impuesto de Factura"
+msgstr "Código del Impuesto en la Factura"
msgctxt "field:account.tax.template,invoice_tax_sign:"
msgid "Invoice Tax Sign"
-msgstr "Signo del Impuesto de la Factura"
+msgstr "Signo del Impuesto en la Factura"
msgctxt "field:account.tax.template,name:"
msgid "Name"
@@ -2279,15 +2340,15 @@ msgstr "La segunda moneda."
msgctxt "help:account.move.print_general_journal.start,posted:"
msgid "Show only posted move"
-msgstr "Muestra sólo asientos confirmados."
+msgstr "Mostrar únicamente asientos contabilizados"
msgctxt "help:account.open_aged_balance.start,posted:"
msgid "Show only posted move"
-msgstr "Muestra sólo asientos confirmados."
+msgstr "Mostrar únicamente asientos contabilizados"
msgctxt "help:account.open_balance_sheet.start,posted:"
msgid "Show only posted move"
-msgstr "Muestra sólo asientos confirmados."
+msgstr "Mostrar únicamente asientos contabilizados"
msgctxt "help:account.open_chart.start,fiscalyear:"
msgid "Leave empty for all open fiscal year"
@@ -2295,15 +2356,15 @@ msgstr "Dejar vacío para abrir todos los años fiscales."
msgctxt "help:account.open_chart.start,posted:"
msgid "Show posted moves only"
-msgstr "Muestra sólo asientos confirmados."
+msgstr "Mostrar únicamente asientos contabilizados"
msgctxt "help:account.open_income_statement.start,posted:"
msgid "Show only posted move"
-msgstr "Muestra sólo asientos confirmados."
+msgstr "Mostrar únicamente asientos contabilizados"
msgctxt "help:account.open_third_party_balance.start,posted:"
msgid "Show only posted move"
-msgstr "Muestra sólo asientos confirmados."
+msgstr "Mostrar únicamente asientos contabilizados"
msgctxt "help:account.print_general_ledger.start,empty_account:"
msgid "With account without move"
@@ -2311,7 +2372,7 @@ msgstr "Con cuenta sin asiento."
msgctxt "help:account.print_general_ledger.start,posted:"
msgid "Show only posted move"
-msgstr "Muestra sólo asientos confirmados."
+msgstr "Mostrar únicamente asientos contabilizados"
msgctxt "help:account.print_trial_balance.start,empty_account:"
msgid "With account without move"
@@ -2319,7 +2380,7 @@ msgstr "Con cuenta sin asiento."
msgctxt "help:account.print_trial_balance.start,posted:"
msgid "Show only posted move"
-msgstr "Muestra sólo asientos confirmados."
+msgstr "Mostrar únicamente asientos contabilizados"
msgctxt "help:account.tax,amount:"
msgid "In company's currency"
@@ -2621,10 +2682,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Abrir Libro Contable Pregunta"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Abrir Conciliación de Lineas"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Imprimir Libro General"
@@ -2637,10 +2694,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Líneas Conciliación de Asiento"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Desconciliar Líneas"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Abrir Cartera Vencida"
@@ -2673,6 +2726,10 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Imprimir Balance de Prueba"
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Cuenta de impuesto"
@@ -2725,6 +2782,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr "Actualizar Plan de Cuentas"
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr "Líneas Cuentas por Pagar"
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Estado de Situación Financiera"
@@ -2769,6 +2830,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr "Balance No-Diferido"
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr "Anular Asientos"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Cerrar Año Fiscal"
@@ -2779,7 +2844,7 @@ msgstr "Abrir Plan de Códigos de Impuesto"
msgctxt "model:ir.action,name:act_configuration_form"
msgid "Account Configuration"
-msgstr "Configuración Contable"
+msgstr "Configuración Contabilidad"
msgctxt "model:ir.action,name:act_fiscalyear_form"
msgid "Fiscal Years"
@@ -2825,13 +2890,9 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Líneas de Asiento"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Líneas Cuentas por Pagar"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Líneas de Cuentas por Cobrar"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr "Líneas de Cuentas por Pagar/Por Cobrar"
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
@@ -2849,10 +2910,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Abrir Libro Contable"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Abrir Conciliación de Lineas"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Abrir Código de Impuesto"
@@ -2877,6 +2934,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Reabrir períodos"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Conciliar Cuentas"
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Conciliar Líneas"
@@ -2985,6 +3046,21 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Actualizar Plan de Cuentas desde Plantilla"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "Por Pagar"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "Por Cobrar"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Libro Contable por Defecto"
@@ -3006,6 +3082,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Conciliación de Asiento"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Conciliar Líneas"
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr "Gestión Financiera"
@@ -3126,10 +3206,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Abrir Libro Contable"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Conciliar Líneas"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Períodos"
@@ -3154,6 +3230,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Procesos"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Conciliar Cuentas"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Informes"
@@ -3783,6 +3863,10 @@ msgid "Accounts"
msgstr "Plan de Cuentas"
msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Diferidos"
@@ -3930,10 +4014,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Abrir Libro Contable"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Abrir Conciliación de Lineas"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Imprimir Libro Diario General"
@@ -4006,6 +4086,14 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Imprimir Balance de Prueba"
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Valor"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Abrir Plan de Códigos de Impuesto"
@@ -4214,14 +4302,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Abrir"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Abrir"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Cancelar"
@@ -4294,6 +4374,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Imprimir"
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr "Saltar"
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/es_CO.po b/locale/es_EC.po
similarity index 89%
copy from locale/es_CO.po
copy to locale/es_EC.po
index 3650402..db00874 100644
--- a/locale/es_CO.po
+++ b/locale/es_EC.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.account.deferral:"
msgid "Deferral must be unique by account and fiscal year"
-msgstr "Los diferidos deben ser únicos por cuenta y año fiscal"
+msgstr "EL diferido debe ser único por cuenta y año fiscal"
msgctxt "error:account.account.deferral:"
msgid "You can not modify Account Deferral records"
@@ -16,30 +16,31 @@ msgstr "No puede eliminar la cuenta \"%s\" porque tiene líneas de asiento."
msgctxt "error:account.account:"
msgid "You can not delete accounts that have children."
-msgstr "No puede eliminar cuentas que tienen hijos."
+msgstr "No puede eliminar cuentas que tienen hijas."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" have the same post move sequence."
msgstr ""
-"Año fiscal \"%(first)s\" y \"%(second)s\" tienen la misma secuencia de "
-"asientos."
+"El año fiscal \"%(first)s\" y \"%(second)s\" tienen la misma secuencia de "
+"asiento confirmado."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" overlap."
-msgstr "Año fiscal \"%(first)s\" y \"%(second)s\" están solapados."
+msgstr "El año fiscal \"%(first)s\" y \"%(second)s\" se superponen."
msgctxt "error:account.fiscalyear:"
msgid "No fiscal year defined for \"%s\"."
-msgstr "No hay año fiscal definido para \"%s\"."
+msgstr "No se ha definido un año fiscal para \"%s\"."
msgctxt "error:account.fiscalyear:"
msgid "The balance of the account \"%s\" must be zero."
-msgstr "El balance de la cuenta \"%s\" debe ser cero!"
+msgstr "El balance de la cuenta \"%s\" debe ser cero."
msgctxt "error:account.fiscalyear:"
msgid "You can not change the post move sequence in fiscal year \"%s\"."
msgstr ""
-"No puede cambiar la secuencia de asiento confirmado en el año fiscal \"%s\"."
+"No puede cambiar la secuencia de asientos confirmados en el año fiscal "
+"\"%s\"."
msgctxt "error:account.fiscalyear:"
msgid ""
@@ -59,12 +60,12 @@ msgstr ""
msgctxt "error:account.journal.period:"
msgid "You can not create a journal - period on closed period \"%s\"."
-msgstr "No puede crear un libro contable - período en el período cerrado \"%s\"."
+msgstr "No puede crear un libro diario - período en el período cerrado \"%s\"."
msgctxt "error:account.journal.period:"
msgid "You can not modify/delete journal - period \"%s\" because it has moves."
msgstr ""
-"No puede modificar/eliminar un libro contable - período \"%s\" porque tiene "
+"No puede modificar/eliminar el libro diario - período \"%s\" porque tiene "
"asientos."
msgctxt "error:account.journal.period:"
@@ -72,8 +73,8 @@ msgid ""
"You can not open journal - period \"%(journal_period)s\" because period "
"\"%(period)s\" is closed."
msgstr ""
-"No puede abrir el libro contable - período \"%(journal_period)s\" porque el "
-"período \"%(period)s\" esta cerrado."
+"No puede abrir el libro diario - período \"%(journal_period)s\" porque el "
+"período \"%(period)s\" está cerrado."
msgctxt "error:account.journal.period:"
msgid "You can only open one journal per period."
@@ -81,26 +82,35 @@ msgstr "Solo puede abrir un libro diario por período."
msgctxt "error:account.journal.type:"
msgid "The code must be unique."
-msgstr "El código debe ser único!"
+msgstr "El código debe ser único."
msgctxt "error:account.move.line:"
msgid "Line \"%s\" (%d) already reconciled."
-msgstr "¡La línea \"%s\" (%d) ya está conciliada!"
+msgstr "La línea \"%s\" (%d) ya está conciliada."
msgctxt "error:account.move.line:"
msgid "Move line cannot be created because there is no journal defined."
msgstr ""
-"La línea de asiento no puede ser creada porque no hay un libro diario "
-"definido."
+"La línea de asiento no puede ser creada porque no se ha definido ningún "
+"libro diario."
+
+msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr "Se requiere el Tercero en la línea \"%s\""
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr "El Tercero no debe ser establecido en la línea \"%s\""
msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
-msgstr "Valores de haber/debe incorrectos!"
+msgstr "Valores de crédito/débito erróneos."
msgctxt "error:account.move.line:"
msgid "You can not add/modify lines in closed journal period \"%s\"."
msgstr ""
-"No puede añadir/modificar líneas en un libro diario con período cerrado!"
+"No puede añadir/modificar líneas en el libro diario con período cerrado "
+"\"%s\"."
msgctxt "error:account.move.line:"
msgid ""
@@ -108,7 +118,7 @@ msgid ""
"account."
msgstr ""
"No puede crear una línea de asiento con la cuenta \"%s\" porque es una "
-"cuenta tipo vista."
+"cuenta de tipo vista."
msgctxt "error:account.move.line:"
msgid "You can not create a move line with account \"%s\" because it is inactive."
@@ -118,21 +128,21 @@ msgstr ""
msgctxt "error:account.move.line:"
msgid "You can not modify line \"%s\" because it is reconciled."
-msgstr "No puede modificar una línea \"%s\" porque esta conciliada."
+msgstr "No puede modificar la línea \"%s\" porque está conciliada."
msgctxt "error:account.move.line:"
msgid "You can not modify lines of move \"%s\" because it is already posted."
msgstr ""
-"No puede modificar las líneas del asiento \"%s\" porque estan "
-"contabilizadas."
+"No puede modificar las líneas del asiento \"%s\" porque ya está "
+"contabilizado."
msgctxt "error:account.move.reconciliation:"
msgid ""
"You can not create a reconciliation where debit \"%(debit)s\" and credit "
"\"%(credit)s\" differ."
msgstr ""
-"No puede crear una conciliación donde los débitos \"%(debit)s\" y los "
-"créditos \"%(credit)s\" difieren."
+"No puede crear una conciliación donde el débito \"%(debit)s\" y el crédito "
+"\"%(credit)s\" difieren."
msgctxt "error:account.move.reconciliation:"
msgid "You can not modify a reconciliation."
@@ -151,7 +161,7 @@ msgid ""
"You can not reconcile line \"%(line)s\" because it's account "
"\"%(account1)s\" is different from \"%(account2)s\"."
msgstr ""
-"No puede conciliar líneas \"%(line)s\" porque la cuenta \"%(account1)s\" es "
+"No puede conciliar línea \"%(line)s\" porque la cuenta \"%(account1)s\" es "
"diferente de la cuenta \"%(account2)s\"."
msgctxt "error:account.move.reconciliation:"
@@ -164,12 +174,20 @@ msgstr ""
msgctxt "error:account.move.reconciliation:"
msgid "You can not reconcile line \"%s\" because it is not in valid state."
-msgstr "No puede conciliar las líneas \"%s\" porque no estan en estado válido."
+msgstr "No puede conciliar la línea \"%s\" porque no está en estado válido."
+
+msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+"El período del asiento \"%s\" está cerrado.\n"
+"¿Utilizar el período actual?"
msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
-"No puede crear lineas con cuentas de diferentes compañias en el asiento "
+"No puede crear líneas en cuentas de diferentes empresas en el asiento "
"\"%s\"."
msgctxt "error:account.move:"
@@ -177,27 +195,26 @@ msgid ""
"You can not create move \"%(move)s\" because it's date is outside its "
"period."
msgstr ""
-"No puede crear asientos \"%(move)s\" porque su fecha está fuera de su "
+"No puede crear los asientos \"%(move)s\" porque su fecha está fuera de su "
"período."
msgctxt "error:account.move:"
msgid "You can not modify move \"%s\" because it is already posted."
-msgstr ""
-"No puede modificar el asiento \"%s\" porque esta actualmente contabilizado."
+msgstr "No puede modificar el asiento \"%s\" porque ya está contabilizado."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is an unbalanced."
-msgstr "No puede contabilizar el asiento \"%s\" porque esta descuadrado."
+msgstr "No puede contabilizar el asiento \"%s\" porque está descuadrado."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is empty."
-msgstr "No puede confirmar el asiento \"%s\" porque esta vacío."
+msgstr "No puede confirmar el asiento \"%s\" porque está vacío."
msgctxt "error:account.move:"
msgid "You can not set posted move \"%(move)s\" to draft in journal \"%(journal)s\"."
msgstr ""
"No puede convertir el asiento contabilizado \"%(move)s\" a borrador en el "
-"libro contable \"%(journal)s\"."
+"libro diario \"%(journal)s\"."
msgctxt "error:account.move:"
msgid ""
@@ -205,7 +222,7 @@ msgid ""
"closed."
msgstr ""
"No puede convertir a borrador el asiento \"%(move)s\" porque el período "
-"\"%(period)s\" esta cerrado."
+"\"%(period)s\" está cerrado."
msgctxt "error:account.open_aged_balance:"
msgid "Warning"
@@ -217,19 +234,20 @@ msgstr "No puede definir plazos que se solapen."
msgctxt "error:account.period:"
msgid "\"%(first)s\" and \"%(second)s\" periods overlap."
-msgstr "Periodos \"%(first)s\" y \"%(second)s\" solapados."
+msgstr "Los períodos \"%(first)s\" y \"%(second)s\" se superponen."
msgctxt "error:account.period:"
msgid ""
"Company of sequence \"%(sequence)s\" does not match the company of period "
"\"%(period)s\" to which it is assigned to."
msgstr ""
-"La secuencia de la compañia \"%(sequence)s\" no coincide con el periodo "
-"\"%(period)s\" a la cual esta asignada."
+"La empresa de la secuencia \"%(sequence)s\" no coincide con la empresa del "
+"período \"%(period)s\" a la cual está asignada."
msgctxt "error:account.period:"
msgid "Dates of period \"%s\" are outside are outside it's fiscal year dates."
-msgstr "Las fechas del periodo \"%s\" estan fuera del Año Fiscal. "
+msgstr ""
+"Las fechas del período \"%s\" están fuera de las fechas de su año fiscal. "
msgctxt "error:account.period:"
msgid "No period defined for date \"%s\"."
@@ -237,27 +255,27 @@ msgstr "No se ha definido un período para la fecha \"%s\"."
msgctxt "error:account.period:"
msgid "Period \"%(first)s\" and \"%(second)s\" have the same sequence."
-msgstr "Período \"%(first)s\" y \"%(second)s\" tienen la misma secuencia de factura."
+msgstr "Los períodos \"%(first)s\" y \"%(second)s\" tienen la misma secuencia."
msgctxt "error:account.period:"
msgid ""
"You can not change the post move sequence of period \"%s\" because there are"
" already posted moves in the period."
msgstr ""
-"No puede cambiar la secuencia de asientos contabilizados para periodo \"%s\""
-" porque ya tiene asientos contabilizados."
+"No puede cambiar la secuencia de asientos contabilizados del período \"%s\" "
+"porque ya hay asientos contabilizados."
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
-"No puede cerrar el período \"%s\" porque hay asientos no contabilizados en "
-"este período."
+"No puede cerrar el período \"%(period)s\" porque hay asientos \"%(move)s\" "
+"sin contabilizar en este período."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
-msgstr "No puede crear un período en el año fiscal \"%s\" porque esta cerrado."
+msgstr "No puede crear un período en el año fiscal \"%s\" porque está cerrado."
msgctxt "error:account.period:"
msgid "You can not modify/delete period \"%s\" because it has moves."
@@ -269,7 +287,7 @@ msgid ""
"\"%(fiscalyear)s\" is closed."
msgstr ""
"No puede abrir el período \"%(period)s\" porque su año fiscal "
-"\"%(fiscalyear)s\" esta cerrado."
+"\"%(fiscalyear)s\" está cerrado."
msgctxt "field:account.account,active:"
msgid "Active"
@@ -289,7 +307,7 @@ msgstr "Código"
msgctxt "field:account.account,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.account,create_date:"
msgid "Create Date"
@@ -347,6 +365,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Padre"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr "Se Requiere el Tercero"
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -361,7 +383,7 @@ msgstr "Derecha"
msgctxt "field:account.account,second_currency:"
msgid "Secondary Currency"
-msgstr "Segunda Moneda"
+msgstr "Moneda Secundaria"
msgctxt "field:account.account,taxes:"
msgid "Default Taxes"
@@ -499,6 +521,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Padre"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr "Se Requiere el Tercero"
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -569,7 +595,7 @@ msgstr "Hijos"
msgctxt "field:account.account.type,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.account.type,create_date:"
msgid "Create Date"
@@ -593,7 +619,7 @@ msgstr "ID"
msgctxt "field:account.account.type,income_statement:"
msgid "Income Statement"
-msgstr "Estado de Resultados"
+msgstr "Estado del Resultado Integral"
msgctxt "field:account.account.type,name:"
msgid "Name"
@@ -649,7 +675,7 @@ msgstr "ID"
msgctxt "field:account.account.type.template,income_statement:"
msgid "Income Statement"
-msgstr "Estado de Resultado Integral"
+msgstr "Estado del Resultado Integral"
msgctxt "field:account.account.type.template,name:"
msgid "Name"
@@ -713,7 +739,7 @@ msgstr "Plantilla de cuenta"
msgctxt "field:account.create_chart.account,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.create_chart.account,id:"
msgid "ID"
@@ -729,7 +755,7 @@ msgstr "Cuenta por Cobrar por Defecto"
msgctxt "field:account.create_chart.properties,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.create_chart.properties,id:"
msgid "ID"
@@ -749,7 +775,7 @@ msgstr "Código"
msgctxt "field:account.fiscalyear,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.fiscalyear,create_date:"
msgid "Create Date"
@@ -833,11 +859,11 @@ msgstr "Modificado por Usuario"
msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
msgid "Credit Account"
-msgstr "Cuenta Crédito"
+msgstr "Cuenta de Crédito"
msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
msgid "Debit Account"
-msgstr "Cuenta Débito"
+msgstr "Cuenta de Débito"
msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
msgid "Fiscal Year"
@@ -849,7 +875,7 @@ msgstr "ID"
msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
msgid "Period"
@@ -881,11 +907,11 @@ msgstr "Creado por Usuario"
msgctxt "field:account.journal,credit_account:"
msgid "Default Credit Account"
-msgstr "Cuenta Crédito por Defecto"
+msgstr "Cuenta de Crédito por Defecto"
msgctxt "field:account.journal,debit_account:"
msgid "Default Debit Account"
-msgstr "Cuenta Débito por Defecto"
+msgstr "Cuenta de Débito por Defecto"
msgctxt "field:account.journal,id:"
msgid "ID"
@@ -909,7 +935,7 @@ msgstr "Tipo"
msgctxt "field:account.journal,update_posted:"
msgid "Allow cancelling moves"
-msgstr "Permitir anular asientos"
+msgstr "Permitir cancelar asientos"
msgctxt "field:account.journal,view:"
msgid "View"
@@ -945,7 +971,7 @@ msgstr "ID"
msgctxt "field:account.journal.period,journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "field:account.journal.period,name:"
msgid "Name"
@@ -1105,7 +1131,7 @@ msgstr "ID"
msgctxt "field:account.move,journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "field:account.move,lines:"
msgid "Lines"
@@ -1125,11 +1151,11 @@ msgstr "Período"
msgctxt "field:account.move,post_date:"
msgid "Post Date"
-msgstr "Fecha Confirmación"
+msgstr "Fecha de Confirmación"
msgctxt "field:account.move,post_number:"
msgid "Post Number"
-msgstr "Folio"
+msgstr "Número de Contabilización"
msgctxt "field:account.move,rec_name:"
msgid "Name"
@@ -1189,11 +1215,11 @@ msgstr "ID"
msgctxt "field:account.move.line,journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "field:account.move.line,maturity_date:"
msgid "Maturity Date"
-msgstr "Fecha Vencimiento"
+msgstr "Fecha de Vencimiento"
msgctxt "field:account.move.line,move:"
msgid "Move"
@@ -1201,7 +1227,7 @@ msgstr "Asiento"
msgctxt "field:account.move.line,move_description:"
msgid "Move Description"
-msgstr "Descripción"
+msgstr "Descripción del Asiento"
msgctxt "field:account.move.line,move_state:"
msgid "Move State"
@@ -1215,6 +1241,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Tercero"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr "Se Requiere el Tercero"
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Período"
@@ -1257,27 +1287,19 @@ msgstr "ID"
msgctxt "field:account.move.open_journal.ask,journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Período"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.move.print_general_journal.start,from_date:"
msgid "From Date"
-msgstr "Fecha inicial"
+msgstr "Fecha Inicial"
msgctxt "field:account.move.print_general_journal.start,id:"
msgid "ID"
@@ -1313,7 +1335,7 @@ msgstr "ID"
msgctxt "field:account.move.reconcile_lines.writeoff,journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "field:account.move.reconciliation,create_date:"
msgid "Create Date"
@@ -1347,17 +1369,13 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Tipo"
msgctxt "field:account.open_aged_balance.start,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.open_aged_balance.start,id:"
msgid "ID"
@@ -1385,7 +1403,7 @@ msgstr "Unidad"
msgctxt "field:account.open_balance_sheet.start,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.open_balance_sheet.start,date:"
msgid "Date"
@@ -1409,11 +1427,11 @@ msgstr "ID"
msgctxt "field:account.open_chart.start,posted:"
msgid "Posted Moves"
-msgstr "Asiento Contabilizado"
+msgstr "Asientos Contabilizados"
msgctxt "field:account.open_income_statement.start,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.open_income_statement.start,end_period:"
msgid "End Period"
@@ -1437,7 +1455,7 @@ msgstr "Período Inicial"
msgctxt "field:account.open_third_party_balance.start,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.open_third_party_balance.start,fiscalyear:"
msgid "Fiscal Year"
@@ -1457,7 +1475,7 @@ msgstr "Código"
msgctxt "field:account.period,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.period,create_date:"
msgid "Create Date"
@@ -1513,7 +1531,7 @@ msgstr "Modificado por Usuario"
msgctxt "field:account.print_general_ledger.start,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.print_general_ledger.start,empty_account:"
msgid "Empty Account"
@@ -1541,7 +1559,7 @@ msgstr "Período Inicial"
msgctxt "field:account.print_trial_balance.start,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.print_trial_balance.start,empty_account:"
msgid "Empty Account"
@@ -1567,6 +1585,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Período Inicial"
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de Moneda"
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:account.reconcile.show,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.reconcile.show,journal:"
+msgid "Journal"
+msgstr "Libro Diario"
+
+msgctxt "field:account.reconcile.show,lines:"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Terceros"
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Desajuste"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Activo"
@@ -1581,7 +1643,7 @@ msgstr "Hijos"
msgctxt "field:account.tax,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.tax,create_date:"
msgid "Create Date"
@@ -1593,23 +1655,23 @@ msgstr "Creado por Usuario"
msgctxt "field:account.tax,credit_note_account:"
msgid "Credit Note Account"
-msgstr "Cuenta Nota Crédito"
+msgstr "Cuenta de la Nota de Crédito"
msgctxt "field:account.tax,credit_note_base_code:"
msgid "Credit Note Base Code"
-msgstr "Código Base de la Nota Crédito"
+msgstr "Código de la Base de la Nota de Crédito"
msgctxt "field:account.tax,credit_note_base_sign:"
msgid "Credit Note Base Sign"
-msgstr "Signo Base de la Nota Crédito"
+msgstr "Signo de la Base de la Nota de Crédito"
msgctxt "field:account.tax,credit_note_tax_code:"
msgid "Credit Note Tax Code"
-msgstr "Código de Impuesto Nota Crédito"
+msgstr "Código del Impuesto de la Nota de Crédito"
msgctxt "field:account.tax,credit_note_tax_sign:"
msgid "Credit Note Tax Sign"
-msgstr "Signo de Impuesto Nota Crédito"
+msgstr "Signo del Impuesto de la Nota de Crédito"
msgctxt "field:account.tax,currency_digits:"
msgid "Currency Digits"
@@ -1637,19 +1699,19 @@ msgstr "Cuenta de la Factura"
msgctxt "field:account.tax,invoice_base_code:"
msgid "Invoice Base Code"
-msgstr "Código de la Base en Factura"
+msgstr "Código de la Base de la Factura"
msgctxt "field:account.tax,invoice_base_sign:"
msgid "Invoice Base Sign"
-msgstr "Signo de la Base en Factura"
+msgstr "Signo de la Base de la Factura"
msgctxt "field:account.tax,invoice_tax_code:"
msgid "Invoice Tax Code"
-msgstr "Código del Impuesto de Factura"
+msgstr "Código del Impuesto de la Factura"
msgctxt "field:account.tax,invoice_tax_sign:"
msgid "Invoice Tax Sign"
-msgstr "Signo del Impuesto de la Factura"
+msgstr "Signo del Impuesto de la la Factura"
msgctxt "field:account.tax,name:"
msgid "Name"
@@ -1661,7 +1723,7 @@ msgstr "Padre"
msgctxt "field:account.tax,rate:"
msgid "Rate"
-msgstr "Tasa de Cambio"
+msgstr "Valor"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -1705,7 +1767,7 @@ msgstr "Código"
msgctxt "field:account.tax.code,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.tax.code,create_date:"
msgid "Create Date"
@@ -1901,7 +1963,7 @@ msgstr "Modificado por Usuario"
msgctxt "field:account.tax.rule,company:"
msgid "Company"
-msgstr "Compañia"
+msgstr "Empresa"
msgctxt "field:account.tax.rule,create_date:"
msgid "Create Date"
@@ -2097,23 +2159,23 @@ msgstr "Creado por Usuario"
msgctxt "field:account.tax.template,credit_note_account:"
msgid "Credit Note Account"
-msgstr "Cuenta Nota Crédito"
+msgstr "Cuenta de la Nota de Crédito"
msgctxt "field:account.tax.template,credit_note_base_code:"
msgid "Credit Note Base Code"
-msgstr "Código Base de la Nota Crédito"
+msgstr "Código de la Base de la Nota de Crédito"
msgctxt "field:account.tax.template,credit_note_base_sign:"
msgid "Credit Note Base Sign"
-msgstr "Signo Base de la Nota Crédito"
+msgstr "Signo de la Base de la Nota de Crédito"
msgctxt "field:account.tax.template,credit_note_tax_code:"
msgid "Credit Note Tax Code"
-msgstr "Código de Impuesto Nota Crédito"
+msgstr "Código del Impuesto de la Nota de Crédito"
msgctxt "field:account.tax.template,credit_note_tax_sign:"
msgid "Credit Note Tax Sign"
-msgstr "Signo de Impuesto Nota Crédito"
+msgstr "Signo del Impuesto de la Nota de Crédito"
msgctxt "field:account.tax.template,description:"
msgid "Description"
@@ -2137,15 +2199,15 @@ msgstr "Cuenta de la Factura"
msgctxt "field:account.tax.template,invoice_base_code:"
msgid "Invoice Base Code"
-msgstr "Código de la Base en Factura"
+msgstr "Código de la Base de la Factura"
msgctxt "field:account.tax.template,invoice_base_sign:"
msgid "Invoice Base Sign"
-msgstr "Signo de la Base en Factura"
+msgstr "Signo de la Base de la Factura"
msgctxt "field:account.tax.template,invoice_tax_code:"
msgid "Invoice Tax Code"
-msgstr "Código del Impuesto de Factura"
+msgstr "Código del Impuesto de la Factura"
msgctxt "field:account.tax.template,invoice_tax_sign:"
msgid "Invoice Tax Sign"
@@ -2209,7 +2271,7 @@ msgstr "Cuenta por Cobrar"
msgctxt "field:party.party,customer_tax_rule:"
msgid "Customer Tax Rule"
-msgstr "Regla de Impuesto a Cliente"
+msgstr "Regla de Impuesto de Cliente"
msgctxt "field:party.party,payable:"
msgid "Payable"
@@ -2229,7 +2291,7 @@ msgstr "Por Cobrar Hoy"
msgctxt "field:party.party,supplier_tax_rule:"
msgid "Supplier Tax Rule"
-msgstr "Regla de Impuesto a Proveedor"
+msgstr "Regla de Impuesto de Proveedor"
msgctxt "help:account.account,reconcile:"
msgid ""
@@ -2243,7 +2305,7 @@ msgid ""
"to have this secondary currency."
msgstr ""
"Fuerza el uso de la segunda moneda \n"
-"a todos los asientos de esta cuenta."
+"en todos los asientos de esta cuenta."
msgctxt "help:account.account,taxes:"
msgid ""
@@ -2251,31 +2313,31 @@ msgid ""
"for journal types: \"expense\" and \"revenue\""
msgstr ""
"Impuesto por defecto para la codificación manual\n"
-"de líneas de asientos para libros de tipo: \"gastos\" e \"ingresos\"."
+"de líneas de asientos para libros diarios de tipo: \"gastos\" e \"ingresos\"."
msgctxt "help:account.account.type,sequence:"
msgid "Use to order the account type"
-msgstr "Usar para ordenar el tipo de cuenta."
+msgstr "Utilice para ordenar el tipo de cuenta."
msgctxt "help:account.move,post_number:"
msgid "Also known as Folio Number"
-msgstr "Tambien conocido como Número de Folio"
+msgstr "También conocido como Número de Folio"
msgctxt "help:account.move.line,amount_second_currency:"
msgid "The amount expressed in a second currency"
-msgstr "La cantidad expresado en la segunda moneda."
+msgstr "La cantidad expresada en la segunda moneda."
msgctxt "help:account.move.line,maturity_date:"
msgid ""
"This field is used for payable and receivable lines. \n"
"You can put the limit date for the payment."
msgstr ""
-"Este campo se usa en las líneas por pagar y por cobrar.\n"
+"Este campo se utiliza en las líneas por pagar y por cobrar.\n"
"Puede establecer la fecha límite para el pago."
msgctxt "help:account.move.line,second_currency:"
msgid "The second currency"
-msgstr "La segunda moneda."
+msgstr "La segunda moneda"
msgctxt "help:account.move.print_general_journal.start,posted:"
msgid "Show only posted move"
@@ -2291,7 +2353,7 @@ msgstr "Muestra sólo asientos confirmados."
msgctxt "help:account.open_chart.start,fiscalyear:"
msgid "Leave empty for all open fiscal year"
-msgstr "Dejar vacío para abrir todos los años fiscales."
+msgstr "Dejarlo vacío para todos los años fiscales abiertos."
msgctxt "help:account.open_chart.start,posted:"
msgid "Show posted moves only"
@@ -2323,7 +2385,7 @@ msgstr "Muestra sólo asientos confirmados."
msgctxt "help:account.tax,amount:"
msgid "In company's currency"
-msgstr "En la moneda de la compañia."
+msgstr "En la moneda de la empresa."
msgctxt "help:account.tax,credit_note_base_sign:"
msgid "Usualy 1 or -1"
@@ -2335,7 +2397,7 @@ msgstr "Normalmente 1 o -1."
msgctxt "help:account.tax,description:"
msgid "The name that will be used in reports"
-msgstr "El nombre que se usará en los informes."
+msgstr "El nombre que se utilizará en los informes."
msgctxt "help:account.tax,invoice_base_sign:"
msgid "Usualy 1 or -1"
@@ -2347,11 +2409,11 @@ msgstr "Normalmente 1 o -1."
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
-msgstr "Usar para ordenar los impuestos."
+msgstr "Utilice para ordenar los impuestos."
msgctxt "help:account.tax.code.open_chart.start,fiscalyear:"
msgid "Leave empty for all open fiscal year"
-msgstr "Dejar vacío para abrir todos los años fiscales."
+msgstr "Dejarlo vacío para abrir todos los años fiscales."
msgctxt "help:account.tax.code.open_chart.start,periods:"
msgid "Leave empty for all periods of all open fiscal year"
@@ -2375,12 +2437,12 @@ msgstr ""
msgctxt "help:party.party,customer_tax_rule:"
msgid "Apply this rule on taxes when party is customer."
-msgstr "Aplique esta regla en los impuestos cuando el tercero es un cliente."
+msgstr "Aplicar esta regla en los impuestos cuando el tercero es un cliente."
msgctxt "help:party.party,supplier_tax_rule:"
msgid "Apply this rule on taxes when party is supplier."
msgstr ""
-"Aplique esta regla en los impuestos cuando el tercero es un proveedor."
+"Aplicar esta regla en los impuestos cuando el tercero es un proveedor."
msgctxt "model:account.account,name:"
msgid "Account"
@@ -2400,23 +2462,23 @@ msgstr "Plantilla de Cuenta"
msgctxt "model:account.account.template,name:account_template_cash"
msgid "Main Cash"
-msgstr "Efectivo principal"
+msgstr "Efectivo Principal"
msgctxt "model:account.account.template,name:account_template_expense"
msgid "Main Expense"
-msgstr "Gastos principal"
+msgstr "Gastos Principal"
msgctxt "model:account.account.template,name:account_template_payable"
msgid "Main Payable"
-msgstr "Por pagar principal"
+msgstr "Por Pagar Principal"
msgctxt "model:account.account.template,name:account_template_receivable"
msgid "Main Receivable"
-msgstr "Por cobrar principal"
+msgstr "Por Cobrar Principal"
msgctxt "model:account.account.template,name:account_template_revenue"
msgid "Main Revenue"
-msgstr "Ingresos principal"
+msgstr "Ingresos Principal"
msgctxt "model:account.account.template,name:account_template_root"
msgid "Minimal Account Chart"
@@ -2440,12 +2502,12 @@ msgstr "Plantilla de Tipo de Cuenta"
msgctxt "model:account.account.type.template,name:account_type_template_asset"
msgid "Asset"
-msgstr "Activo Fijo"
+msgstr "Activo"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_current"
msgid "Current"
-msgstr "Banco"
+msgstr "Actual"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_current_cash"
@@ -2485,7 +2547,7 @@ msgstr "Pasivo"
msgctxt ""
"model:account.account.type.template,name:account_type_template_liability_current"
msgid "Current"
-msgstr "Banco"
+msgstr "Actual"
msgctxt ""
"model:account.account.type.template,name:account_type_template_liability_current_payable"
@@ -2505,12 +2567,12 @@ msgstr "A largo plazo"
msgctxt ""
"model:account.account.type.template,name:account_type_template_minimal"
msgid "Minimal Account Type Chart"
-msgstr "Tipo de cuenta de plan mínimo"
+msgstr "Plan de tipos de cuenta mínimo"
msgctxt ""
"model:account.account.type.template,name:account_type_template_off_balance"
msgid "Off-Balance"
-msgstr "Fuera de balance"
+msgstr "Fuera de Balance"
msgctxt ""
"model:account.account.type.template,name:account_type_template_revenue"
@@ -2519,7 +2581,7 @@ msgstr "Ingresos"
msgctxt "model:account.configuration,name:"
msgid "Account Configuration"
-msgstr "Configuración Contabilidad"
+msgstr "Configuración Contable"
msgctxt "model:account.create_chart.account,name:"
msgid "Create Chart"
@@ -2551,7 +2613,7 @@ msgstr "Cerrar Año Fiscal"
msgctxt "model:account.journal,name:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "model:account.journal,name:journal_cash"
msgid "Cash"
@@ -2567,15 +2629,15 @@ msgstr "Ingresos"
msgctxt "model:account.journal,name:journal_stock"
msgid "Stock"
-msgstr "Inventarios"
+msgstr "Existencias"
msgctxt "model:account.journal.period,name:"
msgid "Journal - Period"
-msgstr "Libro Contable - Período"
+msgstr "Libro Diario - Período"
msgctxt "model:account.journal.type,name:"
msgid "Journal Type"
-msgstr "Tipo de Libro"
+msgstr "Tipo de Libro Diario"
msgctxt "model:account.journal.type,name:journal_type_cash"
msgid "Cash"
@@ -2599,15 +2661,15 @@ msgstr "Situación"
msgctxt "model:account.journal.type,name:journal_type_write_off"
msgid "Write-Off"
-msgstr "Anulado"
+msgstr "Desajuste"
msgctxt "model:account.journal.view,name:"
msgid "Journal View"
-msgstr "Vista de Libro Contable"
+msgstr "Vista de Libro Diario"
msgctxt "model:account.journal.view.column,name:"
msgid "Journal View Column"
-msgstr "Columna de Vista de Libro Diario"
+msgstr "Columna de la Vista de Libro Diario"
msgctxt "model:account.move,name:"
msgid "Account Move"
@@ -2615,31 +2677,23 @@ msgstr "Asiento Contable"
msgctxt "model:account.move.line,name:"
msgid "Account Move Line"
-msgstr "Línea de Asiento"
+msgstr "Línea de Asiento Contable"
msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
-msgstr "Abrir Libro Contable Pregunta"
-
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Abrir Conciliación de Lineas"
+msgstr "Solicitar el Libro Diario a Abrir"
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
-msgstr "Imprimir Libro General"
+msgstr "Imprimir Libro Diario General"
msgctxt "model:account.move.reconcile_lines.writeoff,name:"
msgid "Reconcile Lines Write-Off"
-msgstr "Conciliar Líneas Perdidas"
+msgstr "Conciliar Líneas con Desajuste"
msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
-msgstr "Líneas Conciliación de Asiento"
-
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Desconciliar Líneas"
+msgstr "Líneas de Conciliación de Asientos Contables"
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
@@ -2655,7 +2709,7 @@ msgstr "Abrir Plan de Cuentas"
msgctxt "model:account.open_income_statement.start,name:"
msgid "Open Income Statement"
-msgstr "Abrir Estado de Resultado Integral"
+msgstr "Abrir Estado del Resultado Integral"
msgctxt "model:account.open_third_party_balance.start,name:"
msgid "Open Third Party Balance"
@@ -2671,11 +2725,15 @@ msgstr "Imprimir Libro Mayor"
msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
-msgstr "Imprimir Balance de Prueba"
+msgstr "Imprimir Balance de Comprobación"
+
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Conciliar"
msgctxt "model:account.tax,name:"
msgid "Account Tax"
-msgstr "Cuenta de impuesto"
+msgstr "Cuenta de Impuesto"
msgctxt "model:account.tax.code,name:"
msgid "Tax Code"
@@ -2731,7 +2789,7 @@ msgstr "Estado de Situación Financiera"
msgctxt "model:ir.action,name:act_account_income_statement_tree"
msgid "Income Statement"
-msgstr "Estado de Resultado Integral"
+msgstr "Estado del Resultado Integral"
msgctxt "model:ir.action,name:act_account_list"
msgid "Accounts"
@@ -2759,7 +2817,7 @@ msgstr "Tipos de cuenta"
msgctxt "model:ir.action,name:act_account_type_template_tree"
msgid "Account Type Templates"
-msgstr "Plantillas de tipo de cuenta"
+msgstr "Plantillas de Tipo de Cuenta"
msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
@@ -2769,6 +2827,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr "Balance No-Diferido"
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr "Cancelar Asientos"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Cerrar Año Fiscal"
@@ -2787,35 +2849,35 @@ msgstr "Años Fiscales"
msgctxt "model:ir.action,name:act_journal_form"
msgid "Journals"
-msgstr "Libros Contables"
+msgstr "Libros Diarios"
msgctxt "model:ir.action,name:act_journal_period_close"
msgid "Close Journals - Periods"
-msgstr "Cerrar Libros - Períodos"
+msgstr "Cerrar Libros Diarios - Períodos"
msgctxt "model:ir.action,name:act_journal_period_form"
msgid "Journals - Periods"
-msgstr "Libros Contables - Períodos"
+msgstr "Libros Diarios - Períodos"
msgctxt "model:ir.action,name:act_journal_period_reopen"
msgid "Re-Open Journals - Periods"
-msgstr "Reabrir Libros - Períodos"
+msgstr "Reabrir Libros Diarios - Períodos"
msgctxt "model:ir.action,name:act_journal_period_tree"
msgid "Journals - Periods"
-msgstr "Libros Contables - Períodos"
+msgstr "Libros Diarios - Períodos"
msgctxt "model:ir.action,name:act_journal_period_tree2"
msgid "Journals - Periods"
-msgstr "Libros Contables - Períodos"
+msgstr "Libros Diarios - Períodos"
msgctxt "model:ir.action,name:act_journal_type_form"
msgid "Journal Types"
-msgstr "Tipos de Libros"
+msgstr "Tipos de Libros Diarios"
msgctxt "model:ir.action,name:act_journal_view_form"
msgid "Journal Views"
-msgstr "Vistas de Libros"
+msgstr "Vistas de Libro Diario"
msgctxt "model:ir.action,name:act_move_form"
msgid "Account Moves"
@@ -2823,23 +2885,19 @@ msgstr "Asientos Contables"
msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
-msgstr "Líneas de Asiento"
+msgstr "Líneas de Asientos Contables"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Líneas Cuentas por Pagar"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Líneas de Cuentas por Cobrar"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr "Líneas por Pagar / por Cobrar"
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
-msgstr "Conciliación de Líneas"
+msgstr "Líneas de Conciliación"
msgctxt "model:ir.action,name:act_open_account"
msgid "Open Move Account"
-msgstr "Abrir Asiento Contable"
+msgstr "Abrir Cuenta del Asiento"
msgctxt "model:ir.action,name:act_open_chart"
msgid "Open Chart of Accounts"
@@ -2847,11 +2905,7 @@ msgstr "Abrir Plan de Cuentas"
msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
-msgstr "Abrir Libro Contable"
-
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Abrir Conciliación de Lineas"
+msgstr "Abrir Libro Diario"
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
@@ -2875,7 +2929,11 @@ msgstr "Períodos"
msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
-msgstr "Reabrir períodos"
+msgstr "Reabrir Períodos"
+
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Conciliar Cuentas"
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
@@ -2903,7 +2961,7 @@ msgstr "Grupos de Impuestos"
msgctxt "model:ir.action,name:act_tax_line_form"
msgid "Tax Lines"
-msgstr "Líneas de Impuestos"
+msgstr "Líneas de Impuesto"
msgctxt "model:ir.action,name:act_tax_list"
msgid "Taxes"
@@ -2915,7 +2973,7 @@ msgstr "Reglas de Impuesto"
msgctxt "model:ir.action,name:act_tax_rule_template_form"
msgid "Tax Rule Templates"
-msgstr "Plantillas de Reglas de Impuestos"
+msgstr "Plantillas de Reglas de Impuesto"
msgctxt "model:ir.action,name:act_tax_template_tree"
msgid "Taxes Templates"
@@ -2935,7 +2993,7 @@ msgstr "Cartera Vencida"
msgctxt "model:ir.action,name:report_general_journal"
msgid "General Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario General"
msgctxt "model:ir.action,name:report_general_ledger"
msgid "General Ledger"
@@ -2947,7 +3005,7 @@ msgstr "Balance de Tercero"
msgctxt "model:ir.action,name:report_trial_balance"
msgid "Trial Balance"
-msgstr "Balance de Prueba"
+msgstr "Balance de Comprobación"
msgctxt "model:ir.action,name:wizard_create_chart"
msgid "Create Chart of Accounts from Template"
@@ -2963,7 +3021,7 @@ msgstr "Abrir Estado de Situación Financiera"
msgctxt "model:ir.action,name:wizard_open_income_statement"
msgid "Open Income Statement"
-msgstr "Abrir Estado de Resultado Integral"
+msgstr "Abrir Estado del Resultado Integral"
msgctxt "model:ir.action,name:wizard_open_third_party_balance"
msgid "Open Third Party Balance"
@@ -2979,23 +3037,38 @@ msgstr "Imprimir Libro Mayor"
msgctxt "model:ir.action,name:wizard_print_trial_balance"
msgid "Print Trial Balance"
-msgstr "Imprimir Balance de Prueba"
+msgstr "Imprimir Balance de Comprobación"
msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Actualizar Plan de Cuentas desde Plantilla"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "Por Pagar"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "Por Cobrar"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
-msgstr "Libro Contable por Defecto"
+msgstr "Libro Diario Contable por Defecto"
msgctxt "model:ir.sequence,name:sequence_account_move_reconciliation"
msgid "Default Account Move Reconciliation"
-msgstr "Conciliación de Asiento por Defecto"
+msgstr "Conciliación de Asiento Contable por Defecto"
msgctxt "model:ir.sequence.type,name:sequence_type_account_journal"
msgid "Account Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario Contable"
msgctxt "model:ir.sequence.type,name:sequence_type_account_move"
msgid "Account Move"
@@ -3004,11 +3077,15 @@ msgstr "Asiento Contable"
msgctxt ""
"model:ir.sequence.type,name:sequence_type_account_move_reconciliation"
msgid "Account Move Reconciliation"
-msgstr "Conciliación de Asiento"
+msgstr "Conciliación de Asiento Contable"
+
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Conciliar Líneas"
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
-msgstr "Gestión Financiera"
+msgstr "Financiero"
msgctxt "model:ir.ui.menu,name:menu_account_configuration"
msgid "Configuration"
@@ -3080,31 +3157,31 @@ msgstr "Plan de Cuentas"
msgctxt "model:ir.ui.menu,name:menu_journal_configuration"
msgid "Journals"
-msgstr "Libros Contables"
+msgstr "Libros Diarios"
msgctxt "model:ir.ui.menu,name:menu_journal_form"
msgid "Journals"
-msgstr "Libros Contables"
+msgstr "Libros Diarios"
msgctxt "model:ir.ui.menu,name:menu_journal_period_form"
msgid "Close Journals - Periods"
-msgstr "Cerrar Libros - Períodos"
+msgstr "Cerrar Libros Diarios- Períodos"
msgctxt "model:ir.ui.menu,name:menu_journal_period_tree"
msgid "Journals - Periods"
-msgstr "Libros Contables - Períodos"
+msgstr "Libros Diarios - Períodos"
msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2"
msgid "Journals - Periods"
-msgstr "Libros Contables - Períodos"
+msgstr "Libros Diarios - Períodos"
msgctxt "model:ir.ui.menu,name:menu_journal_type_form"
msgid "Journal Types"
-msgstr "Tipos de Libros"
+msgstr "Tipos de Libros Diarios"
msgctxt "model:ir.ui.menu,name:menu_journal_view_form"
msgid "Journal Views"
-msgstr "Vistas de Libros"
+msgstr "Vistas de Libro Diario"
msgctxt "model:ir.ui.menu,name:menu_move_form"
msgid "Account Moves"
@@ -3120,15 +3197,11 @@ msgstr "Abrir Plan de Cuentas"
msgctxt "model:ir.ui.menu,name:menu_open_income_statement"
msgid "Income Statement"
-msgstr "Estado de Resultado Integral"
+msgstr "Estado del Resultado Integral"
msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
-msgstr "Abrir Libro Contable"
-
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Conciliar Líneas"
+msgstr "Abrir Libro Diario"
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
@@ -3140,7 +3213,7 @@ msgstr "Cerrar Períodos"
msgctxt "model:ir.ui.menu,name:menu_print_general_journal"
msgid "Print General Journal"
-msgstr "Imprimir Libro General"
+msgstr "Imprimir Libro Diario General"
msgctxt "model:ir.ui.menu,name:menu_print_general_ledger"
msgid "Print General Legder"
@@ -3148,12 +3221,16 @@ msgstr "Imprimir Libro Mayor"
msgctxt "model:ir.ui.menu,name:menu_print_trial_balance"
msgid "Print Trial Balance"
-msgstr "Imprimir Balance de Prueba"
+msgstr "Imprimir Balance de Comprobación"
msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Procesos"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Conciliar Cuentas"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Informes"
@@ -3208,11 +3285,11 @@ msgstr "Actualizar Plan de Cuentas desde Plantilla"
msgctxt "model:ir.ui.menu,name:menuitem_account_configuration"
msgid "Account Configuration"
-msgstr "Configuración Contabilidad"
+msgstr "Configuración Contable"
msgctxt "model:res.group,name:group_account"
msgid "Account"
-msgstr "Contabilidad"
+msgstr "Financiero"
msgctxt "model:res.group,name:group_account_admin"
msgid "Account Administration"
@@ -3236,7 +3313,7 @@ msgstr "Cartera Vencida de Clientes y Proveedores"
msgctxt "odt:account.aged_balance:"
msgid "Company:"
-msgstr "Compañia:"
+msgstr "Empresa:"
msgctxt "odt:account.aged_balance:"
msgid "Day"
@@ -3288,7 +3365,7 @@ msgstr "Código"
msgctxt "odt:account.general_ledger:"
msgid "Company:"
-msgstr "Compañia:"
+msgstr "Empresa:"
msgctxt "odt:account.general_ledger:"
msgid "Credit"
@@ -3360,7 +3437,7 @@ msgstr "Cuenta"
msgctxt "odt:account.move.general_journal:"
msgid "Company:"
-msgstr "Compañia:"
+msgstr "Empresa:"
msgctxt "odt:account.move.general_journal:"
msgid "Credit"
@@ -3384,15 +3461,15 @@ msgstr "Borrador"
msgctxt "odt:account.move.general_journal:"
msgid "From Date:"
-msgstr "Fecha inicial:"
+msgstr "Fecha Inicial:"
msgctxt "odt:account.move.general_journal:"
msgid "General Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario General"
msgctxt "odt:account.move.general_journal:"
msgid "Journal Entry:"
-msgstr "Asiento en Libro:"
+msgstr "Asiento de Libro Diario:"
msgctxt "odt:account.move.general_journal:"
msgid "Origin:"
@@ -3428,7 +3505,7 @@ msgstr "Balance"
msgctxt "odt:account.third_party_balance:"
msgid "Company:"
-msgstr "Compañia:"
+msgstr "Empresa:"
msgctxt "odt:account.third_party_balance:"
msgid "Credit"
@@ -3472,7 +3549,7 @@ msgstr "Cuenta"
msgctxt "odt:account.trial_balance:"
msgid "Company:"
-msgstr "Compañia:"
+msgstr "Empresa:"
msgctxt "odt:account.trial_balance:"
msgid "Credit"
@@ -3492,11 +3569,11 @@ msgstr "Desde Período:"
msgctxt "odt:account.trial_balance:"
msgid "Print Date:"
-msgstr "Fecha de impresión:"
+msgstr "Fecha de Impresión:"
msgctxt "odt:account.trial_balance:"
msgid "Start Balance"
-msgstr "Balance Inicial"
+msgstr "Saldo Inicial"
msgctxt "odt:account.trial_balance:"
msgid "To Period:"
@@ -3508,7 +3585,7 @@ msgstr "Total"
msgctxt "odt:account.trial_balance:"
msgid "Trial Balance"
-msgstr "Balance de Prueba"
+msgstr "Balance de Comprobación"
msgctxt "odt:account.trial_balance:"
msgid "User:"
@@ -3540,7 +3617,7 @@ msgstr "Ingresos"
msgctxt "selection:account.account,kind:"
msgid "Stock"
-msgstr "Inventarios"
+msgstr "Existencias"
msgctxt "selection:account.account,kind:"
msgid "View"
@@ -3568,7 +3645,7 @@ msgstr "Ingresos"
msgctxt "selection:account.account.template,kind:"
msgid "Stock"
-msgstr "Inventarios"
+msgstr "Existencias"
msgctxt "selection:account.account.template,kind:"
msgid "View"
@@ -3576,19 +3653,19 @@ msgstr "Vista"
msgctxt "selection:account.account.type,display_balance:"
msgid "Credit - Debit"
-msgstr "Haber - Debe"
+msgstr "Crédito - Débito"
msgctxt "selection:account.account.type,display_balance:"
msgid "Debit - Credit"
-msgstr "Debe - Haber"
+msgstr "Débito - Crédito"
msgctxt "selection:account.account.type.template,display_balance:"
msgid "Credit - Debit"
-msgstr "Haber - Debe"
+msgstr "Crédito - Débito"
msgctxt "selection:account.account.type.template,display_balance:"
msgid "Debit - Credit"
-msgstr "Debe - Haber"
+msgstr "Débito - Crédito"
msgctxt "selection:account.fiscalyear,state:"
msgid "Close"
@@ -3692,7 +3769,7 @@ msgstr "Ambos"
msgctxt "selection:account.tax.group,kind:"
msgid "Purchase"
-msgstr "Compras"
+msgstr "Compra"
msgctxt "selection:account.tax.group,kind:"
msgid "Sale"
@@ -3704,7 +3781,7 @@ msgstr "Ambos"
msgctxt "selection:account.tax.rule,kind:"
msgid "Purchase"
-msgstr "Compras"
+msgstr "Compra"
msgctxt "selection:account.tax.rule,kind:"
msgid "Sale"
@@ -3716,7 +3793,7 @@ msgstr "Ambos"
msgctxt "selection:account.tax.rule.template,kind:"
msgid "Purchase"
-msgstr "Compras"
+msgstr "Compra"
msgctxt "selection:account.tax.rule.template,kind:"
msgid "Sale"
@@ -3756,7 +3833,7 @@ msgstr "Plantilla de Tipo de Cuenta"
msgctxt "view:account.account.type.template:"
msgid "Account Types Templates"
-msgstr "Plantillas de Tipos de Cuenta"
+msgstr "Plantillas de Tipo de Cuenta"
msgctxt "view:account.account.type:"
msgid "Account Type"
@@ -3772,7 +3849,7 @@ msgstr "Estado de Situación Financiera"
msgctxt "view:account.account.type:"
msgid "Income Statement"
-msgstr "Estado de Resultados"
+msgstr "Estado del Resultado Integral"
msgctxt "view:account.account:"
msgid "Account"
@@ -3780,7 +3857,11 @@ msgstr "Cuenta"
msgctxt "view:account.account:"
msgid "Accounts"
-msgstr "Plan de Cuentas"
+msgstr "Cuentas"
+
+msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Hijos"
msgctxt "view:account.account:"
msgid "Deferrals"
@@ -3796,7 +3877,7 @@ msgstr "Notas"
msgctxt "view:account.configuration:"
msgid "Account Configuration"
-msgstr "Configuración Contabilidad"
+msgstr "Configuración Contable"
msgctxt "view:account.create_chart.account:"
msgid "Create Chart of Accounts"
@@ -3815,7 +3896,7 @@ msgid ""
"You can now create a chart of account for your company by selecting a chart "
"of account template."
msgstr ""
-"Ahora puede crear un plan de cuentas para su Compañia seleccionando una "
+"Ahora puede crear un plan de cuentas para su empresa seleccionando una "
"plantilla de plan de cuentas."
msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
@@ -3828,7 +3909,7 @@ msgstr "Cerrar Año Fiscal"
msgctxt "view:account.fiscalyear:"
msgid "Are you sure to close fiscal year?"
-msgstr "Está seguro que quiere cerrar el año fiscal?"
+msgstr "¿Está seguro que quiere cerrar el año fiscal?"
msgctxt "view:account.fiscalyear:"
msgid "Close Fiscal Year"
@@ -3864,19 +3945,19 @@ msgstr "Secuencias"
msgctxt "view:account.journal.period:"
msgid "Journal - Period"
-msgstr "Libro Contable - Período"
+msgstr "Libro Diario - Período"
msgctxt "view:account.journal.period:"
msgid "Journals - Periods"
-msgstr "Libros Contables - Períodos"
+msgstr "Libros Diarios - Períodos"
msgctxt "view:account.journal.type:"
msgid "Journal Type"
-msgstr "Tipo de Libro"
+msgstr "Tipo de Libro Diario"
msgctxt "view:account.journal.type:"
msgid "Journal Types"
-msgstr "Tipos de Libros"
+msgstr "Tipos de Libros Diarios"
msgctxt "view:account.journal.view.column:"
msgid "View Column"
@@ -3888,11 +3969,11 @@ msgstr "Ver Columnas"
msgctxt "view:account.journal.view:"
msgid "Journal View"
-msgstr "Vista de Libro Contable"
+msgstr "Vista de Libro Diario"
msgctxt "view:account.journal.view:"
msgid "Journal Views"
-msgstr "Vistas de Libros"
+msgstr "Vistas de Libros Diarios"
msgctxt "view:account.journal:"
msgid "General Information"
@@ -3900,19 +3981,19 @@ msgstr "Información General"
msgctxt "view:account.journal:"
msgid "Journal"
-msgstr "Libro Contable"
+msgstr "Libro Diario"
msgctxt "view:account.journal:"
msgid "Journals"
-msgstr "Libros Contables"
+msgstr "Libros Diarios"
msgctxt "view:account.move.line:"
msgid "Account Move Line"
-msgstr "Línea de Asiento"
+msgstr "Línea de Asiento Contable"
msgctxt "view:account.move.line:"
msgid "Account Move Lines"
-msgstr "Líneas de Asiento"
+msgstr "Líneas de Asientos Contables"
msgctxt "view:account.move.line:"
msgid "Credit"
@@ -3924,15 +4005,11 @@ msgstr "Débito"
msgctxt "view:account.move.line:"
msgid "Other Info"
-msgstr "Info Adicional"
+msgstr "Información Adicional"
msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
-msgstr "Abrir Libro Contable"
-
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Abrir Conciliación de Lineas"
+msgstr "Abrir Libro Diario"
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
@@ -3940,7 +4017,7 @@ msgstr "Imprimir Libro Diario General"
msgctxt "view:account.move.reconcile_lines.writeoff:"
msgid "Write-Off"
-msgstr "Anulado"
+msgstr "Desajuste"
msgctxt "view:account.move.reconciliation:"
msgid "Reconciliation"
@@ -3984,7 +4061,7 @@ msgstr "Abrir Plan de Cuentas"
msgctxt "view:account.open_income_statement.start:"
msgid "Open Income Statement"
-msgstr "Abrir Estado de Resultado Integral"
+msgstr "Abrir Estado del Resultado Integral"
msgctxt "view:account.open_third_party_balance.start:"
msgid "Open Third Party Balance"
@@ -4004,7 +4081,15 @@ msgstr "Imprimir Libro Mayor"
msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
-msgstr "Imprimir Balance de Prueba"
+msgstr "Imprimir Balance de Comprobación"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Valor"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Conciliar"
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
@@ -4052,11 +4137,11 @@ msgstr "Grupos de Impuestos"
msgctxt "view:account.tax.line:"
msgid "Account Tax Line"
-msgstr "Cuenta de Línea de Impuesto"
+msgstr "Línea de Impuesto Contable"
msgctxt "view:account.tax.line:"
msgid "Account Tax Lines"
-msgstr "Cuenta de Líneas de Impuesto"
+msgstr "Líneas de Impuesto Contable"
msgctxt "view:account.tax.rule.line.template:"
msgid "Tax Rule Line Template"
@@ -4100,7 +4185,7 @@ msgstr "Código"
msgctxt "view:account.tax.template:"
msgid "Credit Note"
-msgstr "Nota Crédito"
+msgstr "Nota de Crédito"
msgctxt "view:account.tax.template:"
msgid "General Information"
@@ -4116,7 +4201,7 @@ msgstr "Plantilla de Impuesto"
msgctxt "view:account.tax.template:"
msgid "Taxes Templates"
-msgstr "Plantillas de Impuesto"
+msgstr "Plantillas de Impuestos"
msgctxt "view:account.tax:"
msgid "%"
@@ -4128,7 +4213,7 @@ msgstr "Código"
msgctxt "view:account.tax:"
msgid "Credit Note"
-msgstr "Nota Crédito"
+msgstr "Nota de Crédito"
msgctxt "view:account.tax:"
msgid "General Information"
@@ -4156,7 +4241,7 @@ msgstr "Actualizar Plan de Cuentas"
msgctxt "view:account.update_chart.succeed:"
msgid "Update Chart of Accounts Succeed!"
-msgstr "Actualización del Plan de Cuentas Exitosa!"
+msgstr "¡Actualización Exitosa del Plan de Cuentas!"
msgctxt "view:party.party:"
msgid "Account"
@@ -4214,14 +4299,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Abrir"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Abrir"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Cancelar"
@@ -4294,6 +4371,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Imprimir"
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr "Saltar"
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 8686967..2c01c7b 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -93,6 +93,14 @@ msgstr ""
"No se puede crear el apunte contable porque no se ha definido ningún diario."
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr "El tercero es requerido en el apunte \"%s\"."
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr "No debe introducir un tercero en el apunte \"%s\"."
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr "Valores de haber/debe erróneos."
@@ -109,7 +117,7 @@ msgstr ""
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 con la cuenta \"%s\" porque está inactiva."
+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."
@@ -161,9 +169,17 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "No puede conciliar el apunte \"%s\" porque no está en un estado correcto."
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+"El período del asiento \"%s\" está cerrado.\n"
+"¿Quiere usar el período actual?"
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
-"No puede crear líneas con cuentas de diferentes empresas en el asiento "
+"No puede crear apuntes con cuentas de diferentes empresas en el asiento "
"\"%s\"."
msgctxt "error:account.move:"
@@ -171,8 +187,8 @@ msgid ""
"You can not create move \"%(move)s\" because it's date is outside its "
"period."
msgstr ""
-"No puede crear los movimientos \"%(move)s\" porque la fecha se encuentra "
-"fuera del período."
+"No puede crear los asientos \"%(move)s\" porque la fecha se encuentra fuera "
+"del período."
msgctxt "error:account.move:"
msgid "You can not modify move \"%s\" because it is already posted."
@@ -242,11 +258,11 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
-"No puede cerrar el período \"%s\" porque hay asientos sin confirmar en este "
-"período."
+"No puede cerrar el período \"%(period)s\" porque hay asientos no confirmados"
+" \"%(move)s\" en este período."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
@@ -341,6 +357,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Padre"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr "Tercero requerido"
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -493,6 +513,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Padre"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr "Tercero requerido"
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Nombre"
@@ -735,7 +759,7 @@ msgstr "ID"
msgctxt "field:account.fiscalyear,close_lines:"
msgid "Close Lines"
-msgstr "Cerrar líneas"
+msgstr "Apuntes de cierre"
msgctxt "field:account.fiscalyear,code:"
msgid "Code"
@@ -1209,6 +1233,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Tercero"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr "Tercero requerido"
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Período"
@@ -1257,14 +1285,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Período"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Empresa"
@@ -1341,10 +1361,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Tipo"
@@ -1561,6 +1577,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Período inicial"
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de la moneda"
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Descripción"
+
+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"
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Terceros"
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Desajuste"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Activo"
@@ -2264,7 +2324,7 @@ msgid ""
"This field is used for payable and receivable lines. \n"
"You can put the limit date for the payment."
msgstr ""
-"Este campo se usa en las líneas a pagar y a cobrar.\n"
+"Este campo se usa en los apuntes a pagar y a cobrar.\n"
"Puede establecer la fecha límite para el pago."
msgctxt "help:account.move.line,second_currency:"
@@ -2616,10 +2676,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Solicitar el diario a abrir"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Abrir apuntes conciliados"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Imprimir libro diario"
@@ -2632,10 +2688,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Líneas de conciliación de apuntes contables"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Desconciliar apuntes"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Abrir balance histórico"
@@ -2668,6 +2720,10 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Imprimir balance de sumas y saldos"
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Impuesto contable"
@@ -2720,6 +2776,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr "Actualizar plan contable"
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr "Líneas a pagar"
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Balance general"
@@ -2764,6 +2824,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr "Crear asiento de regularización"
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr "Cancelar asientos"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Cerrar ejercicio fiscal"
@@ -2820,13 +2884,9 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Apuntes contables"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Líneas a pagar"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Líneas a cobrar"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr "Apuntes a pagar/cobrar"
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
@@ -2844,10 +2904,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Abrir diario"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Abrir apuntes conciliados"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Abrir código de impuesto"
@@ -2872,6 +2928,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Reabrir períodos"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Conciliar cuentas"
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Conciliar apuntes"
@@ -2980,6 +3040,21 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Actualizar plan contable desde plantilla"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Todos"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "A pagar"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "A cobrar"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Diario contable por defecto"
@@ -3001,6 +3076,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Conciliación de apunte contable"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Conciliar apuntes"
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr "Contabilidad"
@@ -3121,10 +3200,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Abrir diario"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Conciliar apuntes"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Períodos"
@@ -3149,6 +3224,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Procesos"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Conciliar cuentas"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Informes"
@@ -3311,7 +3390,7 @@ msgstr "Libro mayor"
msgctxt "odt:account.general_ledger:"
msgid "Move"
-msgstr "Movimiento"
+msgstr "Asiento"
msgctxt "odt:account.general_ledger:"
msgid "Name"
@@ -3399,7 +3478,7 @@ msgstr "Confirmado"
msgctxt "odt:account.move.general_journal:"
msgid "Print Date:"
-msgstr "Fecha impresión:"
+msgstr "Fecha de impresión:"
msgctxt "odt:account.move.general_journal:"
msgid "To Date:"
@@ -3778,6 +3857,10 @@ msgid "Accounts"
msgstr "Cuentas"
msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Cierres"
@@ -3925,10 +4008,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Abrir diario"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Abrir apuntes conciliados"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Imprimir libro diario"
@@ -4001,6 +4080,14 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Imprimir balance de sumas y saldos"
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Importe"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Abrir plan de códigos de impuesto"
@@ -4209,14 +4296,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Abrir"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Abrir"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Cancelar"
@@ -4289,6 +4368,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Imprimir"
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr "Saltar"
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Conciliar"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Cancelar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index ecda216..9881551 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -13,7 +13,7 @@ msgstr "Vous ne pouvez pas modifier les enregistrements de report de compte"
msgctxt "error:account.account:"
msgid "You can not delete account \"%s\" because it has move lines."
msgstr ""
-"Vous ne pouvez supprimer le compte \"%s\" car il contient des lignes de "
+"Vous ne pouvez supprimer le compte « %s » car il contient des lignes de "
"mouvement."
msgctxt "error:account.account:"
@@ -23,33 +23,33 @@ msgstr "Vous ne pouvez supprimer un compte qui a des enfants."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" have the same post move sequence."
msgstr ""
-"Les années fiscale \"%(first)s\" et \"%(second)s\" ont la même séquence de "
+"Les années fiscale « %(first)s » et « %(second)s » ont la même séquence de "
"mouvement."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" overlap."
-msgstr "Les années fiscales \"%(first)s\" et \"%(second)s\" se chevauchent."
+msgstr "Les années fiscales « %(first)s » et « %(second)s » se chevauchent."
msgctxt "error:account.fiscalyear:"
msgid "No fiscal year defined for \"%s\"."
-msgstr "Aucune année fiscale n'est définiée pour \"%s\"."
+msgstr "Aucune année fiscale n'est définiée pour « %s »."
msgctxt "error:account.fiscalyear:"
msgid "The balance of the account \"%s\" must be zero."
-msgstr "La balance du compte \"%s\" doit être zéro."
+msgstr "La balance du compte « %s » doit être zéro."
msgctxt "error:account.fiscalyear:"
msgid "You can not change the post move sequence in fiscal year \"%s\"."
msgstr ""
-"Vous ne pouvez changer la séquence des mouvement postés pour l'année fiscale"
-" \"%s\"."
+"Vous ne pouvez changer la séquence des mouvements postés pour l'année "
+"fiscale « %s »."
msgctxt "error:account.fiscalyear:"
msgid ""
"You can not close fiscal year \"%s\" until you close all previous fiscal "
"years."
msgstr ""
-"Vous ne pouvez clôturer l'année fiscale \"%s\" tant que les années "
+"Vous ne pouvez clôturer l'année fiscale « %s » tant que les années "
"antérieures ne sont pas clôturées."
msgctxt "error:account.fiscalyear:"
@@ -57,19 +57,19 @@ msgid ""
"You can not reopen fiscal year \"%s\" until you reopen all later fiscal "
"years."
msgstr ""
-"Vous ne pouvez ré-ouvir l'année fiscale \"%s\" tant que les année fiscale "
+"Vous ne pouvez ré-ouvir l'année fiscale « %s » tant que les année fiscale "
"suivantes ne sont pas ré-ouvertes."
msgctxt "error:account.journal.period:"
msgid "You can not create a journal - period on closed period \"%s\"."
msgstr ""
-"Vous ne pouvez créer une relation journal - période sur la période fermée "
-"\"%s\"."
+"Vous ne pouvez créer une relation journal - période sur la période clôturée "
+"« %s »."
msgctxt "error:account.journal.period:"
msgid "You can not modify/delete journal - period \"%s\" because it has moves."
msgstr ""
-"Vous ne pouvez modifier ou supprimer le Journal-période \"%s\" car il "
+"Vous ne pouvez modifier ou supprimer le Journal-période « %s » car il "
"contient des mouvements."
msgctxt "error:account.journal.period:"
@@ -77,8 +77,8 @@ msgid ""
"You can not open journal - period \"%(journal_period)s\" because period "
"\"%(period)s\" is closed."
msgstr ""
-"Vous ne pouvez ouvrir la relation journal - période \"%(journal_period)s\" "
-"car la période \"%(period)s\" est fermée."
+"Vous ne pouvez ouvrir la relation journal - période « %(journal_period)s » "
+"car la période « %(period)s » est clôturée."
msgctxt "error:account.journal.period:"
msgid "You can only open one journal per period."
@@ -90,7 +90,7 @@ 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."
+msgstr "La ligne « %s » (%d) est déjà réconciliée."
msgctxt "error:account.move.line:"
msgid "Move line cannot be created because there is no journal defined."
@@ -99,6 +99,14 @@ msgstr ""
"défini."
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr "Un tiers est requis sur la ligne « %s »"
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr "Un tiers ne doit pas être mis sur la ligne « %s »"
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr "Valeurs de débit/crédit incorrectes."
@@ -106,30 +114,30 @@ msgctxt "error:account.move.line:"
msgid "You can not add/modify lines in closed journal period \"%s\"."
msgstr ""
"Vous ne pouvez ajouter ou modifier des lignes dans la période de journal "
-"fermée \"%s\"."
+"clôturée « %s »."
msgctxt "error:account.move.line:"
msgid ""
"You can not create a move line with account \"%s\" because it is a view "
"account."
msgstr ""
-"Vous ne pouvez pas créer une ligne de mouvement avec le compte \"%s\" car "
+"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"
+"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."
+msgstr "Vous ne pouvez modifier la ligne « %s » car elle est réconciliée."
msgctxt "error:account.move.line:"
msgid "You can not modify lines of move \"%s\" because it is already posted."
msgstr ""
-"Vous ne pouvez modifier les lignes du mouvement \"%s\" car il est déjà "
+"Vous ne pouvez modifier les lignes du mouvement « %s » car il est déjà "
"posté."
msgctxt "error:account.move.reconciliation:"
@@ -137,8 +145,8 @@ msgid ""
"You can not create a reconciliation where debit \"%(debit)s\" and credit "
"\"%(credit)s\" differ."
msgstr ""
-"Vous ne pouvez créer une réconciliation où le débit \"%(debit)s\" et le "
-"crédit \"%(credit)s\" diffèrent."
+"Vous ne pouvez créer une réconciliation où le débit « %(debit)s » et le "
+"crédit « %(credit)s » diffèrent."
msgctxt "error:account.move.reconciliation:"
msgid "You can not modify a reconciliation."
@@ -149,70 +157,78 @@ msgid ""
"You can not reconcile line \"%(line)s\" because it's 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 it's account "
"\"%(account1)s\" is different from \"%(account2)s\"."
msgstr ""
-"Vous ne pouvez réconcilier la ligne \"%(line)s\" car son compte "
-"\"%(account1)s\" est différent de \"%(account2)s\"."
+"Vous ne pouvez 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 it's party \"%(party1)s\" is"
" different from %(party2)s\"."
msgstr ""
-"Vous ne pouvez réconcilier la ligne \"%(line)s\" car son tier "
-"\"%(party1)s\" est différent de %(party2)s\"."
+"Vous ne pouvez 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."
msgstr ""
-"Vous ne pouvez réconcilier la ligne \"%s\" car elle n'est pas dans un état "
+"Vous ne pouvez réconcilier la ligne « %s » car elle n'est pas dans un état "
"valide."
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+"La période du mouvement « %s » est cloturée.\n"
+"Utiliser la période courante ?"
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
"Vous ne pouvez créer des lignes sur des comptes de différentes sociétés dans"
-" le mouvement \"%s\"."
+" le mouvement « %s »."
msgctxt "error:account.move:"
msgid ""
"You can not create move \"%(move)s\" because it's date is outside its "
"period."
msgstr ""
-"Vous ne pouvez créer le mouvement \"%s\" car sa date est en dehors de sa "
-"période"
+"Vous ne pouvez créer le mouvement « %s » car sa date est en dehors de sa "
+"période."
msgctxt "error:account.move:"
msgid "You can not modify move \"%s\" because it is already posted."
-msgstr "Vous ne pouvez modifier le mouvement \"%s\" car il est déjà posté."
+msgstr "Vous ne pouvez modifier le mouvement « %s » car il est déjà posté."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is an unbalanced."
-msgstr "Vous ne pouvez poster le mouvement \"%s\" car il n'est pas balancé."
+msgstr "Vous ne pouvez poster le mouvement « %s » car il n'est pas balancé."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is empty."
-msgstr "Vous ne pouvez poster le mouvement \"%s\" car il est vide."
+msgstr "Vous ne pouvez poster le mouvement « %s » car il est vide."
msgctxt "error:account.move:"
msgid "You can not set posted move \"%(move)s\" to draft in journal \"%(journal)s\"."
msgstr ""
-"Vous ne pouvez remettre en brouillon le mouvement posté \"%(move)s\" dans le"
-" journal \"%(journal)s\"."
+"Vous ne pouvez remettre en brouillon le mouvement posté « %(move)s » dans le"
+" journal « %(journal)s »."
msgctxt "error:account.move:"
msgid ""
"You can not set to draft move \"%(move)s\" because period \"%(period)s\" is "
"closed."
msgstr ""
-"Vous ne pouvez passer en brouillon le mouvement \"%(move)s\" car la période "
-"\"%(period)s\" est fermée."
+"Vous ne pouvez passer en brouillon le mouvement « %(move)s » car la période "
+"« %(period)s » est clôturée."
msgctxt "error:account.open_aged_balance:"
msgid "Warning"
@@ -224,56 +240,56 @@ msgstr "Vous ne pouvez créer des termes qui se chevauchent"
msgctxt "error:account.period:"
msgid "\"%(first)s\" and \"%(second)s\" periods overlap."
-msgstr "Les périodes \"%(first)s\" et \"%(second)s\" se chevauchent."
+msgstr "Les périodes « %(first)s » et « %(second)s » se chevauchent."
msgctxt "error:account.period:"
msgid ""
"Company of sequence \"%(sequence)s\" does not match the company of period "
"\"%(period)s\" to which it is assigned to."
msgstr ""
-"La société de la séquence \"%(sequence)s\" ne correspond à la société de la "
-"période \"%(period)s\" à laquelle elle est assignée."
+"La société de la séquence « %(sequence)s » ne correspond à la société de la "
+"période « %(period)s » à laquelle elle est assignée."
msgctxt "error:account.period:"
msgid "Dates of period \"%s\" are outside are outside it's fiscal year dates."
msgstr ""
-"Les dates de la période \"%s\" sont en dehors des dates de son année "
+"Les dates de la période « %s » sont en dehors des dates de son année "
"fiscale."
msgctxt "error:account.period:"
msgid "No period defined for date \"%s\"."
-msgstr "Pas de période de définie pour la date \"%s\"."
+msgstr "Pas de période de définie pour la date « %s »."
msgctxt "error:account.period:"
msgid "Period \"%(first)s\" and \"%(second)s\" have the same sequence."
-msgstr "les pédiodes \"%(first)s\" et \"%(second)s\" ont la même séquence."
+msgstr "les pédiodes « %(first)s » et « %(second)s » ont la même séquence."
msgctxt "error:account.period:"
msgid ""
"You can not change the post move sequence of period \"%s\" because there are"
" already posted moves in the period."
msgstr ""
-"Vous ne pouvez changer la séquence des mouvements posté de la période \"%s\""
+"Vous ne pouvez changer la séquence des mouvements posté de la période « %s »"
" car elle contient déjà des mouvements postés."
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
-"Vous ne pouvez fermer la période \"%s\" car elle contient des mouvements non"
-" postés."
+"Vous ne pouvez pas clôturer la period « %(period)s » car il y a des "
+"mouvements non-postés « %(move)s » dans celle-ci."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
msgstr ""
-"Vous ne pouvez créer une période sur l'année fiscale \"%s\" car elle est "
+"Vous ne pouvez créer une période sur l'année fiscale « %s » car elle est "
"clôturée."
msgctxt "error:account.period:"
msgid "You can not modify/delete period \"%s\" because it has moves."
msgstr ""
-"Vous ne pouvez modifier ou supprimez la période \"%s\" car elle contient des"
+"Vous ne pouvez modifier ou supprimez la période « %s » car elle contient des"
" mouvements."
msgctxt "error:account.period:"
@@ -281,8 +297,8 @@ 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 "field:account.account,active:"
msgid "Active"
@@ -360,6 +376,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Parent"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr "Tiers requis"
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Nom"
@@ -512,6 +532,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Parent"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr "Tiers requis"
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Nom"
@@ -1228,6 +1252,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Tiers"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr "Tiers requis"
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Période"
@@ -1276,14 +1304,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Période"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Compte"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Société"
@@ -1360,10 +1380,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Type"
@@ -1580,6 +1596,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Période de début"
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Compte"
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Compte"
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Date"
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Description"
+
+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"
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Tiers"
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Tiers"
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Pertes et profits"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Actif"
@@ -2264,7 +2324,7 @@ msgid ""
"for journal types: \"expense\" and \"revenue\""
msgstr ""
"Taxe par défaut pour les lignes de mouvement manuelles\n"
-"pour le type de journal: \"charge\" et \"produit\""
+"pour le type de journal: « charge » et « produit »"
msgctxt "help:account.account.type,sequence:"
msgid "Use to order the account type"
@@ -2632,10 +2692,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Ouvrir le journal - Demande"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Ouvrir les lignes à réconcilier"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Imprimer le journal général"
@@ -2648,10 +2704,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Lignes de reconciliation de mouvement comptable"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Lignes non réconciliées"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Ouvrir la balance âgée"
@@ -2684,6 +2736,10 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Imprimer la balance"
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Réconcilier"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Compte de taxe"
@@ -2736,6 +2792,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr "Mise à jour d'un plan"
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr "Lignes à payer"
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Bilan"
@@ -2780,6 +2840,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr "Équilibrer les non-reports"
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr "Annuler les mouvements"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Clôturer une année fiscale"
@@ -2802,7 +2866,7 @@ msgstr "Journaux"
msgctxt "model:ir.action,name:act_journal_period_close"
msgid "Close Journals - Periods"
-msgstr "Fermer Journaux - périodes"
+msgstr "Clôturer les journaux - périodes"
msgctxt "model:ir.action,name:act_journal_period_form"
msgid "Journals - Periods"
@@ -2836,13 +2900,9 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Lignes de mouvement comptable"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Lignes à payer"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Lignes à recevoir"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr "Lignes à payer / à recevoir"
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
@@ -2860,10 +2920,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Ouvrir journal"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Ouvrir les lignes à réconcilier"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Ouvrir le code de taxe"
@@ -2874,7 +2930,7 @@ msgstr "Ouvrir les types"
msgctxt "model:ir.action,name:act_period_close"
msgid "Close Periods"
-msgstr "Clôturer Périodes"
+msgstr "Clôturer les périodes"
msgctxt "model:ir.action,name:act_period_form"
msgid "Periods"
@@ -2888,9 +2944,13 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Réouvrir les périodes"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Reconcilier les comptes"
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
-msgstr "Lignes réconciliées"
+msgstr "Réconcilier les lignes"
msgctxt "model:ir.action,name:act_tax_code_list"
msgid "Tax Codes"
@@ -2938,7 +2998,7 @@ msgstr "Taxes"
msgctxt "model:ir.action,name:act_unreconcile_lines"
msgid "Unreconcile Lines"
-msgstr "Lignes non réconciliées"
+msgstr "Dé-réconcilier les lignes"
msgctxt "model:ir.action,name:report_aged_balance"
msgid "Aged Balance"
@@ -2996,6 +3056,21 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Mise à jour d'un plan comptable depuis un modèle"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Toutes"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "À payer"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "À recevoir"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Journal de compte par défaut"
@@ -3017,6 +3092,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Réconciliation de mouvements comptables"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Réconcilier les lignes"
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr "Financier"
@@ -3099,7 +3178,7 @@ msgstr "Journaux"
msgctxt "model:ir.ui.menu,name:menu_journal_period_form"
msgid "Close Journals - Periods"
-msgstr "Fermer les journaux - périodes"
+msgstr "Clôturer les journaux - périodes"
msgctxt "model:ir.ui.menu,name:menu_journal_period_tree"
msgid "Journals - Periods"
@@ -3137,10 +3216,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Ouvrir les journaux"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Réconcilier les lignes"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Périodes"
@@ -3165,6 +3240,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Traitement"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Reconcilier les comptes"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Rapports"
@@ -3247,7 +3326,7 @@ msgstr "Balance âgée des fournisseurs et clients"
msgctxt "odt:account.aged_balance:"
msgid "Company:"
-msgstr "Société :"
+msgstr "Société :"
msgctxt "odt:account.aged_balance:"
msgid "Day"
@@ -3271,7 +3350,7 @@ msgstr "Tiers"
msgctxt "odt:account.aged_balance:"
msgid "Print Date:"
-msgstr "Date d'impression :"
+msgstr "Date d'impression :"
msgctxt "odt:account.aged_balance:"
msgid "Total"
@@ -3279,7 +3358,7 @@ msgstr "Total"
msgctxt "odt:account.aged_balance:"
msgid "User:"
-msgstr "Utilisateur :"
+msgstr "Utilisateur :"
msgctxt "odt:account.aged_balance:"
msgid "at"
@@ -3299,7 +3378,7 @@ msgstr "Code"
msgctxt "odt:account.general_ledger:"
msgid "Company:"
-msgstr "Société :"
+msgstr "Société :"
msgctxt "odt:account.general_ledger:"
msgid "Credit"
@@ -3319,7 +3398,7 @@ msgstr "Descr."
msgctxt "odt:account.general_ledger:"
msgid "From Period:"
-msgstr "Période de début :"
+msgstr "Période de début :"
msgctxt "odt:account.general_ledger:"
msgid "General Ledger"
@@ -3339,7 +3418,7 @@ msgstr "Origine"
msgctxt "odt:account.general_ledger:"
msgid "Print Date:"
-msgstr "Date d'impression :"
+msgstr "Date d'impression :"
msgctxt "odt:account.general_ledger:"
msgid "State"
@@ -3347,7 +3426,7 @@ msgstr "État"
msgctxt "odt:account.general_ledger:"
msgid "To Period:"
-msgstr "Période de fin :"
+msgstr "Période de fin :"
msgctxt "odt:account.general_ledger:"
msgid "Total"
@@ -3355,7 +3434,7 @@ msgstr "Total"
msgctxt "odt:account.general_ledger:"
msgid "User:"
-msgstr "Utilisateur :"
+msgstr "Utilisateur :"
msgctxt "odt:account.general_ledger:"
msgid "at"
@@ -3371,7 +3450,7 @@ msgstr "Compte"
msgctxt "odt:account.move.general_journal:"
msgid "Company:"
-msgstr "Société :"
+msgstr "Société :"
msgctxt "odt:account.move.general_journal:"
msgid "Credit"
@@ -3379,7 +3458,7 @@ msgstr "Crédit"
msgctxt "odt:account.move.general_journal:"
msgid "Date:"
-msgstr "Date :"
+msgstr "Date :"
msgctxt "odt:account.move.general_journal:"
msgid "Debit"
@@ -3395,7 +3474,7 @@ msgstr "Brouillon"
msgctxt "odt:account.move.general_journal:"
msgid "From Date:"
-msgstr "De la Date :"
+msgstr "De la date :"
msgctxt "odt:account.move.general_journal:"
msgid "General Journal"
@@ -3403,7 +3482,7 @@ msgstr "Journal général"
msgctxt "odt:account.move.general_journal:"
msgid "Journal Entry:"
-msgstr "Entrée journal :"
+msgstr "Entrée journal :"
msgctxt "odt:account.move.general_journal:"
msgid "Origin:"
@@ -3415,15 +3494,15 @@ msgstr "Posté"
msgctxt "odt:account.move.general_journal:"
msgid "Print Date:"
-msgstr "Date d'impression :"
+msgstr "Date d'impression :"
msgctxt "odt:account.move.general_journal:"
msgid "To Date:"
-msgstr "À la Date :"
+msgstr "À la Date :"
msgctxt "odt:account.move.general_journal:"
msgid "User:"
-msgstr "Utilisateur :"
+msgstr "Utilisateur :"
msgctxt "odt:account.move.general_journal:"
msgid "at"
@@ -3439,7 +3518,7 @@ msgstr "Balance"
msgctxt "odt:account.third_party_balance:"
msgid "Company:"
-msgstr "Société :"
+msgstr "Société :"
msgctxt "odt:account.third_party_balance:"
msgid "Credit"
@@ -3455,7 +3534,7 @@ msgstr "Tiers"
msgctxt "odt:account.third_party_balance:"
msgid "Print Date:"
-msgstr "Date d'impression :"
+msgstr "Date d'impression :"
msgctxt "odt:account.third_party_balance:"
msgid "Third Party Balance"
@@ -3467,7 +3546,7 @@ msgstr "Total"
msgctxt "odt:account.third_party_balance:"
msgid "User:"
-msgstr "Utilisateur :"
+msgstr "Utilisateur :"
msgctxt "odt:account.third_party_balance:"
msgid "at"
@@ -3483,7 +3562,7 @@ msgstr "Compte"
msgctxt "odt:account.trial_balance:"
msgid "Company:"
-msgstr "Société :"
+msgstr "Société :"
msgctxt "odt:account.trial_balance:"
msgid "Credit"
@@ -3499,11 +3578,11 @@ msgstr "Balance finale"
msgctxt "odt:account.trial_balance:"
msgid "From Period:"
-msgstr "Période de début :"
+msgstr "Période de début :"
msgctxt "odt:account.trial_balance:"
msgid "Print Date:"
-msgstr "Date d'impression :"
+msgstr "Date d'impression :"
msgctxt "odt:account.trial_balance:"
msgid "Start Balance"
@@ -3511,7 +3590,7 @@ msgstr "Balace de départ"
msgctxt "odt:account.trial_balance:"
msgid "To Period:"
-msgstr "Période de fin :"
+msgstr "Période de fin :"
msgctxt "odt:account.trial_balance:"
msgid "Total"
@@ -3523,7 +3602,7 @@ msgstr "Balance"
msgctxt "odt:account.trial_balance:"
msgid "User:"
-msgstr "Utilisateur :"
+msgstr "Utilisateur :"
msgctxt "odt:account.trial_balance:"
msgid "at"
@@ -3794,6 +3873,10 @@ msgid "Accounts"
msgstr "Comptes"
msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Enfants"
+
+msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Reports"
@@ -3839,7 +3922,7 @@ msgstr "Clôturer une année fiscale"
msgctxt "view:account.fiscalyear:"
msgid "Are you sure to close fiscal year?"
-msgstr "Êtes-vous sûr de clôturer l'année fiscale ?"
+msgstr "Êtes-vous sûr de clôturer l'année fiscale ?"
msgctxt "view:account.fiscalyear:"
msgid "Close Fiscal Year"
@@ -3941,10 +4024,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Ouvrir journal"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Ouvrir les lignes à réconcilier"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Imprimer le journal général"
@@ -4017,6 +4096,14 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Imprimer la balance"
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Réconcilier"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Ouvrir le plan de taxes"
@@ -4167,7 +4254,7 @@ msgstr "Mise à jour d'un plan comptable"
msgctxt "view:account.update_chart.succeed:"
msgid "Update Chart of Accounts Succeed!"
-msgstr "Mise à jour du plan comptable réussie !"
+msgstr "Mise à jour du plan comptable réussie !"
msgctxt "view:party.party:"
msgid "Account"
@@ -4211,7 +4298,7 @@ msgstr "Annuler"
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
-msgstr "Fermer"
+msgstr "Clôturer"
msgctxt "wizard_button:account.fiscalyear.close,start,end:"
msgid "Cancel"
@@ -4225,14 +4312,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Ouvrir"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Annuler"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Ouvrir"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Annuler"
@@ -4305,6 +4384,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Imprimer"
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr "Sauter"
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Réconcilier"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Annuler"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 8f13a8f..092c04d 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -81,6 +81,14 @@ msgid "Move line cannot be created because there is no journal defined."
msgstr ""
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr ""
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr ""
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr ""
@@ -139,6 +147,12 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr ""
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
@@ -209,8 +223,8 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
msgctxt "error:account.period:"
@@ -303,6 +317,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Bovenliggend niveau"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Naam"
@@ -457,6 +475,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Bovenliggend niveau"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Naam"
@@ -1183,6 +1205,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Relatie"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Periode"
@@ -1232,15 +1258,6 @@ msgid "Period"
msgstr "Periode"
#, fuzzy
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Rekeningen"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr ""
-
-#, fuzzy
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Bedrijf"
@@ -1322,10 +1339,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr ""
-
#, fuzzy
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
@@ -1557,6 +1570,60 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr ""
+#, fuzzy
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Rekeningen"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Rekeningen"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Vervaldatum"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Specificatie"
+
+msgctxt "field:account.reconcile.show,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,journal:"
+msgid "Journal"
+msgstr "Dagboek"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,lines:"
+msgid "Lines"
+msgstr "Transacties"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Relaties"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Relaties"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Afschrijven"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Actief"
@@ -2621,11 +2688,6 @@ msgid "Open Journal Ask"
msgstr "Open dagboek vragen"
#, fuzzy
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Open afletteren"
-
-#, fuzzy
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Algemeen dagboek afdrukken"
@@ -2639,11 +2701,6 @@ msgid "Account Move Reconciliation Lines"
msgstr "Afletterregels"
#, fuzzy
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Afletteren ongedaan maken"
-
-#, fuzzy
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Ouderdomsanalyse openen"
@@ -2680,6 +2737,11 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Proefbalans afdrukken"
+#, fuzzy
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Afletteren"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Rekening belastingen"
@@ -2732,6 +2794,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr ""
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr ""
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Balansoverzicht"
@@ -2779,6 +2845,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr ""
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr ""
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Sluit boekjaar"
@@ -2836,12 +2906,8 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Boekingsregels"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
msgstr ""
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
@@ -2860,10 +2926,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Open dagboek"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Open afletteren"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Open belastingcode"
@@ -2889,6 +2951,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr ""
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr ""
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Boekingen afletteren"
@@ -3000,6 +3066,23 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr ""
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr ""
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "Te betalen"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "Te ontvangen"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Standaard rekeningdagboek"
@@ -3021,6 +3104,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Afletteren"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Boekingen afletteren"
+
#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
@@ -3144,10 +3231,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Open dagboek"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Boekingen afletteren"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Perioden"
@@ -3173,6 +3256,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Verwerking"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Rapportage"
@@ -3858,6 +3945,11 @@ msgctxt "view:account.account:"
msgid "Accounts"
msgstr "Rekeningen"
+#, fuzzy
+msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Onderliggende niveaus"
+
msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Historie"
@@ -4009,11 +4101,6 @@ msgid "Open Journal"
msgstr "Open dagboek"
#, fuzzy
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Open afletteren"
-
-#, fuzzy
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Algemeen dagboek afdrukken"
@@ -4091,6 +4178,16 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Proefbalans afdrukken"
+#, fuzzy
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Bedrag"
+
+#, fuzzy
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Afletteren"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr ""
@@ -4309,16 +4406,6 @@ msgid "Open"
msgstr "Open"
#, fuzzy
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Annuleren"
-
-#, fuzzy
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Open"
-
-#, fuzzy
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Annuleren"
@@ -4402,6 +4489,20 @@ msgid "Print"
msgstr ""
#, fuzzy
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Afletteren"
+
+#, fuzzy
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Annuleren"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 4592996..7d3451e 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -93,6 +93,14 @@ msgstr ""
"журнала."
msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr ""
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr ""
+
+msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
msgstr "Некорректные значения кредит/дебет."
@@ -161,6 +169,12 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "Вы не можете сверить строку \"%s\" так как она в ошибочном состоянии."
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
"Вы не можете создать строки для счетов разных организаций в проводке \"%s\"."
@@ -239,11 +253,9 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
msgstr ""
-"Вы не можете закрыть период \"%s\" так как в нём есть не отправленные "
-"проводки."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
@@ -338,6 +350,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Предок"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Наименование"
@@ -491,6 +507,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Предок"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Наименование"
@@ -1211,6 +1231,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Контрагент"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr ""
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Период"
@@ -1259,14 +1283,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Период"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Счет"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Организация"
@@ -1346,10 +1362,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Тип"
@@ -1567,6 +1579,61 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Начальный период"
+#, fuzzy
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Счет"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Счет"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Кол-во цифр валюты"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Дата"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Описание"
+
+#, fuzzy
+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"
+msgstr "Строки"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Контрагенты"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Организации"
+
+#, fuzzy
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Списание"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Действующий"
@@ -2625,10 +2692,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Открыть журнал запросов"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Открыть строки сверки"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Распечатать основной журнал"
@@ -2641,10 +2704,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Строчки сверки проводок"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Несверенные строки"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Открыть сальдовый отчет"
@@ -2677,6 +2736,11 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Распечатать проверочный баланс"
+#, fuzzy
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Сверка"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Налоги счета"
@@ -2729,6 +2793,10 @@ msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
msgstr "Обновить схему"
+msgctxt "model:ir.action,name:"
+msgid "Payable Lines"
+msgstr "Строки оплаты"
+
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
msgstr "Балансовый отчет"
@@ -2773,6 +2841,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr ""
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr ""
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Закрыть финансовый год"
@@ -2829,13 +2901,9 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Строчки проводки"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Строки оплаты"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Строки получения"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr ""
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
@@ -2853,10 +2921,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Открыть журнал"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Открыть строки сверки"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Открыть код налога"
@@ -2881,6 +2945,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Открыть заново Периоды"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr ""
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Строки сверки"
@@ -2989,6 +3057,24 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Обновить схему счетов из шаблона"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Все"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "Подлежащий уплате"
+
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "Подлежащий получению"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Журнал счета по умолчанию"
@@ -3010,6 +3096,10 @@ msgctxt ""
msgid "Account Move Reconciliation"
msgstr "Сверка проводок"
+msgctxt "model:ir.ui.menu,name:"
+msgid "Reconcile Lines"
+msgstr "Строки сверки"
+
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
msgstr "Бухгалтерия"
@@ -3130,10 +3220,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Открыть журнал"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Строки сверки"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Периоды"
@@ -3158,6 +3244,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Обслуживание"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Отчетность"
@@ -3786,6 +3876,11 @@ msgctxt "view:account.account:"
msgid "Accounts"
msgstr "Счета"
+#, fuzzy
+msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Подчиненый"
+
msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Отсрочки"
@@ -3934,10 +4029,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Открыть журнал"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Открыть строки сверки"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Распечатать основной журнал"
@@ -4010,6 +4101,16 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Распечатать проверочный баланс"
+#, fuzzy
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Сумма"
+
+#, fuzzy
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Сверка"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Открыть схему кодов налогов"
@@ -4220,14 +4321,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Открыть"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Отменить"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Открыть"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Отменить"
@@ -4300,6 +4393,20 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Печать"
+#, fuzzy
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Отменить"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Сверка"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Отменить"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index e1a1884..17cfbf8 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -56,7 +56,7 @@ msgstr ""
msgctxt "error:account.journal.period:"
msgid "You can not create a journal - period on closed period \"%s\"."
-msgstr "Dnevnika za zaključeno obdobje \"%s\" ni možno ustvarjati."
+msgstr "Dnevnika za zaključeno obdobje \"%s\" ni možno izdelati."
msgctxt "error:account.journal.period:"
msgid "You can not modify/delete journal - period \"%s\" because it has moves."
@@ -86,7 +86,15 @@ msgstr "Postavka \"%s\" (%d) je že usklajena."
msgctxt "error:account.move.line:"
msgid "Move line cannot be created because there is no journal defined."
-msgstr "Knjižba ni možno ustvariti zaradi neobstoječega dnevnika."
+msgstr "Knjižbe ni možno izdelati zaradi neobstoječega dnevnika."
+
+msgctxt "error:account.move.line:"
+msgid "Party is required on line \"%s\""
+msgstr "Partner obvezen na postavki \"%s\""
+
+msgctxt "error:account.move.line:"
+msgid "Party must not be set on line \"%s\""
+msgstr "Partner ne sme biti na postavki \"%s\""
msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
@@ -102,11 +110,11 @@ msgctxt "error:account.move.line:"
msgid ""
"You can not create a move line with account \"%s\" because it is a view "
"account."
-msgstr "Knjižbe na konto \"%s\" ni možno ustvariti, ker je konto samo za vpogled."
+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 ustvariti, ker je neaktiven."
+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."
@@ -121,8 +129,8 @@ msgid ""
"You can not create a reconciliation where debit \"%(debit)s\" and credit "
"\"%(credit)s\" differ."
msgstr ""
-"Uskladitev, kjer se debet \"%(debit)s\" in kredit \"%(credit)s\" "
-"razlikujeta, ni možno ustvarjati."
+"Uskladitve, kjer se debet \"%(debit)s\" in kredit \"%(credit)s\" "
+"razlikujeta, ni možno izdelati."
msgctxt "error:account.move.reconciliation:"
msgid "You can not modify a reconciliation."
@@ -157,16 +165,23 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "Postavke \"%s\" ni možno uskladiti zaradi neveljavnega stanja."
msgctxt "error:account.move:"
+msgid ""
+"The period of move \"%s\" is closed.\n"
+"Use the current period?"
+msgstr ""
+"Obdobje knjižbe \"%s\" je zaključeno.\n"
+"Vzamem trenutno obdobje?"
+
+msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
-msgstr "Postavk na kontih različnih družb v knjižbi \"%s\" ni možno ustvarjati."
+msgstr "Postavk na kontih različnih družb v knjižbi \"%s\" ni možno izdelati."
msgctxt "error:account.move:"
msgid ""
"You can not create move \"%(move)s\" because it's date is outside its "
"period."
msgstr ""
-"Postavke \"%(move)s\" ni možno ustvarjati zaradi njenega datuma izven "
-"obdobja."
+"Postavke \"%(move)s\" ni možno izdelati zaradi njenega datuma izven obdobja."
msgctxt "error:account.move:"
msgid "You can not modify move \"%s\" because it is already posted."
@@ -235,13 +250,15 @@ msgstr ""
msgctxt "error:account.period:"
msgid ""
-"You can not close period \"%s\" because there are non posted moves in this "
-"period."
-msgstr "Obdobja \"%s\" ni možno zaključiti zaradi obstoječih neknjiženih postavk."
+"You can not close period \"%(period)s\" because there are non posted moves "
+"\"%(move)s\" in this period."
+msgstr ""
+"Obdobja \"%(period)s\" ni možno zaključiti, ker v tem obdobju obstajajo "
+"neknjižene postavke \"%(move)s\"."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
-msgstr "Obdobja na zaključenem poslovnem letu \"%s\" ni možno ustvarjati."
+msgstr "Obdobja na zaključenem poslovnem letu \"%s\" ni možno izdelati."
msgctxt "error:account.period:"
msgid "You can not modify/delete period \"%s\" because it has moves."
@@ -277,11 +294,11 @@ msgstr "Družba"
msgctxt "field:account.account,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.account,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.account,credit:"
msgid "Credit"
@@ -331,6 +348,10 @@ msgctxt "field:account.account,parent:"
msgid "Parent"
msgstr "Matični konto"
+msgctxt "field:account.account,party_required:"
+msgid "Party Required"
+msgstr "Partner obvezen"
+
msgctxt "field:account.account,rec_name:"
msgid "Name"
msgstr "Ime"
@@ -373,11 +394,11 @@ msgstr "Konto"
msgctxt "field:account.account-account.tax,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.account-account.tax,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.account-account.tax,id:"
msgid "ID"
@@ -409,11 +430,11 @@ msgstr "Bilanca"
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.account.deferral,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.account.deferral,credit:"
msgid "Credit"
@@ -457,11 +478,11 @@ msgstr "Šifra"
msgctxt "field:account.account.template,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.account.template,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.account.template,deferral:"
msgid "Deferral"
@@ -483,6 +504,10 @@ msgctxt "field:account.account.template,parent:"
msgid "Parent"
msgstr "Matični konto"
+msgctxt "field:account.account.template,party_required:"
+msgid "Party Required"
+msgstr "Partner obvezen"
+
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
msgstr "Ime"
@@ -513,11 +538,11 @@ msgstr "Predloga konta"
msgctxt "field:account.account.template-account.tax.template,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.account.template-account.tax.template,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.account.template-account.tax.template,id:"
msgid "ID"
@@ -557,11 +582,11 @@ msgstr "Družba"
msgctxt "field:account.account.type,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.account.type,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.account.type,currency_digits:"
msgid "Currency Digits"
@@ -617,11 +642,11 @@ msgstr "Podtipi"
msgctxt "field:account.account.type.template,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.account.type.template,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.account.type.template,display_balance:"
msgid "Display Balance"
@@ -661,11 +686,11 @@ msgstr "Zapisal"
msgctxt "field:account.configuration,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.configuration,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.configuration,default_account_payable:"
msgid "Default Account Payable"
@@ -737,11 +762,11 @@ msgstr "Družba"
msgctxt "field:account.fiscalyear,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.fiscalyear,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.fiscalyear,end_date:"
msgid "Ending Date"
@@ -785,11 +810,11 @@ msgstr "Zapisal"
msgctxt "field:account.fiscalyear-account.move.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.fiscalyear-account.move.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.fiscalyear-account.move.line,fiscalyear:"
msgid "Fiscal Year"
@@ -857,11 +882,11 @@ msgstr "Šifra"
msgctxt "field:account.journal,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.journal,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.journal,credit_account:"
msgid "Default Credit Account"
@@ -913,11 +938,11 @@ msgstr "Aktivno"
msgctxt "field:account.journal.period,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.journal.period,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.journal.period,icon:"
msgid "Icon"
@@ -961,11 +986,11 @@ msgstr "Šifra"
msgctxt "field:account.journal.type,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.journal.type,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.journal.type,id:"
msgid "ID"
@@ -993,11 +1018,11 @@ msgstr "Stolpci"
msgctxt "field:account.journal.view,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.journal.view,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.journal.view,id:"
msgid "ID"
@@ -1021,11 +1046,11 @@ msgstr "Zapisal"
msgctxt "field:account.journal.view.column,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.journal.view.column,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.journal.view.column,field:"
msgid "Field"
@@ -1069,11 +1094,11 @@ msgstr "Zapisal"
msgctxt "field:account.move,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.move,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.move,date:"
msgid "Effective Date"
@@ -1141,11 +1166,11 @@ msgstr "Znesek v drugi valuti"
msgctxt "field:account.move.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.move.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.move.line,credit:"
msgid "Credit"
@@ -1199,6 +1224,10 @@ msgctxt "field:account.move.line,party:"
msgid "Party"
msgstr "Partner"
+msgctxt "field:account.move.line,party_required:"
+msgid "Party Required"
+msgstr "Partner obvezen"
+
msgctxt "field:account.move.line,period:"
msgid "Period"
msgstr "Obdobje"
@@ -1247,14 +1276,6 @@ msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
msgstr "Obdobje"
-msgctxt "field:account.move.open_reconcile_lines.start,account:"
-msgid "Account"
-msgstr "Konto"
-
-msgctxt "field:account.move.open_reconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
msgstr "Družba"
@@ -1301,11 +1322,11 @@ msgstr "Dnevnik"
msgctxt "field:account.move.reconciliation,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.move.reconciliation,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.move.reconciliation,id:"
msgid "ID"
@@ -1331,10 +1352,6 @@ msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
msgstr "Zapisal"
-msgctxt "field:account.move.unreconcile_lines.start,id:"
-msgid "ID"
-msgstr "ID"
-
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
msgstr "Tip"
@@ -1445,11 +1462,11 @@ msgstr "Družba"
msgctxt "field:account.period,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.period,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.period,end_date:"
msgid "Ending Date"
@@ -1551,6 +1568,50 @@ msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
msgstr "Od"
+msgctxt "field:account.reconcile.show,account:"
+msgid "Account"
+msgstr "Računovodstvo"
+
+msgctxt "field:account.reconcile.show,accounts:"
+msgid "Account"
+msgstr "Računovodstvo"
+
+msgctxt "field:account.reconcile.show,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimalke"
+
+msgctxt "field:account.reconcile.show,date:"
+msgid "Date"
+msgstr "Datum"
+
+msgctxt "field:account.reconcile.show,description:"
+msgid "Description"
+msgstr "Opis"
+
+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"
+
+msgctxt "field:account.reconcile.show,parties:"
+msgid "Parties"
+msgstr "Partnerji"
+
+msgctxt "field:account.reconcile.show,party:"
+msgid "Party"
+msgstr "Partner"
+
+msgctxt "field:account.reconcile.show,write_off:"
+msgid "Write-Off"
+msgstr "Odpis"
+
msgctxt "field:account.tax,active:"
msgid "Active"
msgstr "Aktivno"
@@ -1569,11 +1630,11 @@ msgstr "Družba"
msgctxt "field:account.tax,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax,credit_note_account:"
msgid "Credit Note Account"
@@ -1693,11 +1754,11 @@ msgstr "Družba"
msgctxt "field:account.tax.code,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.code,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.code,currency_digits:"
msgid "Currency Digits"
@@ -1769,11 +1830,11 @@ msgstr "Šifra"
msgctxt "field:account.tax.code.template,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.code.template,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.code.template,description:"
msgid "Description"
@@ -1809,11 +1870,11 @@ msgstr "Šifra"
msgctxt "field:account.tax.group,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.group,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.group,id:"
msgid "ID"
@@ -1849,11 +1910,11 @@ msgstr "Šifra"
msgctxt "field:account.tax.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.line,currency_digits:"
msgid "Currency Digits"
@@ -1889,11 +1950,11 @@ msgstr "Družba"
msgctxt "field:account.tax.rule,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.rule,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.rule,id:"
msgid "ID"
@@ -1929,11 +1990,11 @@ msgstr "Zapisal"
msgctxt "field:account.tax.rule.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.rule.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.rule.line,group:"
msgid "Tax Group"
@@ -1977,11 +2038,11 @@ msgstr "Zapisal"
msgctxt "field:account.tax.rule.line.template,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.rule.line.template,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.rule.line.template,group:"
msgid "Tax Group"
@@ -2025,11 +2086,11 @@ msgstr "Predloga konta"
msgctxt "field:account.tax.rule.template,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.rule.template,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.rule.template,id:"
msgid "ID"
@@ -2073,11 +2134,11 @@ msgstr "Poddavki"
msgctxt "field:account.tax.template,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:account.tax.template,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:account.tax.template,credit_note_account:"
msgid "Credit Note Account"
@@ -2501,15 +2562,15 @@ msgstr "Kontna konfiguracija"
msgctxt "model:account.create_chart.account,name:"
msgid "Create Chart"
-msgstr "Ustvari načrt"
+msgstr "Izdelava načrta"
msgctxt "model:account.create_chart.properties,name:"
msgid "Create Chart"
-msgstr "Ustvari načrt"
+msgstr "Izdelava načrta"
msgctxt "model:account.create_chart.start,name:"
msgid "Create Chart"
-msgstr "Ustvari načrt"
+msgstr "Izdelava načrta"
msgctxt "model:account.fiscalyear,name:"
msgid "Fiscal Year"
@@ -2599,10 +2660,6 @@ msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
msgstr "Odpri dnevnik"
-msgctxt "model:account.move.open_reconcile_lines.start,name:"
-msgid "Open Reconcile Lines"
-msgstr "Uskladitev postavk"
-
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
msgstr "Izpis glavnega dnevnika"
@@ -2615,10 +2672,6 @@ msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
msgstr "Usklajene postavke knjižbe"
-msgctxt "model:account.move.unreconcile_lines.start,name:"
-msgid "Unreconcile Lines"
-msgstr "Odpravi uskladitev postavk"
-
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
msgstr "Odpri bilanco zapadlih postavk"
@@ -2651,6 +2704,10 @@ msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
msgstr "Izpis bruto bilance"
+msgctxt "model:account.reconcile.show,name:"
+msgid "Reconcile"
+msgstr "Uskladitev"
+
msgctxt "model:account.tax,name:"
msgid "Account Tax"
msgstr "Davek"
@@ -2747,6 +2804,10 @@ msgctxt "model:ir.action,name:act_balance_non_deferral"
msgid "Balance Non-Deferral"
msgstr "Razknjižba neodložljivih kontov"
+msgctxt "model:ir.action,name:act_cancel_moves"
+msgid "Cancel Moves"
+msgstr "Preklic knjižb"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Zaključi poslovno leto"
@@ -2803,13 +2864,9 @@ msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
msgstr "Postavke knjižb"
-msgctxt "model:ir.action,name:act_move_line_payable"
-msgid "Payable Lines"
-msgstr "Postavke obveznosti"
-
-msgctxt "model:ir.action,name:act_move_line_receivable"
-msgid "Receivable Lines"
-msgstr "Postavke terjatev"
+msgctxt "model:ir.action,name:act_move_line_payable_receivable"
+msgid "Payable/Receivable Lines"
+msgstr "Postavke obveznosti/terjatev"
msgctxt "model:ir.action,name:act_move_reconciliation_lines"
msgid "Reconciliation Lines"
@@ -2827,10 +2884,6 @@ msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
msgstr "Odpri dnevnik"
-msgctxt "model:ir.action,name:act_open_reconcile_lines"
-msgid "Open Reconcile Lines"
-msgstr "Uskladitev postavk"
-
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
msgstr "Odpri davčno šifro"
@@ -2855,6 +2908,10 @@ msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
msgstr "Znova odpri obdobja"
+msgctxt "model:ir.action,name:act_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Usklajevanje kontov"
+
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
msgstr "Uskladi postavke"
@@ -2929,7 +2986,7 @@ msgstr "Bruto bilanca"
msgctxt "model:ir.action,name:wizard_create_chart"
msgid "Create Chart of Accounts from Template"
-msgstr "Ustvari kontni načrt iz predloge"
+msgstr "Izdelava kontnega načrta iz predloge"
msgctxt "model:ir.action,name:wizard_open_aged_balance"
msgid "Open Aged Balance"
@@ -2963,6 +3020,21 @@ msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
msgstr "Posodobitev kontnega načrta iz predloge"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_all"
+msgid "All"
+msgstr "Vse"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_payable"
+msgid "Payable"
+msgstr "Obveznosti"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_move_line_payable_receivable_domain_receivable"
+msgid "Receivable"
+msgstr "Terjatve"
+
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
msgstr "Privzeti kontni dnevnik"
@@ -3038,7 +3110,7 @@ msgstr "Odpri načrt šifer davkov"
msgctxt "model:ir.ui.menu,name:menu_create_chart"
msgid "Create Chart of Accounts from Template"
-msgstr "Ustvari kontni načrt"
+msgstr "Izdelava kontnega načrta"
msgctxt "model:ir.ui.menu,name:menu_entries"
msgid "Entries"
@@ -3104,10 +3176,6 @@ msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
msgstr "Odpri dnevnik"
-msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
-msgid "Reconcile Lines"
-msgstr "Uskladi postavke"
-
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
msgstr "Obdobja"
@@ -3132,6 +3200,10 @@ msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
msgstr "Obdelava"
+msgctxt "model:ir.ui.menu,name:menu_reconcile"
+msgid "Reconcile Accounts"
+msgstr "Usklajevanje kontov"
+
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
msgstr "Poročila"
@@ -3761,6 +3833,10 @@ msgid "Accounts"
msgstr "Konti"
msgctxt "view:account.account:"
+msgid "Children"
+msgstr "Podšifre"
+
+msgctxt "view:account.account:"
msgid "Deferrals"
msgstr "Odlogi"
@@ -3778,15 +3854,15 @@ msgstr "Kontna konfiguracija"
msgctxt "view:account.create_chart.account:"
msgid "Create Chart of Accounts"
-msgstr "Ustvari kontni načrt"
+msgstr "Izdelava kontnega načrta"
msgctxt "view:account.create_chart.properties:"
msgid "Create Default Properties"
-msgstr "Ustvari privzete lastnosti"
+msgstr "Izdelava privzetih lastnosti"
msgctxt "view:account.create_chart.start:"
msgid "Create Chart of Accounts"
-msgstr "Ustvari kontni načrt"
+msgstr "Izdelava kontnega načrta"
msgctxt "view:account.create_chart.start:"
msgid ""
@@ -3812,11 +3888,11 @@ msgstr "Zaključi poslovno leto"
msgctxt "view:account.fiscalyear:"
msgid "Create 3 Months Periods"
-msgstr "Ustvari tromesečna obdobja"
+msgstr "Izdelava tromesečnih obdobij"
msgctxt "view:account.fiscalyear:"
msgid "Create Monthly Periods"
-msgstr "Ustvari mesečna obdobja"
+msgstr "Izdelava mesečnih obdobij"
msgctxt "view:account.fiscalyear:"
msgid "Fiscal Year"
@@ -3906,10 +3982,6 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Odpri dnevnik"
-msgctxt "view:account.move.open_reconcile_lines.start:"
-msgid "Open Reconcile Lines"
-msgstr "Uskladitev postavk"
-
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
msgstr "Izpis glavnega dnevnika"
@@ -3982,6 +4054,14 @@ msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
msgstr "Izpis bruto bilance"
+msgctxt "view:account.reconcile.show:"
+msgid "Amount"
+msgstr "Znesek"
+
+msgctxt "view:account.reconcile.show:"
+msgid "Reconcile"
+msgstr "Uskladitev"
+
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
msgstr "Odpri načrt davčnih šifer"
@@ -4144,7 +4224,7 @@ msgstr "Davki"
msgctxt "wizard_button:account.create_chart,account,create_account:"
msgid "Create"
-msgstr "Ustvari"
+msgstr "Izdelaj"
msgctxt "wizard_button:account.create_chart,account,end:"
msgid "Cancel"
@@ -4152,7 +4232,7 @@ msgstr "Prekliči"
msgctxt "wizard_button:account.create_chart,properties,create_properties:"
msgid "Create"
-msgstr "Ustvari"
+msgstr "Izdelaj"
msgctxt "wizard_button:account.create_chart,properties,end:"
msgid "Cancel"
@@ -4190,14 +4270,6 @@ msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
msgstr "Odpri"
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
-msgid "Cancel"
-msgstr "Prekliči"
-
-msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
-msgid "Open"
-msgstr "Odpri"
-
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
msgstr "Prekliči"
@@ -4270,6 +4342,18 @@ msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
msgstr "Natisni"
+msgctxt "wizard_button:account.reconcile,show,end:"
+msgid "Cancel"
+msgstr "Prekliči"
+
+msgctxt "wizard_button:account.reconcile,show,next_:"
+msgid "Skip"
+msgstr "Preskoči"
+
+msgctxt "wizard_button:account.reconcile,show,reconcile:"
+msgid "Reconcile"
+msgstr "Uskladi"
+
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
msgstr "Prekliči"
diff --git a/move.py b/move.py
index 2fcc19c..bddfa21 100644
--- a/move.py
+++ b/move.py
@@ -2,10 +2,16 @@
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
import datetime
-from itertools import groupby
+from itertools import groupby, combinations
from operator import itemgetter
+from collections import defaultdict
+
+try:
+ from sql import Null
+except ImportError:
+ Null = None
from sql.aggregate import Sum
-from sql.conditionals import Coalesce
+from sql.conditionals import Coalesce, Case
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateTransition, StateView, StateAction, \
@@ -16,12 +22,16 @@ from trytond.pyson import Eval, Bool, PYSONEncoder
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
from trytond.rpc import RPC
-from trytond.tools import reduce_ids
+from trytond.tools import reduce_ids, grouped_slice
+from trytond.config import config
__all__ = ['Move', 'Reconciliation', 'Line', 'OpenJournalAsk',
- 'OpenJournal', 'OpenAccount', 'ReconcileLinesWriteOff', 'ReconcileLines',
- 'UnreconcileLinesStart', 'UnreconcileLines', 'OpenReconcileLinesStart',
- 'OpenReconcileLines', 'FiscalYearLine', 'FiscalYear2',
+ 'OpenJournal', 'OpenAccount',
+ 'ReconcileLinesWriteOff', 'ReconcileLines',
+ 'UnreconcileLines',
+ 'Reconcile', 'ReconcileShow',
+ 'CancelMoves',
+ 'FiscalYearLine', 'FiscalYear2',
'PrintGeneralJournalStart', 'PrintGeneralJournal', 'GeneralJournal']
__metaclass__ = PoolMeta
@@ -86,6 +96,9 @@ class Move(ModelSQL, ModelView):
'because it\'s date is outside its period.'),
'draft_closed_period': ('You can not set to draft move '
'"%(move)s" because period "%(period)s" is closed.'),
+ 'period_cancel': (
+ 'The period of move "%s" is closed.\n'
+ 'Use the current period?'),
})
cls._buttons.update({
'post': {
@@ -156,7 +169,7 @@ class Move(ModelSQL, ModelView):
@classmethod
def _get_origin(cls):
'Return list of Model names for origin Reference'
- return ['account.fiscalyear']
+ return ['account.fiscalyear', 'account.move']
@classmethod
def get_origin(cls):
@@ -185,7 +198,9 @@ class Move(ModelSQL, ModelView):
def check_date(self):
if (self.date < self.period.start_date
or self.date > self.period.end_date):
- self.raise_user_error('date_outside_period', (self.rec_name,))
+ self.raise_user_error('date_outside_period', {
+ 'move': self.rec_name,
+ })
@classmethod
def check_modify(cls, moves):
@@ -286,9 +301,7 @@ class Move(ModelSQL, ModelView):
company = User(user).company
amounts = {}
move2draft_lines = {}
- for i in range(0, len(moves), cursor.IN_MAX):
- sub_moves = moves[i:i + cursor.IN_MAX]
- sub_move_ids = [m.id for m in sub_moves]
+ for sub_move_ids in grouped_slice([m.id for m in moves]):
red_sql = reduce_ids(line.move, sub_move_ids)
cursor.execute(*line.select(line.move,
@@ -325,8 +338,7 @@ class Move(ModelSQL, ModelView):
(draft_moves, 'draft'),
):
if move_ids:
- for i in range(0, len(move_ids), cursor.IN_MAX):
- sub_ids = move_ids[i:i + cursor.IN_MAX]
+ for sub_ids in grouped_slice(move_ids):
red_sql = reduce_ids(line.move, sub_ids)
# Use SQL to prevent double validate loop
cursor.execute(*line.update(
@@ -334,6 +346,50 @@ class Move(ModelSQL, ModelView):
values=[state],
where=red_sql))
+ def _cancel_default(self):
+ 'Return default dictionary to cancel move'
+ pool = Pool()
+ Date = pool.get('ir.date')
+ Period = pool.get('account.period')
+
+ default = {
+ 'origin': str(self),
+ }
+ if self.period.state == 'close':
+ self.raise_user_warning('%s.cancel' % self,
+ 'period_cancel', self.rec_name)
+ date = Date.today()
+ period_id = Period.find(self.company.id, date=date)
+ default.update({
+ 'date': date,
+ 'period': period_id,
+ })
+ return default
+
+ def cancel(self):
+ 'Return a cancel move'
+ pool = Pool()
+ Line = pool.get('account.move.line')
+ TaxLine = pool.get('account.tax.line')
+ default = self._cancel_default()
+ cancel_move, = self.copy([self], default=default)
+ lines = []
+ tax_lines = []
+ for line in cancel_move.lines:
+ line.debit *= -1
+ line.credit *= -1
+ lines.extend(([line], line._save_values))
+ line._values = None
+ for tax_line in line.tax_lines:
+ tax_line.amount *= -1
+ tax_lines.extend(([tax_line], tax_line._save_values))
+ tax_line._values = None
+ if lines:
+ Line.write(*lines)
+ if tax_lines:
+ TaxLine.write(*tax_lines)
+ return cancel_move
+
@classmethod
@ModelView.button
def post(cls, moves):
@@ -363,11 +419,13 @@ class Move(ModelSQL, ModelView):
move.period.post_move_sequence_used.id)
cls.write([move], values)
+ keyfunc = lambda l: (l.party, l.account)
to_reconcile = [l for l in move.lines
if ((l.debit == l.credit == Decimal('0'))
and l.account.reconcile)]
- if to_reconcile:
- Line.reconcile(to_reconcile)
+ to_reconcile = sorted(to_reconcile, key=keyfunc)
+ for _, zero_lines in groupby(to_reconcile, keyfunc):
+ Line.reconcile(list(zero_lines))
@classmethod
@ModelView.button
@@ -444,7 +502,8 @@ class Reconciliation(ModelSQL, ModelView):
debit = Decimal('0.0')
credit = Decimal('0.0')
account = None
- party = None
+ if reconciliation.lines:
+ party = reconciliation.lines[0].party
for line in reconciliation.lines:
if line.state != 'valid':
cls.raise_user_error('reconciliation_line_not_valid',
@@ -465,9 +524,7 @@ class Reconciliation(ModelSQL, ModelView):
'line': line.rec_name,
'account': line.account.rec_name,
})
- if not party:
- party = line.party
- elif line.party and party.id != line.party.id:
+ if line.party != party:
cls.raise_user_error('reconciliation_different_parties', {
'line': line.rec_name,
'party1': line.party.rec_name,
@@ -536,7 +593,14 @@ class Line(ModelSQL, ModelView):
'required': Bool(Eval('amount_second_currency')),
},
depends=['amount_second_currency'])
- party = fields.Many2One('party.party', 'Party', select=True)
+ party = fields.Many2One('party.party', 'Party', select=True,
+ states={
+ 'required': Eval('party_required', False),
+ 'invisible': ~Eval('party_required', False),
+ },
+ depends=['party_required'])
+ party_required= fields.Function(fields.Boolean('Party Required'),
+ 'on_change_with_party_required')
maturity_date = fields.Date('Maturity Date',
help='This field is used for payable and receivable lines. \n'
'You can put the limit date for the payment.')
@@ -559,7 +623,10 @@ class Line(ModelSQL, ModelView):
@classmethod
def __setup__(cls):
super(Line, cls).__setup__()
- cls._check_modify_exclude = ['reconciliation']
+ cls._check_modify_exclude = {'reconciliation'}
+ cls._reconciliation_modify_disallow = {
+ 'account', 'debit', 'credit', 'party',
+ }
cls._sql_constraints += [
('credit_debit',
'CHECK(credit * debit = 0.0)',
@@ -584,6 +651,8 @@ class Line(ModelSQL, ModelView):
'move_inactive_account': ('You can not create a move line '
'with account "%s" because it is inactive.'),
'already_reconciled': 'Line "%s" (%d) already reconciled.',
+ 'party_required': 'Party is required on line "%s"',
+ 'party_set': 'Party must not be set on line "%s"',
})
@classmethod
@@ -652,14 +721,14 @@ class Line(ModelSQL, ModelView):
return Decimal(0)
@classmethod
- def default_get(cls, fields, with_rec_name=True, with_on_change=True):
+ def default_get(cls, fields, with_rec_name=True):
pool = Pool()
Move = pool.get('account.move')
Tax = pool.get('account.tax')
Account = pool.get('account.account')
TaxCode = pool.get('account.tax.code')
values = super(Line, cls).default_get(fields,
- with_rec_name=with_rec_name, with_on_change=with_on_change)
+ with_rec_name=with_rec_name)
if 'move' not in fields:
#Not manual entry
@@ -891,6 +960,12 @@ class Line(ModelSQL, ModelView):
self.account.second_currency.digits
return changes
+ @fields.depends('account')
+ def on_change_with_party_required(self, name=None):
+ if self.account:
+ return self.account.party_required
+ return False
+
def _compute_tax_lines(self, journal_type):
res = {}
pool = Pool()
@@ -1042,17 +1117,15 @@ class Line(ModelSQL, ModelView):
return res
def get_move_field(self, name):
+ field = getattr(self.__class__, name)
if name.startswith('move_'):
name = name[5:]
- if name in ('date', 'state', 'description'):
- return getattr(self.move, name)
- elif name == 'origin':
- origin = getattr(self.move, name)
- if origin:
- return str(origin)
- return None
- else:
- return getattr(self.move, name).id
+ value = getattr(self.move, name)
+ if isinstance(value, ModelSQL):
+ if field._type == 'reference':
+ return str(value)
+ return value.id
+ return value
@classmethod
def set_move_field(cls, lines, name, value):
@@ -1092,6 +1165,16 @@ class Line(ModelSQL, ModelView):
order_origin = _order_move_field('origin')
order_move_state = _order_move_field('state')
+ def get_rec_name(self, name):
+ if self.debit > self.credit:
+ return self.account.rec_name
+ else:
+ return '(%s)' % self.account.rec_name
+
+ @classmethod
+ def search_rec_name(cls, name, clause):
+ return [('account.rec_name',) + tuple(clause[1:])]
+
@classmethod
def query_get(cls, table):
'''
@@ -1198,6 +1281,9 @@ class Line(ModelSQL, ModelView):
if not self.account.active:
self.raise_user_error('move_inactive_account', (
self.account.rec_name,))
+ if bool(self.party) != self.account.party_required:
+ error = 'party_set' if self.party else 'party_required'
+ self.raise_user_error(error, self.rec_name)
@classmethod
def check_journal_period_modify(cls, period, journal):
@@ -1223,18 +1309,18 @@ class Line(ModelSQL, ModelView):
}])
@classmethod
- def check_modify(cls, lines):
+ def check_modify(cls, lines, modified_fields=None):
'''
Check if the lines can be modified
'''
+ if (modified_fields is not None
+ and modified_fields <= cls._check_modify_exclude):
+ return
journal_period_done = []
for line in lines:
if line.move.state == 'posted':
cls.raise_user_error('modify_posted_move', (
line.move.rec_name,))
- if line.reconciliation:
- cls.raise_user_error('modify_reconciled', (
- line.rec_name,))
journal_period = (line.journal.id, line.period.id)
if journal_period not in journal_period_done:
cls.check_journal_period_modify(line.period,
@@ -1242,9 +1328,19 @@ class Line(ModelSQL, ModelView):
journal_period_done.append(journal_period)
@classmethod
+ def check_reconciliation(cls, lines, modified_fields=None):
+ if (modified_fields is not None
+ and not modified_fields & cls._reconciliation_modify_disallow):
+ return
+ for line in lines:
+ if line.reconciliation:
+ cls.raise_user_error('modify_reconciled', line.rec_name)
+
+ @classmethod
def delete(cls, lines):
Move = Pool().get('account.move')
cls.check_modify(lines)
+ cls.check_reconciliation(lines)
moves = [x.move for x in lines]
super(Line, cls).delete(lines)
Move.validate_move(moves)
@@ -1258,8 +1354,8 @@ class Line(ModelSQL, ModelView):
moves = []
all_lines = []
for lines, values in zip(actions, actions):
- if any(k not in cls._check_modify_exclude for k in values):
- cls.check_modify(lines)
+ cls.check_modify(lines, set(values.keys()))
+ cls.check_reconciliation(lines, set(values.keys()))
moves.extend((x.move for x in lines))
all_lines.extend(lines)
args.extend((lines, values))
@@ -1380,11 +1476,14 @@ class Line(ModelSQL, ModelView):
lines = lines[:]
reconcile_account = None
+ reconcile_party = None
amount = Decimal('0.0')
for line in lines:
amount += line.debit - line.credit
if not reconcile_account:
reconcile_account = line.account
+ if not reconcile_party:
+ reconcile_party = line.party
amount = reconcile_account.currency.round(amount)
if not account and journal:
if amount >= 0:
@@ -1403,12 +1502,18 @@ class Line(ModelSQL, ModelView):
'lines': [
('create', [{
'account': reconcile_account.id,
+ 'party': (reconcile_party.id
+ if reconcile_party else None),
'debit': (amount < Decimal('0.0')
and - amount or Decimal('0.0')),
'credit': (amount > Decimal('0.0')
and amount or Decimal('0.0')),
}, {
'account': account.id,
+ 'party': (reconcile_party.id
+ if (account.party_required and
+ reconcile_party)
+ else None),
'debit': (amount > Decimal('0.0')
and amount or Decimal('0.0')),
'credit': (amount < Decimal('0.0')
@@ -1619,11 +1724,6 @@ class ReconcileLines(Wizard):
return 'end'
-class UnreconcileLinesStart(ModelView):
- 'Unreconcile Lines'
- __name__ = 'account.move.unreconcile_lines.start'
-
-
class UnreconcileLines(Wizard):
'Unreconcile Lines'
__name__ = 'account.move.unreconcile_lines'
@@ -1642,37 +1742,219 @@ class UnreconcileLines(Wizard):
return 'end'
-class OpenReconcileLinesStart(ModelView):
- 'Open Reconcile Lines'
- __name__ = 'account.move.open_reconcile_lines.start'
- account = fields.Many2One('account.account', 'Account', required=True,
- domain=[('kind', '!=', 'view'), ('reconcile', '=', True)])
-
-
-class OpenReconcileLines(Wizard):
- 'Open Reconcile Lines'
- __name__ = 'account.move.open_reconcile_lines'
- start = StateView('account.move.open_reconcile_lines.start',
- 'account.open_reconcile_lines_start_view_form', [
+class Reconcile(Wizard):
+ 'Reconcile'
+ __name__ = 'account.reconcile'
+ start_state = 'next_'
+ next_ = StateTransition()
+ show = StateView('account.reconcile.show',
+ 'account.reconcile_show_view_form', [
Button('Cancel', 'end', 'tryton-cancel'),
- Button('Open', 'open_', 'tryton-ok', default=True),
+ Button('Skip', 'next_', 'tryton-go-next'),
+ Button('Reconcile', 'reconcile', 'tryton-ok', default=True),
])
- open_ = StateAction('account.act_move_line_form')
+ reconcile = StateTransition()
- def do_open_(self, action):
- encoder = PYSONEncoder()
- action['pyson_domain'] = encoder.encode([
- ('account', '=', self.start.account.id),
+ def get_accounts(self):
+ 'Return a list of account id to reconcile'
+ pool = Pool()
+ Line = pool.get('account.move.line')
+ line = Line.__table__()
+ Account = pool.get('account.account')
+ account = Account.__table__()
+ cursor = Transaction().cursor
+
+ balance = line.debit - line.credit
+ cursor.execute(*line.join(account,
+ condition=line.account == account.id).select(
+ account.id,
+ where=(line.reconciliation == Null) & account.reconcile,
+ group_by=account.id,
+ having=(
+ Sum(Case((balance > 0, 1), else_=0)) > 0)
+ & (Sum(Case((balance < 0, 1), else_=0)) > 0)
+ ))
+ return [a for a, in cursor.fetchall()]
+
+ def get_parties(self, account):
+ 'Return a list party to reconcile for the account'
+ pool = Pool()
+ Line = pool.get('account.move.line')
+ line = Line.__table__()
+ cursor = Transaction().cursor
+
+ balance = line.debit - line.credit
+ cursor.execute(*line.select(line.party,
+ where=(line.reconciliation == Null)
+ & (line.account == account.id),
+ group_by=line.party,
+ having=(
+ Sum(Case((balance > 0, 1), else_=0)) > 0)
+ & (Sum(Case((balance < 0, 1), else_=0)) > 0)
+ ))
+ return [p for p, in cursor.fetchall()]
+
+ def transition_next_(self):
+
+ def next_account():
+ accounts = list(self.show.accounts)
+ if not accounts:
+ return
+ account = accounts.pop()
+ self.show.account = account
+ self.show.parties = self.get_parties(account)
+ self.show.accounts = accounts
+ return account
+
+ def next_party():
+ parties = list(self.show.parties)
+ if not parties:
+ return
+ party = parties.pop()
+ self.show.party = party
+ self.show.parties = parties
+ return party
+
+ if getattr(self.show, 'accounts', None) is None:
+ self.show.accounts = self.get_accounts()
+ if not next_account():
+ return 'end'
+ if getattr(self.show, 'parties', None) is None:
+ self.show.parties = self.get_parties(self.show.account)
+
+ while not next_party():
+ if not next_account():
+ return 'end'
+ return 'show'
+
+ def default_show(self, fields):
+ pool = Pool()
+ Date = pool.get('ir.date')
+
+ defaults = {}
+ defaults['accounts'] = [a.id for a in self.show.accounts]
+ defaults['account'] = self.show.account.id
+ defaults['parties'] = [p.id for p in self.show.parties]
+ defaults['party'] = self.show.party.id if self.show.party else None
+ defaults['currency_digits'] = self.show.account.company.currency.digits
+ defaults['lines'] = self._default_lines()
+ defaults['write_off'] = Decimal(0)
+ defaults['date'] = Date.today()
+ return defaults
+
+ def _all_lines(self):
+ 'Return all lines to reconcile for the current state'
+ pool = Pool()
+ Line = pool.get('account.move.line')
+ return Line.search([
+ ('account', '=', self.show.account.id),
+ ('party', '=',
+ self.show.party.id if self.show.party else None),
+ ('reconciliation', '=', None),
+ ])
+
+ def _default_lines(self):
+ 'Return the larger list of lines which can be reconciled'
+ currency = self.show.account.company.currency
+ chunk = config.getint('account', 'reconciliation_chunk', 10)
+ # Combination is exponential so it must be limited to small number
+ default = []
+ for lines in grouped_slice(self._all_lines(), chunk):
+ lines = list(lines)
+ best = None
+ for n in xrange(len(lines), 1, -1):
+ for comb_lines in combinations(lines, n):
+ amount = sum((l.debit - l.credit) for l in comb_lines)
+ if currency.is_zero(amount):
+ best = [l.id for l in comb_lines]
+ break
+ if best:
+ break
+ if best:
+ default.extend(best)
+ return default
+
+ def transition_reconcile(self):
+ pool = Pool()
+ Line = pool.get('account.move.line')
+
+ if self.show.lines:
+ Line.reconcile(self.show.lines,
+ journal=self.show.journal,
+ date=self.show.date,
+ description=self.show.description)
+ return 'next_'
+
+
+class ReconcileShow(ModelView):
+ 'Reconcile'
+ __name__ = 'account.reconcile.show'
+ accounts = fields.One2Many('account.account', None, 'Account',
+ readonly=True)
+ account = fields.Many2One('account.account', 'Account', readonly=True)
+ parties = fields.One2Many('party.party', None, 'Parties', readonly=True)
+ party = fields.Many2One('party.party', 'Party', readonly=True)
+ lines = fields.Many2Many('account.move.line', None, None, 'Lines',
+ domain=[
+ ('account', '=', Eval('account')),
+ ('party', '=', Eval('party')),
('reconciliation', '=', None),
+ ],
+ depends=['account', 'party'])
+
+ _write_off_states = {
+ 'required': Bool(Eval('write_off', 0)),
+ 'invisible': ~Eval('write_off', 0),
+ }
+ _write_off_depends = ['write_off']
+
+ write_off = fields.Function(fields.Numeric('Write-Off',
+ digits=(16, Eval('currency_digits', 2)),
+ states=_write_off_states,
+ depends=_write_off_depends + ['currency_digits']),
+ 'on_change_with_write_off')
+ currency_digits = fields.Function(fields.Integer('Currency Digits'),
+ 'on_change_with_currency_digits')
+ journal = fields.Many2One('account.journal', 'Journal',
+ states=_write_off_states, depends=_write_off_depends,
+ domain=[
+ ('type', '=', 'write-off'),
])
- if self.start.account.kind == 'receivable':
- order = [('credit', 'DESC'), ('id', 'DESC')]
- elif self.start.account.kind == 'payable':
- order = [('debit', 'DESC'), ('id', 'DESC')]
- else:
- order = None
- action['pyson_order'] = encoder.encode(order)
- return action, {}
+ date = fields.Date('Date',
+ states=_write_off_states, depends=_write_off_depends)
+ description = fields.Char('Description',
+ states=_write_off_states, depends=_write_off_depends)
+
+ @fields.depends('lines')
+ def on_change_with_write_off(self, name=None):
+ return sum((l.debit - l.credit) for l in self.lines)
+
+ @fields.depends('account')
+ def on_change_with_currency_digits(self, name=None):
+ return self.account.company.currency.digits
+
+
+class CancelMoves(Wizard):
+ 'Cancel Moves'
+ __name__ = 'account.move.cancel'
+ start_state = 'cancel'
+ cancel = StateTransition()
+
+ def transition_cancel(self):
+ pool = Pool()
+ Move = pool.get('account.move')
+ Line = pool.get('account.move.line')
+
+ moves = Move.browse(Transaction().context['active_ids'])
+ for move in moves:
+ cancel_move = move.cancel()
+ to_reconcile = defaultdict(list)
+ for line in move.lines + cancel_move.lines:
+ if line.account.reconcile:
+ to_reconcile[line.account].append(line)
+ for lines in to_reconcile.itervalues():
+ Line.reconcile(lines)
+ return 'end'
class FiscalYearLine(ModelSQL):
diff --git a/move.xml b/move.xml
index 68ea2f9..0c1ba90 100644
--- a/move.xml
+++ b/move.xml
@@ -188,35 +188,41 @@ this repository contains the full copyright notices and license terms. -->
<field name="action" ref="act_open_account"/>
</record>
- <record model="ir.action.act_window" id="act_move_line_payable">
- <field name="name">Payable Lines</field>
+ <record model="ir.action.act_window"
+ id="act_move_line_payable_receivable">
+ <field name="name">Payable/Receivable Lines</field>
<field name="res_model">account.move.line</field>
- <field name="domain">[('party', 'in', Eval('active_ids')), ('account.kind', '=', 'payable'), ('reconciliation', '=', None)]</field>
+ <field name="domain">[('party', 'in', Eval('active_ids')), ('account.kind', 'in', ['payable', 'receivable']), ('reconciliation', '=', None)]</field>
</record>
- <record model="ir.action.keyword" id="act_move_line_payable_keyword1">
- <field name="keyword">form_relate</field>
- <field name="model">party.party,-1</field>
- <field name="action" ref="act_move_line_payable"/>
+ <record model="ir.action.act_window.domain"
+ id="act_move_line_payable_receivable_domain_payable">
+ <field name="name">Payable</field>
+ <field name="sequence" eval="10"/>
+ <field name="domain">[('account.kind', '=', 'payable')]</field>
+ <field name="act_window" ref="act_move_line_payable_receivable"/>
</record>
- <record model="ir.action-res.group"
- id="act_move_line_payable-group_account">
- <field name="action" ref="act_move_line_payable"/>
- <field name="group" ref="group_account"/>
+ <record model="ir.action.act_window.domain"
+ id="act_move_line_payable_receivable_domain_receivable">
+ <field name="name">Receivable</field>
+ <field name="sequence" eval="20"/>
+ <field name="domain">[('account.kind', '=', 'receivable')]</field>
+ <field name="act_window" ref="act_move_line_payable_receivable"/>
</record>
-
- <record model="ir.action.act_window" id="act_move_line_receivable">
- <field name="name">Receivable Lines</field>
- <field name="res_model">account.move.line</field>
- <field name="domain">[('party', 'in', Eval('active_ids')), ('account.kind', '=', 'receivable'), ('reconciliation', '=', None)]</field>
+ <record model="ir.action.act_window.domain"
+ id="act_move_line_payable_receivable_domain_all">
+ <field name="name">All</field>
+ <field name="sequence" eval="9999"/>
+ <field name="act_window" ref="act_move_line_payable_receivable"/>
</record>
- <record model="ir.action.keyword" id="act_move_line_receivable_keyword1">
+ <record model="ir.action.keyword"
+ id="act_move_line_payable_receivable_keyword1">
<field name="keyword">form_relate</field>
<field name="model">party.party,-1</field>
- <field name="action" ref="act_move_line_receivable"/>
+ <field name="action" ref="act_move_line_payable_receivable"/>
</record>
<record model="ir.action-res.group"
- id="act_move_line_receivable-group_account">
- <field name="action" ref="act_move_line_receivable"/>
+ id="act_move_line_payable-group_account">
+ <field name="action" ref="act_move_line_payable_receivable"/>
<field name="group" ref="group_account"/>
</record>
@@ -280,19 +286,29 @@ this repository contains the full copyright notices and license terms. -->
<field name="action" ref="act_unreconcile_lines"/>
</record>
- <record model="ir.ui.view" id="open_reconcile_lines_start_view_form">
- <field name="model">account.move.open_reconcile_lines.start</field>
+ <record model="ir.action.wizard" id="act_reconcile">
+ <field name="name">Reconcile Accounts</field>
+ <field name="wiz_name">account.reconcile</field>
+ <field name="window" eval="True"/>
+ </record>
+ <menuitem parent="menu_processing" action="act_reconcile"
+ id="menu_reconcile"/>
+
+ <record model="ir.ui.view" id="reconcile_show_view_form">
+ <field name="model">account.reconcile.show</field>
<field name="type">form</field>
- <field name="name">open_reconcile_lines_start_form</field>
+ <field name="name">reconcile_show_form</field>
</record>
- <record model="ir.action.wizard" id="act_open_reconcile_lines">
- <field name="name">Open Reconcile Lines</field>
- <field name="wiz_name">account.move.open_reconcile_lines</field>
+ <record model="ir.action.wizard" id="act_cancel_moves">
+ <field name="name">Cancel Moves</field>
+ <field name="wiz_name">account.move.cancel</field>
+ </record>
+ <record model="ir.action.keyword" id="act_cancel_moves_keyword1">
+ <field name="keyword">form_action</field>
+ <field name="model">account.move,-1</field>
+ <field name="action" ref="act_cancel_moves"/>
</record>
- <menuitem name="Reconcile Lines" parent="menu_entries"
- action="act_open_reconcile_lines"
- id="menu_open_reconcile_lines"/>
<record model="ir.ui.view" id="print_general_journal_start_view_form">
<field name="model">account.move.print_general_journal.start</field>
diff --git a/period.py b/period.py
index 36f3de4..7d5dd1a 100644
--- a/period.py
+++ b/period.py
@@ -22,9 +22,11 @@ class Period(ModelSQL, ModelView):
name = fields.Char('Name', required=True)
code = fields.Char('Code')
start_date = fields.Date('Starting Date', required=True, states=_STATES,
- depends=_DEPENDS, select=True)
+ domain=[('start_date', '<=', Eval('end_date', None))],
+ depends=_DEPENDS + ['end_date'], select=True)
end_date = fields.Date('Ending Date', required=True, states=_STATES,
- depends=_DEPENDS, select=True)
+ domain=[('end_date', '>=', Eval('start_date', None))],
+ depends=_DEPENDS + ['start_date'], select=True)
fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year',
required=True, states=_STATES, depends=_DEPENDS, select=True)
state = fields.Selection([
@@ -70,7 +72,8 @@ class Period(ModelSQL, ModelView):
'move sequence of period "%s" because there are already '
'posted moves in the period.'),
'close_period_non_posted_move': ('You can not close period '
- '"%s" because there are non posted moves in this period.'),
+ '"%(period)s" because there are non posted moves '
+ '"%(move)s" in this period.'),
'periods_overlap': ('"%(first)s" and "%(second)s" periods '
'overlap.'),
'check_move_sequence': ('Period "%(first)s" and "%(second)s" '
@@ -284,13 +287,16 @@ class Period(ModelSQL, ModelView):
JournalPeriod = pool.get('account.journal.period')
Move = pool.get('account.move')
- unposted_periods = Move.search([
+ unposted_moves = Move.search([
('period', 'in', [p.id for p in periods]),
('state', '!=', 'posted'),
], limit=1)
- if unposted_periods:
- cls.raise_user_error('close_period_non_posted_move',
- (unposted_periods[0].rec_name,))
+ if unposted_moves:
+ unposted_move, = unposted_moves
+ cls.raise_user_error('close_period_non_posted_move', {
+ 'period': unposted_move.period.rec_name,
+ 'move': unposted_move.rec_name,
+ })
#First close the period to be sure
#it will not have new journal.period created between.
cls.write(periods, {
diff --git a/tax.py b/tax.py
index b04c97a..0ad69a7 100644
--- a/tax.py
+++ b/tax.py
@@ -4,7 +4,7 @@ import datetime
from decimal import Decimal
from sql.aggregate import Sum
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSQL, MatchMixin, fields
from trytond.wizard import Wizard, StateView, StateAction, Button
from trytond import backend
from trytond.pyson import Eval, If, Bool, PYSONEncoder
@@ -1084,7 +1084,8 @@ class TaxRuleLineTemplate(ModelSQL, ModelView):
__name__ = 'account.tax.rule.line.template'
rule = fields.Many2One('account.tax.rule.template', 'Rule', required=True,
ondelete='CASCADE')
- group = fields.Many2One('account.tax.group', 'Tax Group')
+ group = fields.Many2One('account.tax.group', 'Tax Group',
+ ondelete='RESTRICT')
origin_tax = fields.Many2One('account.tax.template', 'Original Tax',
domain=[
('account', '=', Eval('_parent_rule', {}).get('account', 0)),
@@ -1101,7 +1102,8 @@ class TaxRuleLineTemplate(ModelSQL, ModelView):
],
help=('If the original tax template is filled, the rule will be '
'applied only for this tax template.'),
- depends=['group'])
+ depends=['group'],
+ ondelete='RESTRICT')
tax = fields.Many2One('account.tax.template', 'Substitution Tax',
domain=[
('account', '=', Eval('_parent_rule', {}).get('account', 0)),
@@ -1116,7 +1118,8 @@ class TaxRuleLineTemplate(ModelSQL, ModelView):
('group.kind', 'in', ['sale', 'purchase', 'both']))),
],
],
- depends=['group'])
+ depends=['group'],
+ ondelete='RESTRICT')
sequence = fields.Integer('Sequence')
@classmethod
@@ -1188,13 +1191,14 @@ class TaxRuleLineTemplate(ModelSQL, ModelView):
return template2rule_line[self.id]
-class TaxRuleLine(ModelSQL, ModelView):
+class TaxRuleLine(ModelSQL, ModelView, MatchMixin):
'Tax Rule Line'
__name__ = 'account.tax.rule.line'
_rec_name = 'tax'
rule = fields.Many2One('account.tax.rule', 'Rule', required=True,
select=True, ondelete='CASCADE')
- group = fields.Many2One('account.tax.group', 'Tax Group')
+ group = fields.Many2One('account.tax.group', 'Tax Group',
+ ondelete='RESTRICT')
origin_tax = fields.Many2One('account.tax', 'Original Tax',
domain=[
('company', '=', Eval('_parent_rule', {}).get('company')),
@@ -1211,7 +1215,8 @@ class TaxRuleLine(ModelSQL, ModelView):
],
help=('If the original tax is filled, the rule will be applied '
'only for this tax.'),
- depends=['group'])
+ depends=['group'],
+ ondelete='RESTRICT')
tax = fields.Many2One('account.tax', 'Substitution Tax',
domain=[
('company', '=', Eval('_parent_rule', {}).get('company')),
@@ -1226,7 +1231,8 @@ class TaxRuleLine(ModelSQL, ModelView):
('group.kind', 'in', ['sale', 'purchase', 'both']))),
],
],
- depends=['group'])
+ depends=['group'],
+ ondelete='RESTRICT')
sequence = fields.Integer('Sequence')
template = fields.Many2One('account.tax.rule.line.template', 'Template')
@@ -1253,24 +1259,10 @@ class TaxRuleLine(ModelSQL, ModelView):
return [table.sequence == None, table.sequence]
def match(self, pattern):
- '''
- Match line on pattern
- pattern is a dictonary with rule line field as key and match value as
- value.
- '''
- for field in pattern.keys():
- if field not in self._fields:
- continue
- if not getattr(self, field) and field != 'group':
- continue
- if self._fields[field]._type == 'many2one':
- if ((getattr(self, field).id if getattr(self, field) else None)
- != pattern[field]):
- return False
- else:
- if getattr(self, field) != pattern[field]:
- return False
- return True
+ if 'group' in pattern and not self.group:
+ if pattern['group']:
+ return False
+ return super(TaxRuleLine, self).match(pattern)
def get_taxes(self):
'''
diff --git a/tests/scenario_account_reconciliation.rst b/tests/scenario_account_reconciliation.rst
index 0e5832a..8e4e3d7 100644
--- a/tests/scenario_account_reconciliation.rst
+++ b/tests/scenario_account_reconciliation.rst
@@ -147,7 +147,6 @@ Create Moves for direct reconciliation::
>>> line = move.lines.new()
>>> line.account = cash
>>> line.debit = Decimal(42)
- >>> line.party = customer
>>> line = move.lines.new()
>>> line.account = receivable
>>> line.credit = Decimal(42)
@@ -190,7 +189,6 @@ Create Moves for writeoff reconciliation::
>>> line = move.lines.new()
>>> line.account = cash
>>> line.debit = Decimal(65)
- >>> line.party = customer
>>> line = move.lines.new()
>>> line.account = receivable
>>> line.credit = Decimal(65)
diff --git a/tests/scenario_account_reconciliation.rst b/tests/scenario_move_cancel.rst
similarity index 56%
copy from tests/scenario_account_reconciliation.rst
copy to tests/scenario_move_cancel.rst
index 0e5832a..140d3c0 100644
--- a/tests/scenario_account_reconciliation.rst
+++ b/tests/scenario_move_cancel.rst
@@ -1,6 +1,6 @@
-===============================
-Account Reconciliation Scenario
-===============================
+====================
+Move Cancel Scenario
+====================
=============
General Setup
@@ -98,15 +98,6 @@ Create chart of accounts::
... ('kind', '=', 'revenue'),
... ('company', '=', company.id),
... ])
- >>> expense, = Account.find([
- ... ('kind', '=', 'expense'),
- ... ('company', '=', company.id),
- ... ])
- >>> cash, = Account.find([
- ... ('kind', '=', 'other'),
- ... ('company', '=', company.id),
- ... ('name', '=', 'Main Cash'),
- ... ])
>>> create_chart.form.account_receivable = receivable
>>> create_chart.form.account_payable = payable
>>> create_chart.execute('create_properties')
@@ -117,7 +108,7 @@ Create parties::
>>> customer = Party(name='Customer')
>>> customer.save()
-Create Moves for direct reconciliation::
+Create Move to cancel::
>>> Journal = Model.get('account.journal')
>>> Move = Model.get('account.move')
@@ -139,89 +130,29 @@ Create Moves for direct reconciliation::
>>> line.debit = Decimal(42)
>>> line.party = customer
>>> move.save()
- >>> reconcile1, = [l for l in move.lines if l.account == receivable]
- >>> move = Move()
- >>> move.period = period
- >>> move.journal = journal_cash
- >>> move.date = period.start_date
- >>> line = move.lines.new()
- >>> line.account = cash
- >>> line.debit = Decimal(42)
- >>> line.party = customer
- >>> line = move.lines.new()
- >>> line.account = receivable
- >>> line.credit = Decimal(42)
- >>> line.party = customer
- >>> move.save()
- >>> reconcile2, = [l for l in move.lines if l.account == receivable]
-
-Reconcile Lines without writeoff::
-
- >>> reconcile_lines = Wizard('account.move.reconcile_lines',
- ... [reconcile1, reconcile2])
- >>> reconcile_lines.state == 'end'
- True
- >>> reconcile1.reload()
- >>> reconcile2.reload()
- >>> reconcile1.reconciliation == reconcile2.reconciliation != None
- True
- >>> len(reconcile1.reconciliation.lines)
- 2
-
-Create Moves for writeoff reconciliation::
-
- >>> move = Move()
- >>> move.period = period
- >>> move.journal = journal_revenue
- >>> move.date = period.start_date
- >>> line = move.lines.new()
- >>> line.account = revenue
- >>> line.credit = Decimal(68)
- >>> line = move.lines.new()
- >>> line.account = receivable
- >>> line.debit = Decimal(68)
- >>> line.party = customer
- >>> move.save()
- >>> reconcile1, = [l for l in move.lines if l.account == receivable]
- >>> move = Move()
- >>> move.period = period
- >>> move.journal = journal_cash
- >>> move.date = period.start_date
- >>> line = move.lines.new()
- >>> line.account = cash
- >>> line.debit = Decimal(65)
- >>> line.party = customer
- >>> line = move.lines.new()
- >>> line.account = receivable
- >>> line.credit = Decimal(65)
- >>> line.party = customer
- >>> move.save()
- >>> reconcile2, = [l for l in move.lines if l.account == receivable]
-
-Reconcile Lines with writeoff::
-
- >>> sequence_journal, = Sequence.find([('code', '=', 'account.journal')])
- >>> journal_writeoff = Journal(name='Write-Off', type='write-off',
- ... sequence=sequence_journal,
- ... credit_account=revenue, debit_account=expense)
- >>> journal_writeoff.save()
- >>> reconcile_lines = Wizard('account.move.reconcile_lines',
- ... [reconcile1, reconcile2])
- >>> reconcile_lines.form_state == 'writeoff'
- True
- >>> reconcile_lines.form.journal = journal_writeoff
- >>> reconcile_lines.execute('reconcile')
- >>> reconcile1.reload()
- >>> reconcile2.reload()
- >>> reconcile1.reconciliation == reconcile2.reconciliation != None
+ >>> revenue.reload()
+ >>> revenue.credit
+ Decimal('42.00')
+ >>> receivable.reload()
+ >>> receivable.debit
+ Decimal('42.00')
+
+Cancel Move::
+
+ >>> cancel_move = Wizard('account.move.cancel', [move])
+ >>> cancel_move.state
+ 'end'
+ >>> move.reload()
+ >>> line, = [l for l in move.lines if l.account == receivable]
+ >>> bool(line.reconciliation)
True
- >>> len(reconcile1.reconciliation.lines)
- 3
- >>> writeoff_line1, = [l for l in reconcile1.reconciliation.lines
- ... if l.credit == Decimal(3)]
- >>> writeoff_line2, = [l for l in writeoff_line1.move.lines
- ... if l != writeoff_line1]
- >>> writeoff_line2.account == expense
+ >>> cancel_move, = [l.move for l in line.reconciliation.lines
+ ... if l.move != move]
+ >>> cancel_move.origin == move
True
- >>> writeoff_line2.debit
- Decimal('3.00')
+ >>> revenue.reload()
+ >>> revenue.credit
+ Decimal('0.00')
+ >>> receivable.reload()
+ >>> receivable.debit
+ Decimal('0.00')
diff --git a/tests/test_account.py b/tests/test_account.py
index b7a9b9e..1c5d54e 100644
--- a/tests/test_account.py
+++ b/tests/test_account.py
@@ -6,7 +6,8 @@ import datetime
from decimal import Decimal
from dateutil.relativedelta import relativedelta
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
+from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
from trytond.transaction import Transaction
@@ -33,6 +34,7 @@ class AccountTestCase(unittest.TestCase):
self.balance_non_deferral = POOL.get(
'account.fiscalyear.balance_non_deferral', type='wizard')
self.tax = POOL.get('account.tax')
+ self.party = POOL.get('party.party')
def test0005views(self):
'Test views'
@@ -134,6 +136,8 @@ class AccountTestCase(unittest.TestCase):
'Test account debit/credit'
with Transaction().start(DB_NAME, USER,
context=CONTEXT) as transaction:
+ party = self.party(name='Party')
+ party.save()
fiscalyear, = self.fiscalyear.search([])
period = fiscalyear.periods[0]
journal_revenue, = self.journal.search([
@@ -167,6 +171,7 @@ class AccountTestCase(unittest.TestCase):
}, {
'account': receivable.id,
'debit': Decimal(100),
+ 'party': party.id,
}]),
],
},
@@ -181,6 +186,7 @@ class AccountTestCase(unittest.TestCase):
}, {
'account': payable.id,
'credit': Decimal(30),
+ 'party': party.id,
}]),
],
},
@@ -434,6 +440,10 @@ def suite():
AccountTestCase))
suite.addTests(doctest.DocFileSuite(
'scenario_account_reconciliation.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
+ suite.addTests(doctest.DocFileSuite(
+ 'scenario_move_cancel.rst',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 2e200e0..abe5265 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.1
+version=3.4.0
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index f23e66d..062a845 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account
-Version: 3.2.1
+Version: 3.4.0
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_account
===============
diff --git a/trytond_account.egg-info/SOURCES.txt b/trytond_account.egg-info/SOURCES.txt
index fd77f6c..603d7a6 100644
--- a/trytond_account.egg-info/SOURCES.txt
+++ b/trytond_account.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+TODO
account.xml
aged_balance.odt
configuration.xml
@@ -21,15 +22,131 @@ trial_balance.odt
tryton.cfg
./__init__.py
./account.py
+./account.xml
+./aged_balance.odt
./configuration.py
+./configuration.xml
./fiscalyear.py
+./fiscalyear.xml
+./general_journal.odt
+./general_ledger.odt
./journal.py
+./journal.xml
./move.py
+./move.xml
./party.py
+./party.xml
./period.py
+./period.xml
./tax.py
+./tax.xml
+./third_party_balance.odt
+./trial_balance.odt
+./tryton.cfg
+./icons/tryton-financial.svg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_account_reconciliation.rst
+./tests/scenario_move_cancel.rst
./tests/test_account.py
+./view/account_balance_sheet_tree.xml
+./view/account_deferral_form.xml
+./view/account_deferral_tree.xml
+./view/account_form.xml
+./view/account_income_statement_tree.xml
+./view/account_list.xml
+./view/account_list2.xml
+./view/account_template_form.xml
+./view/account_template_list.xml
+./view/account_template_tree.xml
+./view/account_tree.xml
+./view/account_tree2.xml
+./view/account_type_form.xml
+./view/account_type_list.xml
+./view/account_type_template_form.xml
+./view/account_type_template_list.xml
+./view/account_type_template_tree.xml
+./view/account_type_tree.xml
+./view/configuration_form.xml
+./view/create_chart_account_form.xml
+./view/create_chart_properties_form.xml
+./view/create_chart_start_form.xml
+./view/fiscalyear_balance_non_deferral_start_form.xml
+./view/fiscalyear_close_start_form.xml
+./view/fiscalyear_form.xml
+./view/fiscalyear_tree.xml
+./view/journal_form.xml
+./view/journal_period_form.xml
+./view/journal_period_tree.xml
+./view/journal_tree.xml
+./view/journal_type_form.xml
+./view/journal_type_tree.xml
+./view/journal_view_column_form.xml
+./view/journal_view_column_list.xml
+./view/journal_view_column_list_sequence.xml
+./view/journal_view_form.xml
+./view/journal_view_tree.xml
+./view/move_form.xml
+./view/move_line_form.xml
+./view/move_line_form_move.xml
+./view/move_line_tree.xml
+./view/move_line_tree_move.xml
+./view/move_reconciliation_form.xml
+./view/move_reconciliation_tree.xml
+./view/move_tree.xml
+./view/open_aged_balance_start_form.xml
+./view/open_balance_sheet_start_form.xml
+./view/open_chart_start_form.xml
+./view/open_income_statement_start_form.xml
+./view/open_journal_ask_form.xml
+./view/open_third_party_balance_start_form.xml
+./view/party_form.xml
+./view/party_tree.xml
+./view/period_form.xml
+./view/period_tree.xml
+./view/print_general_journal_start_form.xml
+./view/print_general_legder_start_form.xml
+./view/print_trial_balance_start_form.xml
+./view/reconcile_lines_writeoff_form.xml
+./view/reconcile_show_form.xml
+./view/tax_code_form.xml
+./view/tax_code_list.xml
+./view/tax_code_open_chart_start_form.xml
+./view/tax_code_template_form.xml
+./view/tax_code_template_tree.xml
+./view/tax_code_tree.xml
+./view/tax_code_tree2.xml
+./view/tax_form.xml
+./view/tax_group_form.xml
+./view/tax_group_tree.xml
+./view/tax_line_form.xml
+./view/tax_line_tree.xml
+./view/tax_list.xml
+./view/tax_rule_form.xml
+./view/tax_rule_line_form.xml
+./view/tax_rule_line_template_form.xml
+./view/tax_rule_line_template_tree.xml
+./view/tax_rule_line_tree.xml
+./view/tax_rule_line_tree_sequence.xml
+./view/tax_rule_template_form.xml
+./view/tax_rule_template_tree.xml
+./view/tax_rule_tree.xml
+./view/tax_template_form.xml
+./view/tax_template_tree.xml
+./view/tax_tree.xml
+./view/update_chart_start_form.xml
+./view/update_chart_succeed_form.xml
doc/index.rst
icons/tryton-financial.svg
locale/bg_BG.po
@@ -38,12 +155,14 @@ locale/cs_CZ.po
locale/de_DE.po
locale/es_AR.po
locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
locale/sl_SI.po
tests/scenario_account_reconciliation.rst
+tests/scenario_move_cancel.rst
trytond_account.egg-info/PKG-INFO
trytond_account.egg-info/SOURCES.txt
trytond_account.egg-info/dependency_links.txt
@@ -101,7 +220,6 @@ view/open_balance_sheet_start_form.xml
view/open_chart_start_form.xml
view/open_income_statement_start_form.xml
view/open_journal_ask_form.xml
-view/open_reconcile_lines_start_form.xml
view/open_third_party_balance_start_form.xml
view/party_form.xml
view/party_tree.xml
@@ -111,6 +229,7 @@ view/print_general_journal_start_form.xml
view/print_general_legder_start_form.xml
view/print_trial_balance_start_form.xml
view/reconcile_lines_writeoff_form.xml
+view/reconcile_show_form.xml
view/tax_code_form.xml
view/tax_code_list.xml
view/tax_code_open_chart_start_form.xml
diff --git a/trytond_account.egg-info/requires.txt b/trytond_account.egg-info/requires.txt
index bb80063..c1e3b87 100644
--- a/trytond_account.egg-info/requires.txt
+++ b/trytond_account.egg-info/requires.txt
@@ -1,6 +1,6 @@
python-dateutil
python-sql
-trytond_company >= 3.2, < 3.3
-trytond_currency >= 3.2, < 3.3
-trytond_party >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_company >= 3.4, < 3.5
+trytond_currency >= 3.4, < 3.5
+trytond_party >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
diff --git a/view/account_form.xml b/view/account_form.xml
index 266c018..828787a 100644
--- a/view/account_form.xml
+++ b/view/account_form.xml
@@ -26,8 +26,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="currency"/>
<label name="second_currency"/>
<field name="second_currency"/>
+ <label name="party_required"/>
+ <field name="party_required"/>
<field name="taxes" colspan="4"/>
</page>
+ <page string="Children" id="children">
+ <field name="childs" colspan="4"/>
+ </page>
<page string="Deferrals" id="deferrals">
<field name="deferrals"/>
</page>
diff --git a/view/open_reconcile_lines_start_form.xml b/view/open_reconcile_lines_start_form.xml
deleted file mode 100644
index 705bb88..0000000
--- a/view/open_reconcile_lines_start_form.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<form string="Open Reconcile Lines">
- <label name="account"/>
- <field name="account"/>
-</form>
diff --git a/view/reconcile_show_form.xml b/view/reconcile_show_form.xml
new file mode 100644
index 0000000..dc954ca
--- /dev/null
+++ b/view/reconcile_show_form.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Reconcile">
+ <label name="account"/>
+ <field name="account"/>
+ <label name="party"/>
+ <field name="party"/>
+ <field name="lines" colspan="4"/>
+ <separator name="write_off" colspan="4"/>
+ <label name="write_off" string="Amount"/>
+ <field name="write_off"/>
+ <label name="date"/>
+ <field name="date"/>
+ <label name="journal"/>
+ <field name="journal"/>
+ <newline/>
+ <label name="description"/>
+ <field name="description" colspan="3"/>
+</form>
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list