[tryton-debian-vcs] tryton-modules-account branch debian updated. debian/2.8.2-1-6-g2974795
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:31:48 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account.git;a=commitdiff;h=debian/2.8.2-1-6-g2974795
commit 2974795147c84d8ef0dce8ff9917de774e384d32
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:29:59 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index ef8d21e..aa7e7d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-account (3.0.0-1) unstable; urgency=low
+
+ * Removing inadvertently commited .pc directory.
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+ * Adding python-sql to Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:52:57 +0100
+
tryton-modules-account (2.8.2-1) unstable; urgency=low
* Merging upstream version 2.8.2.
commit 8735b8974e3f0939c06620cf13c6acd4e3ffc0e5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 17:38:06 2013 +0100
Adding python-sql to Depends.
diff --git a/debian/control b/debian/control
index dc54d1a..289ca56 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Depends:
tryton-modules-company (>= ${version:major}),
tryton-modules-currency (>= ${version:major}),
tryton-modules-party (>= ${version:major}),
- python-dateutil, python-pkg-resources
+ python-dateutil, python-sql, python-pkg-resources
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit fc45e3c71999d1155e12240a6568c831f933535b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 1e44799..dc54d1a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit f42d0b0a5b428b9e629faae1a86fdbbb9e69f068
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:20 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index cbc86f1..1e44799 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-account.git
commit 3860e372e052a2dd893a2c0cb08c5c4d9fc2f16a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:16 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 950ee18..ef0a877 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,11 @@
-Version 2.8.2 - 2013-10-01
-* Bug fixes (see mercurial logs for details)
-
-Version 2.8.1 - 2013-06-09
+Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
+* Add balance non-deferral wizard
+* Display write-off amount in reconciliation
+* Enforce same company for a chart of account
+* Change tax percentage into rate
+* Autoreconcile posted move with just one line of zero
+* Remove centralised counterpart option and functionality
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 70c2ce0..01a7294 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,7 @@ Prerequisites
* Python 2.6 or later (http://www.python.org/)
* python-dateutil (http://labix.org/python-dateutil)
+ * python-sql (http://code.google.com/p/python-sql/)
* trytond (http://www.tryton.org/)
* trytond_company (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 16121e7..f43f5cd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 2.8.2
+Version: 3.0.0
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_account
===============
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/__init__.py b/__init__.py
index add3581..b616999 100644
--- a/__init__.py
+++ b/__init__.py
@@ -15,6 +15,7 @@ from .party import *
def register():
Pool.register(
FiscalYear,
+ BalanceNonDeferralStart,
CloseFiscalYearStart,
TypeTemplate,
Type,
@@ -43,7 +44,6 @@ def register():
Move,
Reconciliation,
Line,
- Move2,
OpenJournalAsk,
ReconcileLinesWriteOff,
UnreconcileLinesStart,
@@ -70,6 +70,7 @@ def register():
module='account', type_='model')
Pool.register(
OpenType,
+ BalanceNonDeferral,
CloseFiscalYear,
OpenChartAccount,
PrintGeneralLedger,
diff --git a/account.py b/account.py
index 9238cd0..6540fee 100644
--- a/account.py
+++ b/account.py
@@ -3,7 +3,11 @@
from decimal import Decimal
import datetime
import operator
-from itertools import izip
+from itertools import izip, groupby
+from sql import Column, Literal
+from sql.aggregate import Sum
+from sql.conditionals import Coalesce
+
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateView, StateAction, StateTransition, \
Button
@@ -12,7 +16,7 @@ from trytond.tools import reduce_ids
from trytond.pyson import Eval, PYSONEncoder, Date
from trytond.transaction import Transaction
from trytond.pool import Pool
-from trytond.backend import TableHandler
+from trytond import backend
__all__ = ['TypeTemplate', 'Type', 'OpenType', 'AccountTemplate', 'Account',
'AccountDeferral', 'OpenChartAccountStart', 'OpenChartAccount',
@@ -34,9 +38,7 @@ class TypeTemplate(ModelSQL, ModelView):
ondelete="RESTRICT")
childs = fields.One2Many('account.account.type.template', 'parent',
'Children')
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence')
balance_sheet = fields.Boolean('Balance Sheet')
income_statement = fields.Boolean('Income Statement')
display_balance = fields.Selection([
@@ -51,6 +53,7 @@ class TypeTemplate(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -65,6 +68,11 @@ class TypeTemplate(ModelSQL, ModelView):
cls.check_recursion(records, rec_name='name')
@staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
+ @staticmethod
def default_balance_sheet():
return False
@@ -165,8 +173,6 @@ class Type(ModelSQL, ModelView):
('company', '=', Eval('company')),
], depends=['company'])
sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s',
help='Use to order the account type')
currency_digits = fields.Function(fields.Integer('Currency Digits'),
'get_currency_digits')
@@ -190,6 +196,7 @@ class Type(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -204,6 +211,11 @@ class Type(ModelSQL, ModelView):
cls.check_recursion(types, rec_name='name')
@staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
+ @staticmethod
def default_balance_sheet():
return False
@@ -236,9 +248,10 @@ class Type(ModelSQL, ModelView):
accounts = Account.search([
('type', 'in', [t.id for t in childs]),
+ ('kind', '!=', 'view'),
])
for account in accounts:
- type_sum[account.type.id] += account.balance
+ type_sum[account.type.id] += (account.debit - account.credit)
for type_ in types:
childs = cls.search([
@@ -318,10 +331,12 @@ class OpenType(Wizard):
def do_open_(self, action):
action['pyson_domain'] = PYSONEncoder().encode([
('type', '=', Transaction().context['active_id']),
+ ('kind', '!=', 'view'),
])
action['pyson_context'] = PYSONEncoder().encode({
'date': Transaction().context.get('date'),
'posted': Transaction().context.get('posted'),
+ 'cumulate': Transaction().context.get('cumulate'),
})
return action, {}
@@ -532,7 +547,9 @@ class Account(ModelSQL, ModelView):
('company', '=', Eval('company')),
], depends=['kind', 'company'])
parent = fields.Many2One('account.account', 'Parent', select=True,
- left="left", right="right", ondelete="RESTRICT")
+ left="left", right="right", ondelete="RESTRICT",
+ domain=[('company', '=', Eval('company'))],
+ depends=['company'])
left = fields.Integer('Left', required=True, select=True)
right = fields.Integer('Right', required=True, select=True)
childs = fields.One2Many('account.account', 'parent', 'Children')
@@ -624,100 +641,44 @@ class Account(ModelSQL, ModelView):
@classmethod
def get_balance(cls, accounts, name):
- res = {}
pool = Pool()
- Currency = pool.get('currency.currency')
MoveLine = pool.get('account.move.line')
FiscalYear = pool.get('account.fiscalyear')
- Deferral = pool.get('account.account.deferral')
cursor = Transaction().cursor
+ in_max = cursor.IN_MAX
- query_ids, args_ids = cls.search([
- ('parent', 'child_of', [a.id for a in accounts]),
- ], query_string=True)
- line_query, fiscalyear_ids = MoveLine.query_get()
- cursor.execute('SELECT a.id, '
- 'SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))) '
- 'FROM account_account a '
- 'LEFT JOIN account_move_line l '
- 'ON (a.id = l.account) '
- 'WHERE a.kind != \'view\' '
- 'AND a.id IN (' + query_ids + ') '
- 'AND ' + line_query + ' '
- 'AND a.active '
- 'GROUP BY a.id', args_ids)
- account_sum = {}
- for account_id, sum in cursor.fetchall():
- # SQLite uses float for SUM
- if not isinstance(sum, Decimal):
- sum = Decimal(str(sum))
- account_sum[account_id] = sum
-
- account2company = {}
- id2company = {}
- id2account = {}
- all_accounts = cls.search([('parent', 'child_of',
- [a.id for a in accounts])])
- for account in all_accounts:
- account2company[account.id] = account.company.id
- id2company[account.company.id] = account.company
- id2account[account.id] = account
-
- for account in accounts:
- res.setdefault(account.id, Decimal('0.0'))
- childs = cls.search([
- ('parent', 'child_of', [account.id]),
- ])
- company_id = account2company[account.id]
- to_currency = id2company[company_id].currency
- for child in childs:
- child_company_id = account2company[child.id]
- from_currency = id2company[child_company_id].currency
- res[account.id] += Currency.compute(from_currency,
- account_sum.get(child.id, Decimal('0.0')), to_currency,
- round=True)
-
- youngest_fiscalyear = None
- for fiscalyear in FiscalYear.browse(fiscalyear_ids):
- if not youngest_fiscalyear \
- or youngest_fiscalyear.start_date > fiscalyear.start_date:
- youngest_fiscalyear = fiscalyear
-
- fiscalyear = None
- if youngest_fiscalyear:
- fiscalyears = FiscalYear.search([
- ('end_date', '<=', youngest_fiscalyear.start_date),
- ('company', '=', youngest_fiscalyear.company),
- ], order=[('end_date', 'DESC')], limit=1)
- if fiscalyears:
- fiscalyear = fiscalyears[0]
-
- if fiscalyear:
- if fiscalyear.state == 'close':
- deferrals = Deferral.search([
- ('fiscalyear', '=', fiscalyear.id),
- ('account', 'in', [a.id for a in accounts]),
- ])
- id2deferral = {}
- for deferral in deferrals:
- id2deferral[deferral.account.id] = deferral
-
- for account in accounts:
- if account.id in id2deferral:
- deferral = id2deferral[account.id]
- res[account.id] += deferral.debit - deferral.credit
- else:
- with Transaction().set_context(fiscalyear=fiscalyear.id,
- date=None, periods=None):
- res2 = cls.get_balance(accounts, name)
- for account in accounts:
- res[account.id] += res2[account.id]
-
- for account in accounts:
- company_id = account2company[account.id]
- to_currency = id2company[company_id].currency
- res[account.id] = to_currency.round(res[account.id])
- return res
+ table_a = cls.__table__()
+ table_c = cls.__table__()
+ line = MoveLine.__table__()
+ 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]
+ red_sql = reduce_ids(table_a.id, sub_ids)
+ cursor.execute(*table_a.join(table_c,
+ condition=(table_c.left >= table_a.left)
+ & (table_c.right <= table_a.right)
+ ).join(line, condition=line.account == table_c.id
+ ).select(
+ table_a.id,
+ Sum(Coalesce(line.debit, 0) - Coalesce(line.credit, 0)),
+ where=red_sql & line_query & table_c.active,
+ group_by=table_a.id))
+ result = cursor.fetchall()
+ balances.update(dict(result))
+
+ # SQLite uses float for SUM
+ for account_id, balance in balances.iteritems():
+ if isinstance(balance, Decimal):
+ break
+ balances[account_id] = Decimal(str(balance))
+
+ fiscalyears = FiscalYear.browse(fiscalyear_ids)
+ func = lambda accounts, names: \
+ {names[0]: cls.get_balance(accounts, names[0])}
+ return cls._cumulate(fiscalyears, accounts, {name: balances},
+ func)[name]
@classmethod
def get_credit_debit(cls, accounts, names):
@@ -726,100 +687,107 @@ class Account(ModelSQL, ModelView):
If cumulate is set in the context, it is the cumulate amount over all
previous fiscal year.
'''
- res = {}
pool = Pool()
MoveLine = pool.get('account.move.line')
FiscalYear = pool.get('account.fiscalyear')
- Deferral = pool.get('account.account.deferral')
cursor = Transaction().cursor
+ in_max = cursor.IN_MAX
+ result = {}
+ ids = [a.id for a in accounts]
for name in names:
if name not in ('credit', 'debit'):
raise Exception('Bad argument')
- res[name] = {}
+ result[name] = dict((i, 0) for i in ids)
- ids = [a.id for a in accounts]
- line_query, fiscalyear_ids = MoveLine.query_get()
- for i in range(0, len(ids), cursor.IN_MAX):
- sub_ids = ids[i:i + cursor.IN_MAX]
- red_sql, red_ids = reduce_ids('a.id', sub_ids)
- cursor.execute('SELECT a.id, ' +
- ','.join('SUM(COALESCE(l.' + name + ', 0))'
- for name in names) + ' '
- 'FROM account_account a '
- 'LEFT JOIN account_move_line l '
- 'ON (a.id = l.account) '
- 'WHERE a.kind != \'view\' '
- 'AND ' + red_sql + ' '
- 'AND ' + line_query + ' '
- 'AND a.active '
- 'GROUP BY a.id', red_ids)
+ table = cls.__table__()
+ line = MoveLine.__table__()
+ line_query, fiscalyear_ids = MoveLine.query_get(line)
+ 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]
+ red_sql = reduce_ids(table.id, sub_ids)
+ cursor.execute(*table.join(line, 'LEFT',
+ condition=line.account == table.id
+ ).select(*columns,
+ where=red_sql & line_query,
+ group_by=table.id))
for row in cursor.fetchall():
account_id = row[0]
- for i in range(len(names)):
+ for i, name in enumerate(names, 1):
# SQLite uses float for SUM
- if not isinstance(row[i + 1], Decimal):
- res[names[i]][account_id] = Decimal(str(row[i + 1]))
+ if not isinstance(row[i], Decimal):
+ result[name][account_id] = Decimal(str(row[i]))
else:
- res[names[i]][account_id] = row[i + 1]
+ result[name][account_id] = row[i]
- account2company = {}
- id2company = {}
- for account in accounts:
- account2company[account.id] = account.company.id
- id2company[account.company.id] = account.company
+ if not Transaction().context.get('cumulate'):
+ return result
+ else:
+ fiscalyears = FiscalYear.browse(fiscalyear_ids)
+ return cls._cumulate(fiscalyears, accounts, result,
+ cls.get_credit_debit)
- for account in accounts:
- for name in names:
- res[name].setdefault(account.id, Decimal('0.0'))
-
- if Transaction().context.get('cumulate'):
- youngest_fiscalyear = None
- for fiscalyear in FiscalYear.browse(fiscalyear_ids):
- if (not youngest_fiscalyear
- or (youngest_fiscalyear.start_date
- > fiscalyear.start_date)):
- youngest_fiscalyear = fiscalyear
-
- fiscalyear = None
- if youngest_fiscalyear:
- fiscalyears = FiscalYear.search([
- ('end_date', '<=', youngest_fiscalyear.start_date),
- ('company', '=', youngest_fiscalyear.company),
- ], order=[('end_date', 'DESC')], limit=1)
- if fiscalyears:
- fiscalyear, = fiscalyears
-
- if fiscalyear:
- if fiscalyear.state == 'close':
- deferrals = Deferral.search([
- ('fiscalyear', '=', fiscalyear.id),
- ('account', 'in', ids),
- ])
- id2deferral = {}
- for deferral in deferrals:
- id2deferral[deferral.account.id] = deferral
-
- for account in accounts:
- if account.id in id2deferral:
- deferral = id2deferral[account.id]
- for name in names:
- res[name][account.id] += getattr(deferral,
- name)
- else:
- with Transaction().set_context(fiscalyear=fiscalyear.id,
- date=None, periods=None):
- res2 = cls.get_credit_debit(accounts, names)
- for account in accounts:
- for name in names:
- res[name][account.id] += res2[name][account.id]
+ @classmethod
+ def _cumulate(cls, fiscalyears, accounts, values, func):
+ """
+ Cumulate previous fiscalyear values into values
+ func is the method to compute values
+ """
+ pool = Pool()
+ FiscalYear = pool.get('account.fiscalyear')
+ Deferral = pool.get('account.account.deferral')
+ in_max = Transaction().cursor.IN_MAX
+ names = values.keys()
- for account in accounts:
- company_id = account2company[account.id]
- currency = id2company[company_id].currency
+ youngest_fiscalyear = None
+ for fiscalyear in fiscalyears:
+ if (not youngest_fiscalyear
+ or (youngest_fiscalyear.start_date
+ > fiscalyear.start_date)):
+ youngest_fiscalyear = fiscalyear
+
+ fiscalyear = None
+ if youngest_fiscalyear:
+ fiscalyears = FiscalYear.search([
+ ('end_date', '<=', youngest_fiscalyear.start_date),
+ ('company', '=', youngest_fiscalyear.company),
+ ], order=[('end_date', 'DESC')], limit=1)
+ if fiscalyears:
+ fiscalyear, = fiscalyears
+
+ if not fiscalyear:
+ return values
+
+ 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]
+ deferrals = Deferral.search([
+ ('fiscalyear', '=', fiscalyear.id),
+ ('account', 'in', sub_ids),
+ ])
+ for deferral in deferrals:
+ id2deferral[deferral.account.id] = deferral
+
+ for account in accounts:
+ if account.id in id2deferral:
+ deferral = id2deferral[account.id]
+ for name in names:
+ values[name][account.id] += getattr(deferral, name)
+ else:
+ with Transaction().set_context(fiscalyear=fiscalyear.id,
+ date=None, periods=None):
+ previous_result = func(accounts, names)
for name in names:
- res[name][account.id] = currency.round(res[name][account.id])
- return res
+ vals = values[name]
+ for account in accounts:
+ vals[account.id] += previous_result[name][account.id]
+
+ return values
def get_rec_name(self, name):
if self.code:
@@ -978,6 +946,9 @@ class AccountDeferral(ModelSQL, ModelView):
required=True, depends=['currency_digits'])
credit = fields.Numeric('Credit', digits=(16, Eval('currency_digits', 2)),
required=True, depends=['currency_digits'])
+ balance = fields.Function(fields.Numeric('Balance',
+ digits=(16, Eval('currency_digits', 2)),
+ depends=['currency_digits']), 'get_balance')
currency_digits = fields.Function(fields.Integer('Currency Digits'),
'get_currency_digits')
@@ -992,6 +963,9 @@ class AccountDeferral(ModelSQL, ModelView):
'write_deferral': 'You can not modify Account Deferral records',
})
+ def get_balance(self, name):
+ return self.debit - self.credit
+
def get_currency_digits(self, name):
return self.account.currency_digits
@@ -1016,7 +990,7 @@ class OpenChartAccountStart(ModelView):
__name__ = 'account.open_chart.start'
fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year',
help='Leave empty for all open fiscal year')
- posted = fields.Boolean('Posted Move', help='Show only posted move')
+ posted = fields.Boolean('Posted Moves', help='Show posted moves only')
@staticmethod
def default_posted():
@@ -1195,8 +1169,8 @@ class GeneralLedger(Report):
localcontext['end_period'] = periods[-1]
if not data['empty_account']:
- account2lines = cls.get_lines(accounts,
- end_periods, data['posted'])
+ account2lines = dict(cls.get_lines(accounts,
+ end_periods, data['posted']))
for account in (set(accounts) - set(account2lines)):
accounts.remove(account)
@@ -1224,11 +1198,12 @@ class GeneralLedger(Report):
]
if posted:
clause.append(('move.state', '=', 'posted'))
- moves = MoveLine.search(clause, order=[])
- res = {}
- for move in moves:
- res.setdefault(move.account, []).append(move)
- return res
+ lines = MoveLine.search(clause,
+ order=[
+ ('account', 'ASC'),
+ ('date', 'ASC'),
+ ])
+ return groupby(lines, operator.attrgetter('account'))
@classmethod
def lines(cls, accounts, periods, posted):
@@ -1239,8 +1214,7 @@ class GeneralLedger(Report):
state_selections = dict(Move.fields_get(
fields_names=['state'])['state']['selection'])
- for account, lines in account2lines.iteritems():
- lines.sort(lambda x, y: cmp(x.date, y.date))
+ for account, lines in account2lines:
balance = Decimal('0.0')
for line in lines:
balance += line.debit - line.credit
@@ -1496,6 +1470,7 @@ class OpenBalanceSheet(Wizard):
self.start.date.day),
'posted': self.start.posted,
'company': company.id,
+ 'cumulate': True,
})
action['name'] += ' %s - %s' % (date, company.rec_name)
return action, {}
@@ -1600,7 +1575,10 @@ class CreateChartStart(ModelView):
class CreateChartAccount(ModelView):
'Create Chart'
__name__ = 'account.create_chart.account'
- company = fields.Many2One('company.company', 'Company', required=True)
+ company = fields.Many2One('company.company', 'Company', required=True,
+ domain=[
+ ('parent', 'child_of', [Eval('context', {}).get('company', 0)]),
+ ])
account_template = fields.Many2One('account.account.template',
'Account Template', required=True, domain=[('parent', '=', None)])
@@ -1956,37 +1934,39 @@ class ThirdPartyBalance(Report):
pool = Pool()
Party = pool.get('party.party')
MoveLine = pool.get('account.move.line')
+ Move = pool.get('account.move')
+ Account = pool.get('account.account')
Company = pool.get('company.company')
Date = pool.get('ir.date')
cursor = Transaction().cursor
+ line = MoveLine.__table__()
+ move = Move.__table__()
+ account = Account.__table__()
+
company = Company(data['company'])
localcontext['company'] = company
localcontext['digits'] = company.currency.digits
localcontext['fiscalyear'] = data['fiscalyear']
with Transaction().set_context(context=localcontext):
- line_query, _ = MoveLine.query_get()
+ line_query, _ = MoveLine.query_get(line)
if data['posted']:
- posted_clause = "AND m.state = 'posted' "
+ posted_clause = move.state == 'posted'
else:
- posted_clause = ""
-
- cursor.execute('SELECT l.party, SUM(l.debit), SUM(l.credit) '
- 'FROM account_move_line l '
- 'JOIN account_move m ON (l.move = m.id) '
- 'JOIN account_account a ON (l.account = a.id) '
- 'WHERE l.party IS NOT NULL '
- 'AND a.active '
- 'AND a.kind IN (\'payable\',\'receivable\') '
- 'AND l.reconciliation IS NULL '
- 'AND a.company = %s '
- 'AND (l.maturity_date <= %s '
- 'OR l.maturity_date IS NULL) '
- 'AND ' + line_query + ' '
- + posted_clause +
- 'GROUP BY l.party '
- 'HAVING (SUM(l.debit) != 0 OR SUM(l.credit) != 0)',
- (data['company'], Date.today()))
+ posted_clause = Literal(True)
+
+ cursor.execute(*line.join(move, condition=line.move == move.id
+ ).join(account, condition=line.account == account.id
+ ).select(line.party, Sum(line.debit), Sum(line.credit),
+ where=(line.party != None)
+ & account.active
+ & account.kind.in_(('payable', 'receivable'))
+ & (account.company == data['company'])
+ & ((line.maturity_date <= Date.today())
+ | (line.maturity_date == None))
+ & line_query & posted_clause,
+ group_by=line.party,
+ having=(Sum(line.debit) != 0) | (Sum(line.credit) != 0)))
res = cursor.fetchall()
id2party = {}
@@ -2095,15 +2075,21 @@ class AgedBalance(Report):
pool = Pool()
Party = pool.get('party.party')
MoveLine = pool.get('account.move.line')
+ Move = pool.get('account.move')
+ Account = pool.get('account.account')
Company = pool.get('company.company')
Date = pool.get('ir.date')
cursor = Transaction().cursor
+ line = MoveLine.__table__()
+ move = Move.__table__()
+ account = Account.__table__()
+
company = Company(data['company'])
localcontext['digits'] = company.currency.digits
localcontext['posted'] = data['posted']
with Transaction().set_context(context=localcontext):
- line_query, _ = MoveLine.query_get()
+ line_query, _ = MoveLine.query_get(line)
terms = (data['term1'], data['term2'], data['term3'])
if data['unit'] == 'month':
@@ -2119,30 +2105,22 @@ class AgedBalance(Report):
res = {}
for position, term in enumerate(terms):
- if position == 2:
- term_query = 'l.maturity_date <= %s'
- term_args = (Date.today() - term * coef,)
- else:
- term_query = '(l.maturity_date <= %s '\
- 'AND l.maturity_date > %s) '
- term_args = (
- Date.today() - term * coef,
+ term_query = line.maturity_date <= (Date.today() - term * coef)
+ if position != 2:
+ term_query &= line.maturity_date > (
Date.today() - terms[position + 1] * coef)
- cursor.execute('SELECT l.party, SUM(l.debit) - SUM(l.credit) '
- 'FROM account_move_line l '
- 'JOIN account_move m ON (l.move = m.id) '
- 'JOIN account_account a ON (l.account = a.id) '
- 'WHERE l.party IS NOT NULL '
- 'AND a.active '
- 'AND a.kind IN (' + ','.join(('%s',) * len(kind)) + ") "
- 'AND l.reconciliation IS NULL '
- 'AND a.company = %s '
- 'AND ' + term_query + ' '
- 'AND ' + line_query + ' '
- 'GROUP BY l.party '
- 'HAVING (SUM(l.debit) - SUM(l.credit) != 0)',
- kind + (data['company'],) + term_args)
+ cursor.execute(*line.join(move, condition=line.move == move.id
+ ).join(account, condition=line.account == account.id
+ ).select(line.party, Sum(line.debit) - Sum(line.credit),
+ where=(line.party != None)
+ & account.active
+ & account.kind.in_(kind)
+ & (line.reconciliation == None)
+ & (account.company == data['company'])
+ & term_query & line_query,
+ group_by=line.party,
+ having=(Sum(line.debit) - Sum(line.credit)) != 0))
for party, solde in cursor.fetchall():
if party in res:
res[party][position] = solde
diff --git a/account.xml b/account.xml
index 8e9ceb7..c62416d 100644
--- a/account.xml
+++ b/account.xml
@@ -83,7 +83,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_type_template_tree">
<field name="name">Account Type Templates</field>
<field name="res_model">account.account.type.template</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view"
id="act_account_type_template_tree_view1">
@@ -226,7 +226,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_type_tree">
<field name="name">Account Types</field>
<field name="res_model">account.account.type</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_account_type_tree_view1">
<field name="sequence" eval="10"/>
@@ -296,7 +296,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_template_tree">
<field name="name">Account Templates</field>
<field name="res_model">account.account.template</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_account_template_tree_view1">
<field name="sequence" eval="10"/>
@@ -447,7 +447,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_tree">
<field name="name">Accounts</field>
<field name="res_model">account.account</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_account_tree_view1">
<field name="sequence" eval="10"/>
@@ -517,7 +517,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_tree2">
<field name="name">Accounts</field>
<field name="res_model">account.account</field>
- <field name="domain">[('parent', '=', False), ('company', '=', Eval('context', {}).get('company', False))]</field>
+ <field name="domain">[('parent', '=', None), ('company', '=', Eval('context', {}).get('company', -1))]</field>
</record>
<record model="ir.action.act_window.view" id="act_account_tree2_view1">
<field name="sequence" eval="10"/>
@@ -618,7 +618,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_balance_sheet_tree">
<field name="name">Balance Sheet</field>
<field name="res_model">account.account.type</field>
- <field name="domain">[('balance_sheet', '=', True)]</field>
+ <field name="domain">[('balance_sheet', '=', True), ['OR', ('parent', '=', None), ('parent.balance_sheet', '=', False)]]</field>
</record>
<record model="ir.action.act_window.view" id="act_balance_sheet_view1">
<field name="sequence" eval="10"/>
@@ -649,7 +649,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_income_statement_tree">
<field name="name">Income Statement</field>
<field name="res_model">account.account.type</field>
- <field name="domain">[('income_statement', '=', True)]</field>
+ <field name="domain">[('income_statement', '=', True), ['OR', ('parent', '=', None), ('parent.income_statement', '=', False)]]</field>
</record>
<record model="ir.action.act_window.view" id="act_income_statement_view1">
<field name="sequence" eval="10"/>
diff --git a/aged_balance.odt b/aged_balance.odt
index 498ee61..7097b34 100644
Binary files a/aged_balance.odt and b/aged_balance.odt differ
diff --git a/configuration.py b/configuration.py
index 2bf9408..e6dcfc6 100644
--- a/configuration.py
+++ b/configuration.py
@@ -15,14 +15,14 @@ class Configuration(ModelSingleton, ModelSQL, ModelView):
'account.account', 'Default Account Receivable',
domain=[
('kind', '=', 'receivable'),
- ('company', '=', Eval('context', {}).get('company')),
+ ('company', '=', Eval('context', {}).get('company', -1)),
]),
'get_account', setter='set_account')
default_account_payable = fields.Function(fields.Many2One(
'account.account', 'Default Account Payable',
domain=[
('kind', '=', 'payable'),
- ('company', '=', Eval('context', {}).get('company')),
+ ('company', '=', Eval('context', {}).get('company', -1)),
]),
'get_account', setter='set_account')
diff --git a/doc/index.rst b/doc/index.rst
index e19efc8..b7195bd 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -21,6 +21,10 @@ year will close all the corresponding periods.
- Post Move Sequence: The sequence to use for numbering moves in this
fiscal year.
+The *Balance Non-Deferral* wizard allow to create a move that will debit/credit
+each non-deferral account in such way to have a balance equals to zero for the
+fiscal year and debit/credit a counter part account.
+
Period
******
@@ -96,14 +100,10 @@ A Journal contains the following fields:
- Active: A checkbox that allow to disable the tax.
- View: Defines how the moves lines on this journal should be
displayed.
-- Centralised counterpart: If checked all created lines are linked to
- the last open movement for the current journal and the current
- period.
- Update Posted: if true it allow to upate posted moves of this
journal.
- Default Credit Account, Default Debit Account: Used as default
- accounts on move lines for centralised journals and for journal of
- *Cash* type.
+ accounts on move lines for journals of *Cash* type.
- Type: By default take one of the following values: *General*,
*Revenue*, *Expense*, *Cash*, *Situation*.
diff --git a/fiscalyear.py b/fiscalyear.py
index 1fb72e2..6227ba9 100644
--- a/fiscalyear.py
+++ b/fiscalyear.py
@@ -2,13 +2,16 @@
#this repository contains the full copyright notices and license terms.
from dateutil.relativedelta import relativedelta
from trytond.model import ModelView, ModelSQL, fields
-from trytond.wizard import Wizard, StateView, StateTransition, Button
+from trytond.wizard import Wizard, StateView, StateTransition, StateAction, \
+ Button
from trytond.tools import datetime_strftime
-from trytond.pyson import Eval, If
+from trytond.pyson import Eval, If, PYSONEncoder
from trytond.transaction import Transaction
from trytond.pool import Pool
-__all__ = ['FiscalYear', 'CloseFiscalYearStart', 'CloseFiscalYear']
+__all__ = ['FiscalYear',
+ 'BalanceNonDeferralStart', 'BalanceNonDeferral',
+ 'CloseFiscalYearStart', 'CloseFiscalYear']
STATES = {
'readonly': Eval('state') == 'close',
@@ -45,7 +48,7 @@ class FiscalYear(ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', 0)),
+ Eval('context', {}).get('company', -1)),
], select=True)
@classmethod
@@ -101,17 +104,16 @@ class FiscalYear(ModelSQL, ModelView):
def check_dates(self):
cursor = Transaction().cursor
- cursor.execute('SELECT id '
- 'FROM ' + self._table + ' '
- 'WHERE ((start_date <= %s AND end_date >= %s) '
- 'OR (start_date <= %s AND end_date >= %s) '
- 'OR (start_date >= %s AND end_date <= %s)) '
- 'AND company = %s '
- 'AND id != %s',
- (self.start_date, self.start_date,
- self.end_date, self.end_date,
- self.start_date, self.end_date,
- self.company.id, self.id))
+ table = self.__table__()
+ cursor.execute(*table.select(table.id,
+ where=(((table.start_date <= self.start_date)
+ & (table.end_date >= self.start_date))
+ | ((table.start_date <= self.end_date)
+ & (table.end_date >= self.end_date))
+ | ((table.start_date >= self.start_date)
+ & (table.end_date <= self.end_date)))
+ & (table.company == self.company.id)
+ & (table.id != self.id)))
second_id = cursor.fetchone()
if second_id:
second = self.__class__(second_id[0])
@@ -307,6 +309,118 @@ class FiscalYear(ModelSQL, ModelView):
})
+class BalanceNonDeferralStart(ModelView):
+ 'Balance Non-Deferral'
+ __name__ = 'account.fiscalyear.balance_non_deferral.start'
+ fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year',
+ required=True, domain=[('state', '=', 'open')])
+ journal = fields.Many2One('account.journal', 'Journal', required=True,
+ domain=[
+ ('type', '=', 'situation'),
+ ])
+ period = fields.Many2One('account.period', 'Period', required=True,
+ domain=[
+ ('fiscalyear', '=', Eval('fiscalyear')),
+ ('type', '=', 'adjustment'),
+ ],
+ depends=['fiscalyear'])
+ credit_account = fields.Many2One('account.account', 'Credit Account',
+ required=True,
+ domain=[
+ ('kind', '!=', 'view'),
+ ('company', '=', Eval('context', {}).get('company', -1)),
+ ('deferral', '=', True),
+ ])
+ debit_account = fields.Many2One('account.account', 'Debit Account',
+ required=True,
+ domain=[
+ ('kind', '!=', 'view'),
+ ('company', '=', Eval('context', {}).get('company', -1)),
+ ('deferral', '=', True),
+ ])
+
+
+class BalanceNonDeferral(Wizard):
+ 'Balance Non-Deferral'
+ __name__ = 'account.fiscalyear.balance_non_deferral'
+ start = StateView('account.fiscalyear.balance_non_deferral.start',
+ 'account.fiscalyear_balance_non_deferral_start_view_form', [
+ Button('Cancel', 'end', 'tryton-cancel'),
+ Button('Ok', 'balance', 'tryton-ok', default=True),
+ ])
+ balance = StateAction('account.act_move_line_form')
+
+ def get_move_line(self, account):
+ pool = Pool()
+ Line = pool.get('account.move.line')
+ if account.company.currency.is_zero(account.balance):
+ return
+ line = Line()
+ line.account = account
+ if account.balance >= 0:
+ line.credit = abs(account.balance)
+ line.debit = 0
+ else:
+ line.credit = 0
+ line.debit = abs(account.balance)
+ return line
+
+ def get_counterpart_line(self, amount):
+ pool = Pool()
+ Line = pool.get('account.move.line')
+ if self.start.fiscalyear.company.currency.is_zero(amount):
+ return
+ line = Line()
+ if amount >= 0:
+ line.credit = abs(amount)
+ line.debit = 0
+ line.account = self.start.credit_account
+ else:
+ line.credit = 0
+ line.debit = abs(amount)
+ line.account = self.start.debit_account
+ return line
+
+ def create_move(self):
+ pool = Pool()
+ Account = pool.get('account.account')
+ Move = pool.get('account.move')
+
+ with Transaction().set_context(fiscalyear=self.start.fiscalyear.id,
+ date=None, cumulate=False):
+ accounts = Account.search([
+ ('company', '=', self.start.fiscalyear.company.id),
+ ('deferral', '=', False),
+ ])
+ lines = []
+ for account in accounts:
+ line = self.get_move_line(account)
+ if line:
+ lines.append(line)
+ if not lines:
+ return
+ amount = sum(l.debit - l.credit for l in lines)
+ counter_part_line = self.get_counterpart_line(amount)
+ if counter_part_line:
+ lines.append(counter_part_line)
+
+ move = Move()
+ move.period = self.start.period
+ move.journal = self.start.journal
+ move.date = self.start.period.start_date
+ move.origin = self.start.fiscalyear
+ move.lines = lines
+ move.save()
+ return move
+
+ def do_balance(self, action):
+ self.create_move()
+ action['pyson_domain'] = PYSONEncoder().encode([
+ ('origin', '=', str(self.start.fiscalyear)),
+ ])
+ return action, {}
+
+
class CloseFiscalYearStart(ModelView):
'Close Fiscal Year'
__name__ = 'account.fiscalyear.close.start'
diff --git a/fiscalyear.xml b/fiscalyear.xml
index 1f17579..9ad5f03 100644
--- a/fiscalyear.xml
+++ b/fiscalyear.xml
@@ -57,6 +57,24 @@ this repository contains the full copyright notices and license terms. -->
<field name="rule_group" ref="rule_group_fiscalyear"/>
</record>
+ <record model="ir.ui.view"
+ id="fiscalyear_balance_non_deferral_start_view_form">
+ <field
+ name="model">account.fiscalyear.balance_non_deferral.start</field>
+ <field name="type">form</field>
+ <field
+ name="name">fiscalyear_balance_non_deferral_start_form</field>
+ </record>
+
+ <record model="ir.action.wizard" id="act_balance_non_deferral">
+ <field name="name">Balance Non-Deferral</field>
+ <field
+ name="wiz_name">account.fiscalyear.balance_non_deferral</field>
+ </record>
+ <menuitem parent="menu_processing" sequence="10"
+ action="act_balance_non_deferral"
+ id="menu_balance_non_deferral"/>
+
<record model="ir.ui.view" id="fiscalyear_close_start_view_form">
<field name="model">account.fiscalyear.close.start</field>
<field name="type">form</field>
@@ -67,7 +85,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">Close Fiscal Year</field>
<field name="wiz_name">account.fiscalyear.close</field>
</record>
- <menuitem parent="menu_processing" action="act_close_fiscalyear"
- id="menu_close_fiscalyear"/>
+ <menuitem parent="menu_processing" sequence="20"
+ action="act_close_fiscalyear" id="menu_close_fiscalyear"/>
</data>
</tryton>
diff --git a/general_journal.odt b/general_journal.odt
index b694479..2094ed3 100644
Binary files a/general_journal.odt and b/general_journal.odt differ
diff --git a/general_ledger.odt b/general_ledger.odt
index ffc97f9..885e623 100644
Binary files a/general_ledger.odt and b/general_ledger.odt differ
diff --git a/journal.py b/journal.py
index 2d3f12b..cf27f3b 100644
--- a/journal.py
+++ b/journal.py
@@ -2,7 +2,7 @@
#this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateTransition
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.pyson import Eval, Bool
from trytond.transaction import Transaction
from trytond.pool import Pool
@@ -55,9 +55,7 @@ class JournalViewColumn(ModelSQL, ModelView):
field = fields.Many2One('ir.model.field', 'Field', required=True,
domain=[('model.model', '=', 'account.move.line')])
view = fields.Many2One('account.journal.view', 'View', select=True)
- sequence = fields.Integer('Sequence', select=True,
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence', select=True)
required = fields.Boolean('Required')
readonly = fields.Boolean('Readonly')
@@ -68,6 +66,7 @@ class JournalViewColumn(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -77,6 +76,11 @@ class JournalViewColumn(ModelSQL, ModelView):
table.not_null_action('sequence', action='remove')
@staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
+ @staticmethod
def default_required():
return False
@@ -93,36 +97,33 @@ class Journal(ModelSQL, ModelView):
active = fields.Boolean('Active', select=True)
type = fields.Selection('get_types', 'Type', required=True)
view = fields.Many2One('account.journal.view', 'View')
- centralised = fields.Boolean('Centralised counterpart')
update_posted = fields.Boolean('Allow cancelling moves')
sequence = fields.Property(fields.Many2One('ir.sequence', 'Sequence',
domain=[('code', '=', 'account.journal')],
context={'code': 'account.journal'},
states={
- 'required': Bool(Eval('context', {}).get('company', 0)),
+ 'required': Bool(Eval('context', {}).get('company', -1)),
}))
credit_account = fields.Property(fields.Many2One('account.account',
'Default Credit Account', domain=[
('kind', '!=', 'view'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
- 'required': ((Eval('centralised', False)
- | (Eval('type') == 'cash'))
- & Bool(Eval('context', {}).get('company', 0))),
- 'invisible': ~Eval('context', {}).get('company', 0),
- }, depends=['type', 'centralised']))
+ 'required': ((Eval('type') == 'cash')
+ & (Eval('context', {}).get('company', -1) != -1)),
+ 'invisible': ~Eval('context', {}).get('company', -1),
+ }, depends=['type']))
debit_account = fields.Property(fields.Many2One('account.account',
'Default Debit Account', domain=[
('kind', '!=', 'view'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
- 'required': ((Eval('centralised', False)
- | (Eval('type') == 'cash'))
- & Bool(Eval('context', {}).get('company', 0))),
- 'invisible': ~Eval('context', {}).get('company', 0),
- }, depends=['type', 'centralised']))
+ 'required': ((Eval('type') == 'cash')
+ & (Eval('context', {}).get('company', -1) != -1)),
+ 'invisible': ~Eval('context', {}).get('company', -1),
+ }, depends=['type']))
@classmethod
def __setup__(cls):
@@ -131,6 +132,7 @@ class Journal(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
super(Journal, cls).__register__(module_name)
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -138,7 +140,8 @@ class Journal(ModelSQL, ModelView):
# Migration from 1.0 sequence Many2One change into Property
if table.column_exist('sequence'):
Property = Pool().get('ir.property')
- cursor.execute('SELECT id, sequence FROM "' + cls._table + '"')
+ 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,
@@ -151,10 +154,6 @@ class Journal(ModelSQL, ModelView):
return True
@staticmethod
- def default_centralised():
- return False
-
- @staticmethod
def default_update_posted():
return False
diff --git a/journal.xml b/journal.xml
index 43c89be..54d5045 100644
--- a/journal.xml
+++ b/journal.xml
@@ -222,7 +222,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_journal_period_tree">
<field name="name">Journals - Periods</field>
<field name="res_model">account.journal.period</field>
- <field name="domain">[('period.fiscalyear.company.id', '=', Get(Eval('context', {}), 'company', False))]</field>
+ <field name="domain">[('period.fiscalyear.company.id', '=', Eval('context', {}).get('company', -1))]</field>
</record>
<record model="ir.action.act_window.view" id="act_journal_period_tree_view1">
<field name="sequence" eval="10"/>
@@ -234,7 +234,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_journal_period_tree2">
<field name="name">Journals - Periods</field>
<field name="res_model">account.journal.period</field>
- <field name="domain">[('state', '!=', 'close'), ('period.fiscalyear.company.id', '=', Get(Eval('context', {}), 'company', False))]</field>
+ <field name="domain">[('state', '!=', 'close'), ('period.fiscalyear.company.id', '=', Eval('context', {}).get('company', -1))]</field>
</record>
<record model="ir.action.act_window.view" id="act_journal_period_tree2_view1">
<field name="sequence" eval="10"/>
@@ -269,7 +269,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_journal_period_form">
<field name="name">Journals - Periods</field>
<field name="res_model">account.journal.period</field>
- <field name="domain">[('period.fiscalyear.company.id', '=', Get(Eval('context', {}), 'company', False))]</field>
+ <field name="domain">[('period.fiscalyear.company.id', '=', Eval('context', {}).get('company', -1))]</field>
</record>
<record model="ir.action.act_window.view" id="act_journal_period_form_view1">
<field name="sequence" eval="10"/>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 43e8906..db23a6a 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -139,13 +139,6 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr ""
msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-
-msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
@@ -381,6 +374,11 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Сметка"
+#, fuzzy
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Баланс"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr "Създадено на"
@@ -789,6 +787,34 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr "Променено от"
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr ""
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Финансова година"
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Дневник"
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Период"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr "Финансова година за затваряне"
@@ -801,10 +827,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Активен"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Централизирано копие"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Код"
@@ -1021,10 +1043,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr "Променено от"
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Централизиран ред"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr "Създадено на"
@@ -1238,6 +1256,16 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Сметка"
+#, fuzzy
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Сума"
+
+#, fuzzy
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Дата"
@@ -1342,8 +1370,9 @@ msgctxt "field:account.open_chart.start,id:"
msgid "ID"
msgstr "ID"
+#, fuzzy
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
+msgid "Posted Moves"
msgstr "Публикувано движение"
msgctxt "field:account.open_income_statement.start,company:"
@@ -1590,9 +1619,10 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Родител"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
-msgstr "Процент"
+#, fuzzy
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
+msgstr "Отношение"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -2085,9 +2115,10 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Родител"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
-msgstr "Процент"
+#, fuzzy
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
+msgstr "Отношение"
msgctxt "field:account.tax.template,rec_name:"
msgid "Name"
@@ -2217,8 +2248,9 @@ msgctxt "help:account.open_chart.start,fiscalyear:"
msgid "Leave empty for all open fiscal year"
msgstr "Оставете празно за всички отворени финансови години"
+#, fuzzy
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr "Показване само на публикувани движения"
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2269,10 +2301,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Обикновенно 1 или -1"
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "В %"
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "За подреждане на данъците"
@@ -2467,6 +2495,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Финансова година - Ред от движение"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
msgstr "Затваряне на финансова година"
@@ -2684,6 +2716,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Видове сметки"
+msgctxt "model:ir.action,name:act_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Затваряне на финансова година"
@@ -2954,6 +2990,10 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr "Хронологичен баланс"
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr "Графики"
@@ -3741,6 +3781,10 @@ msgstr ""
"Вече може да създадете сметкоплан за вашата фирма избирайки сметкоплан от "
"шаблон"
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
msgstr "Затваряне на финансова година"
@@ -4011,6 +4055,10 @@ msgid "Tax Rules"
msgstr "Правила за данък"
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr "Код"
@@ -4035,6 +4083,10 @@ msgid "Taxes Templates"
msgstr "Шаблони на данъци"
msgctxt "view:account.tax:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr "Код"
@@ -4102,6 +4154,16 @@ msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr "Отказ"
+#, fuzzy
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "Добре"
+
+#, fuzzy
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Отказване"
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Затваряне"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 217bc68..a20780e 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -21,16 +21,16 @@ msgstr "No podeu esborrar comptes que tenen fills."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" have the same post move sequence."
msgstr ""
-"L'any fiscal \"%(first)s\" i \"%(second)s\" tenen la mateixa seqüència "
+"L'exercici fiscal \"%(first)s\" i \"%(second)s\" tenen la mateixa seqüència "
"d'assentament confirmat."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" overlap."
-msgstr "L'any fiscal \"%(first)s\" i \"%(second)s\" se sobreposen."
+msgstr "L'exercici fiscal \"%(first)s\" i \"%(second)s\" es sobreposen."
msgctxt "error:account.fiscalyear:"
msgid "No fiscal year defined for \"%s\"."
-msgstr "No s'ha definit un any fiscal per \"%s\"."
+msgstr "No s'ha definit un exercici fiscal per \"%s\"."
msgctxt "error:account.fiscalyear:"
msgid "The balance of the account \"%s\" must be zero."
@@ -39,7 +39,7 @@ msgstr "El balanç del compte \"%s\" ha de ser zero."
msgctxt "error:account.fiscalyear:"
msgid "You can not change the post move sequence in fiscal year \"%s\"."
msgstr ""
-"No podeu canviar la seqüència d'assentaments confirmats a l'any fiscal "
+"No podeu canviar la seqüència d'assentaments confirmats a l'exercici fiscal "
"\"%s\"."
msgctxt "error:account.fiscalyear:"
@@ -47,16 +47,16 @@ msgid ""
"You can not close fiscal year \"%s\" until you close all previous fiscal "
"years."
msgstr ""
-"No podeu tancar l'any fiscal \"%s\" fins que tanqueu tots els anys fiscals "
-"previs."
+"No podeu tancar l'exercici fiscal \"%s\" fins que tanqueu tots els exercicis"
+" fiscals anteriors."
msgctxt "error:account.fiscalyear:"
msgid ""
"You can not reopen fiscal year \"%s\" until you reopen all later fiscal "
"years."
msgstr ""
-"No podeu re-obrir l'any fiscal \"%s\" fins que re-obriu tots els anys "
-"fiscals posteriors."
+"No podeu reobrir l'exercici fiscal \"%s\" fins que reobriu tots els "
+"exercicis fiscals posteriors."
msgctxt "error:account.journal.period:"
msgid "You can not create a journal - period on closed period \"%s\"."
@@ -109,7 +109,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\" perque està "
+"No podeu crear una línia de moviment amb el compte \"%s\" perquè està "
"inactiu."
msgctxt "error:account.move.line:"
@@ -163,19 +163,9 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "No podeu concilar l'apunt \"%s\" perquè no està en un estat correcte."
msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-"No es pot crear l'apunt \"%(move)s\" perquè ja hi ha un apunt al diari "
-"\"%(journal)\" i no podeu crear més d'un apunt per període a un diari "
-"centralitzat."
-
-msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
-"No es pot crear línies d'apunts de diferents companyies a l'assentament "
+"No es pot crear línies d'apunts de diferents empreses a l'assentament "
"\"%s\"."
msgctxt "error:account.move:"
@@ -183,7 +173,7 @@ msgid ""
"You can not create move \"%(move)s\" because it's date is outside its "
"period."
msgstr ""
-"No podeu crear el moviment \"%(move)s\" perque la data es troba fora del "
+"No podeu crear el moviment \"%(move)s\" perquè la data es troba fora del "
"període."
msgctxt "error:account.move:"
@@ -234,7 +224,9 @@ msgstr ""
msgctxt "error:account.period:"
msgid "Dates of period \"%s\" are outside are outside it's fiscal year dates."
-msgstr "Les dates del període \"%s\" estan fora de les dates del seu any fiscal."
+msgstr ""
+"Les dates del període \"%s\" estan fora de les dates del seu exercici "
+"fiscal."
msgctxt "error:account.period:"
msgid "No period defined for date \"%s\"."
@@ -250,7 +242,7 @@ msgid ""
" already posted moves in the period."
msgstr ""
"No podeu canviar la seqüència d'assentaments confirmats del període \"%s\" "
-"perquè ja hi han assentaments confirmats al període."
+"perquè ja hi ha assentaments confirmats al període."
msgctxt "error:account.period:"
msgid ""
@@ -262,7 +254,7 @@ msgstr ""
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
-msgstr "No podeu crear un període a l'any fiscal \"%s\" perquè està tancat."
+msgstr "No podeu crear un període a l'exercici fiscal \"%s\" perquè està tancat."
msgctxt "error:account.period:"
msgid "You can not modify/delete period \"%s\" because it has moves."
@@ -273,7 +265,7 @@ msgid ""
"You can not open period \"%(period)s\" because its fiscal year "
"\"%(fiscalyear)s\" is closed."
msgstr ""
-"No podeu obrir el període \"%(period)s\" perquè el seu any fiscal "
+"No podeu obrir el període \"%(period)s\" perquè el seu exercici fiscal "
"\"%(fiscalyear)s\" està tancat."
msgctxt "field:account.account,active:"
@@ -424,6 +416,10 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Compte"
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Saldo"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr "Data creació"
@@ -832,6 +828,30 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr "Compte haver"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr "Compte deure "
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Exercici fiscal"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Diari"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Període"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr "Exercici fiscal a tancar"
@@ -844,10 +864,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Actiu"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Contrapartida centralitzada"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Codi"
@@ -1064,10 +1080,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Línia centralitzada"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr "Data creació"
@@ -1276,6 +1288,14 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Compte"
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Import"
+
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimals de moneda"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Data"
@@ -1381,8 +1401,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
-msgstr "Assentament confirmat"
+msgid "Posted Moves"
+msgstr "Assentaments confirmats"
msgctxt "field:account.open_income_statement.start,company:"
msgid "Company"
@@ -1628,9 +1648,9 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Pare"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
-msgstr "Percentatge"
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
+msgstr "Ràtio"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -2120,9 +2140,9 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Pare"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
-msgstr "Percentatge"
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
+msgstr "Ràtio"
msgctxt "field:account.tax.template,rec_name:"
msgid "Name"
@@ -2251,8 +2271,8 @@ msgid "Leave empty for all open fiscal year"
msgstr "Deixeu-lo buit per tots els exercicis fiscals oberts."
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
-msgstr "Mostra només assentaments confirmats."
+msgid "Show posted moves only"
+msgstr "Mostra només assentaments confirmats"
msgctxt "help:account.open_income_statement.start,posted:"
msgid "Show only posted move"
@@ -2302,10 +2322,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Normalment 1 o -1."
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "En %."
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "Serveix per ordenar els impostos."
@@ -2500,6 +2516,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Exercici fiscal - Apunt"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr "Crea l'assentament de regularització"
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
msgstr "Tanca exercici fiscal"
@@ -2716,6 +2736,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Tipus de compte"
+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_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Tanca exercici fiscal"
@@ -2985,6 +3009,10 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr "Balanç històric"
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Crea l'assentament de regularització"
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr "Plans comptables"
@@ -3757,6 +3785,10 @@ msgstr ""
"Ara podeu crear un pla comptable per a la seva empresa seleccionant una "
"plantilla de pla comptable."
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr "Crea l'assentament de regularització"
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
msgstr "Tanca exercici fiscal"
@@ -4026,6 +4058,10 @@ msgid "Tax Rules"
msgstr "Regles d'impost"
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr "Codi"
@@ -4050,6 +4086,10 @@ msgid "Taxes Templates"
msgstr "Plantilles d'impost"
msgctxt "view:account.tax:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr "Codi"
@@ -4111,12 +4151,20 @@ msgstr "Cancel·la"
msgctxt "wizard_button:account.create_chart,start,account:"
msgid "Ok"
-msgstr "D'acord"
+msgstr "Accepta"
msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr "Cancel·la"
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "Accepta"
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Cancel·la"
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Tanca"
@@ -4231,4 +4279,4 @@ msgstr "Actualitza"
msgctxt "wizard_button:account.update_chart,succeed,end:"
msgid "Ok"
-msgstr "D'acord"
+msgstr "Accepta"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 4a456f0..14eb309 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -139,13 +139,6 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr ""
msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-
-msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
@@ -381,6 +374,10 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr ""
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr ""
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr ""
@@ -789,6 +786,30 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr ""
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr ""
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr ""
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr ""
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr ""
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr ""
@@ -801,10 +822,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr ""
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr ""
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr ""
@@ -1021,10 +1038,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr ""
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr ""
@@ -1233,6 +1246,14 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr ""
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr ""
+
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr ""
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr ""
@@ -1338,7 +1359,7 @@ msgid "ID"
msgstr ""
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
+msgid "Posted Moves"
msgstr ""
msgctxt "field:account.open_income_statement.start,company:"
@@ -1585,8 +1606,8 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr ""
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
msgstr ""
msgctxt "field:account.tax,rec_name:"
@@ -2077,8 +2098,8 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr ""
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
msgstr ""
msgctxt "field:account.tax.template,rec_name:"
@@ -2202,7 +2223,7 @@ msgid "Leave empty for all open fiscal year"
msgstr ""
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr ""
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2253,10 +2274,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr ""
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr ""
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr ""
@@ -2447,6 +2464,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr ""
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
msgstr ""
@@ -2663,6 +2684,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr ""
+msgctxt "model:ir.action,name:act_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr ""
@@ -2932,6 +2957,10 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr ""
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr ""
@@ -3702,6 +3731,10 @@ msgid ""
"of account template."
msgstr ""
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
msgstr ""
@@ -3971,6 +4004,10 @@ msgid "Tax Rules"
msgstr ""
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr ""
@@ -3995,6 +4032,10 @@ msgid "Taxes Templates"
msgstr ""
msgctxt "view:account.tax:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr ""
@@ -4062,6 +4103,14 @@ msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr ""
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr ""
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr ""
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 4dc4d77..7460648 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -171,15 +171,6 @@ 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 ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-"Buchungssatz \"%(move)s\" kann nicht angelegt werden, weil schon ein Buchungssatz in Journal \"%(journal)s\" existiert.\n"
-"In einem Abschlussjournal kann nur ein Buchungssatz pro Buchungsperiode angelegt 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 "
@@ -445,6 +436,10 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Konto"
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Saldo"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -853,6 +848,30 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr "Habenkonto"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr "Sollkonto"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Geschäftsjahr"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Journal"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Buchungszeitraum"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr "Abzuschließendes Geschäftsjahr"
@@ -865,10 +884,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Aktiv"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Abschlussbuchung auf Gegenkonto"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Code"
@@ -1085,10 +1100,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Abschlussbuchungszeile"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr "Erstellungsdatum"
@@ -1297,6 +1308,14 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Konto"
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Währung (signifikante Stellen)"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Datum"
@@ -1402,7 +1421,7 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
+msgid "Posted Moves"
msgstr "Nur festgeschriebene Buchungen"
msgctxt "field:account.open_income_statement.start,company:"
@@ -1649,8 +1668,8 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Übergeordnet (Steuer)"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
msgstr "Prozentsatz"
msgctxt "field:account.tax,rec_name:"
@@ -2141,8 +2160,8 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Übergeordnet (Steuervorlage)"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
msgstr "Prozentsatz"
msgctxt "field:account.tax.template,rec_name:"
@@ -2270,7 +2289,7 @@ msgid "Leave empty for all open fiscal year"
msgstr "Leer lassen für alle offenen Geschäftsjahre"
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr "Nur festgeschriebene Buchungen anzeigen"
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2321,10 +2340,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Üblicherweise 1 oder -1"
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "In %"
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "Wird für die Reihenfolge der Steuern verwendet"
@@ -2520,6 +2535,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Geschäftsjahr - Buchungszeile"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr "Abgleich Saldenvortrag"
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
msgstr "Geschäftsjahr abschließen"
@@ -2736,6 +2755,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Kontentypen"
+msgctxt "model:ir.action,name:act_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Abgleich Saldenvortrag"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Geschäftsjahr abschließen"
@@ -2830,11 +2853,11 @@ msgstr "Buchungszeiträume abschließen"
msgctxt "model:ir.action,name:act_period_form"
msgid "Periods"
-msgstr "Lagerperioden"
+msgstr "Buchungszeiträume"
msgctxt "model:ir.action,name:act_period_form2"
msgid "Periods"
-msgstr "Lagerperioden"
+msgstr "Buchungszeiträume"
msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
@@ -3005,6 +3028,10 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr "Fälligkeitsliste drucken"
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Abgleich Saldenvortrag"
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr "Konten und Tabellen"
@@ -3777,6 +3804,10 @@ msgstr ""
"Sie können nun einen Kontenplan für Ihr Unternehmen erstellen, indem Sie "
"eine Kontenplanvorlage auswählen."
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr "Abgleich Saldenvortrag"
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
msgstr "Geschäftsjahr abschließen"
@@ -4046,6 +4077,10 @@ msgid "Tax Rules"
msgstr "Steuerregeln"
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr "Kennziffer"
@@ -4070,6 +4105,10 @@ msgid "Taxes Templates"
msgstr "Steuervorlagen"
msgctxt "view:account.tax:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr "Kennziffern"
@@ -4137,6 +4176,14 @@ msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr "Abbrechen"
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "OK"
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Abbrechen"
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Schließen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 9ac955d..ce7f7a0 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -4,11 +4,11 @@ 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 "El aplazamiento debe ser único por cuenta y ejercicio fiscal."
+msgstr "El cierre debe ser único por cuenta y ejercicio fiscal."
msgctxt "error:account.account.deferral:"
msgid "You can not modify Account Deferral records"
-msgstr "No puede modificar los registros de cuentas aplazadas."
+msgstr "No puede modificar los registros del cierre contable."
msgctxt "error:account.account:"
msgid "You can not delete account \"%s\" because it has move lines."
@@ -161,16 +161,6 @@ msgstr ""
"No puede conciliar el apunte «%s» porque no está en un estado correcto."
msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-"No se puede crear el asiento «%(move)s» porque ya hay un asiento en el "
-"diario «%(journal)s» y no puede crear más de un asiento por período en un "
-"diario centralizado."
-
-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 "
@@ -309,11 +299,11 @@ msgstr "Haber"
msgctxt "field:account.account,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:account.account,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:account.account,debit:"
msgid "Debit"
@@ -321,11 +311,11 @@ msgstr "Debe"
msgctxt "field:account.account,deferral:"
msgid "Deferral"
-msgstr "Aplazar"
+msgstr "Cierre"
msgctxt "field:account.account,deferrals:"
msgid "Deferrals"
-msgstr "Aplazadas"
+msgstr "Cierres"
msgctxt "field:account.account,id:"
msgid "ID"
@@ -365,7 +355,7 @@ msgstr "Derecha"
msgctxt "field:account.account,second_currency:"
msgid "Secondary Currency"
-msgstr "Divisa secundaria"
+msgstr "Moneda secundaria"
msgctxt "field:account.account,taxes:"
msgid "Default Taxes"
@@ -423,6 +413,10 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Cuenta"
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Saldo"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -437,7 +431,7 @@ msgstr "Haber"
msgctxt "field:account.account.deferral,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:account.account.deferral,debit:"
msgid "Debit"
@@ -481,7 +475,7 @@ msgstr "Usuario creación"
msgctxt "field:account.account.template,deferral:"
msgid "Deferral"
-msgstr "Aplazar"
+msgstr "Cierre"
msgctxt "field:account.account.template,id:"
msgid "ID"
@@ -581,7 +575,7 @@ msgstr "Usuario creación"
msgctxt "field:account.account.type,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:account.account.type,display_balance:"
msgid "Display Balance"
@@ -831,6 +825,30 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr "Cuenta crédito"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr "Cuenta débito"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Ejercicio Fiscal"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Diario"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Período"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr "Ejercicio fiscal a cerrar"
@@ -843,10 +861,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Contrapartida centralizada"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Código"
@@ -861,7 +875,7 @@ msgstr "Usuario creación"
msgctxt "field:account.journal,credit_account:"
msgid "Default Credit Account"
-msgstr "Cuenta haber por defecto"
+msgstr "Cuenta crédito por defecto"
msgctxt "field:account.journal,debit_account:"
msgid "Default Debit Account"
@@ -1063,10 +1077,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Línea centralizada"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -1137,7 +1147,7 @@ msgstr "Cuenta"
msgctxt "field:account.move.line,amount_second_currency:"
msgid "Amount Second Currency"
-msgstr "Importe divisa secundaria"
+msgstr "Importe moneda secundaria"
msgctxt "field:account.move.line,create_date:"
msgid "Create Date"
@@ -1153,7 +1163,7 @@ msgstr "Haber"
msgctxt "field:account.move.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:account.move.line,date:"
msgid "Effective Date"
@@ -1209,11 +1219,11 @@ msgstr "Conciliación"
msgctxt "field:account.move.line,second_currency:"
msgid "Second Currency"
-msgstr "Segunda divisa"
+msgstr "Segunda moneda"
msgctxt "field:account.move.line,second_currency_digits:"
msgid "Second Currency Digits"
-msgstr "Decimales divisa secundaria"
+msgstr "Decimales moneda secundaria"
msgctxt "field:account.move.line,state:"
msgid "State"
@@ -1275,6 +1285,14 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Cuenta"
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Importe"
+
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígitos de moneda"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Fecha"
@@ -1380,7 +1398,7 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
+msgid "Posted Moves"
msgstr "Asiento confirmado"
msgctxt "field:account.open_income_statement.start,company:"
@@ -1585,7 +1603,7 @@ msgstr "Signo del impuesto de la nota de crédito"
msgctxt "field:account.tax,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:account.tax,description:"
msgid "Description"
@@ -1627,9 +1645,9 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
+msgstr "Tasa de cambio"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -1681,7 +1699,7 @@ msgstr "Usuario creación"
msgctxt "field:account.tax.code,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:account.tax.code,description:"
msgid "Description"
@@ -1837,7 +1855,7 @@ msgstr "Usuario creación"
msgctxt "field:account.tax.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:account.tax.line,id:"
msgid "ID"
@@ -2119,9 +2137,9 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
+msgstr "Tasa de cambio"
msgctxt "field:account.tax.template,rec_name:"
msgid "Name"
@@ -2198,7 +2216,7 @@ msgid ""
"Force all moves for this account \n"
"to have this secondary currency."
msgstr ""
-"Fuerza el uso de esta divisa secundaria \n"
+"Fuerza el uso de esta moneda secundaria \n"
"en todos los asientos de esta cuenta."
msgctxt "help:account.account,taxes:"
@@ -2219,7 +2237,7 @@ 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 "El importe expresado en la divisa secundaria."
+msgstr "El importe expresado en la moneda secundaria."
msgctxt "help:account.move.line,maturity_date:"
msgid ""
@@ -2231,7 +2249,7 @@ msgstr ""
msgctxt "help:account.move.line,second_currency:"
msgid "The second currency"
-msgstr "La segunda divisa."
+msgstr "La segunda moneda"
msgctxt "help:account.move.print_general_journal.start,posted:"
msgid "Show only posted move"
@@ -2250,7 +2268,7 @@ msgid "Leave empty for all open fiscal year"
msgstr "Dejarlo vacío para abrir todos los ejercicios fiscales."
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr "Muestra sólo asientos confirmados."
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2279,7 +2297,7 @@ msgstr "Muestra sólo asientos confirmados."
msgctxt "help:account.tax,amount:"
msgid "In company's currency"
-msgstr "En la divisa de la empresa."
+msgstr "En la moneda de la empresa."
msgctxt "help:account.tax,credit_note_base_sign:"
msgid "Usualy 1 or -1"
@@ -2301,10 +2319,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Normalmente 1 o -1."
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "En %"
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "Usar para ordenar los impuestos."
@@ -2353,7 +2367,7 @@ msgstr "Cuenta - Impuesto"
msgctxt "model:account.account.deferral,name:"
msgid "Account Deferral"
-msgstr "Cuenta de aplazamiento"
+msgstr "Cierre contable"
msgctxt "model:account.account.template,name:"
msgid "Account Template"
@@ -2502,6 +2516,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Ejercicio fiscal - Línea de asiento"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr "Crear asiento de regularización"
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
msgstr "Cerrar ejercicio fiscal"
@@ -2718,6 +2736,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Tipos de cuenta"
+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_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Cerrar ejercicio fiscal"
@@ -2987,6 +3009,10 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr "Balance histórico"
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Crear asiento de regularización"
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr "Planes contables"
@@ -3677,11 +3703,11 @@ msgstr "Porcentaje"
msgctxt "view:account.account.deferral:"
msgid "Account Deferral"
-msgstr "Aplazar cuenta"
+msgstr "Cierre contable"
msgctxt "view:account.account.deferral:"
msgid "Account Deferrals"
-msgstr "Aplazamientos de cuenta"
+msgstr "Cierres contables"
msgctxt "view:account.account.template:"
msgid "Account Template"
@@ -3759,6 +3785,10 @@ msgstr ""
"Ahora puede crear un plan contable para su empresa seleccionando una "
"plantilla de plan contable."
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr "Crear asiento de regularización"
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
msgstr "Cerrar ejercicio fiscal"
@@ -4028,6 +4058,10 @@ msgid "Tax Rules"
msgstr "Reglas de impuesto"
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr "Código"
@@ -4052,6 +4086,10 @@ msgid "Taxes Templates"
msgstr "Plantillas de impuesto"
msgctxt "view:account.tax:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr "Código"
@@ -4119,6 +4157,14 @@ msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "Aceptar"
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Cerrar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 586fc1f..00622fb 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -165,16 +165,6 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "No puede conciliar líneas \"%s\" porque no está en en un estado válido."
msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-"El asiento \"%(move)s\" no puede ser creado porque actualmente hay un "
-"asiento en el libro diario \"%(journal)s\" y usted no puede crear mas de un "
-"asiento por periodo en un libro diario centralizado."
-
-msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
"No puede crear lineas en facturas de diferentes compañias en el asiento "
@@ -426,6 +416,10 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Cuenta"
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Saldo"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
@@ -596,7 +590,7 @@ msgstr "ID"
msgctxt "field:account.account.type,income_statement:"
msgid "Income Statement"
-msgstr "Pérdidas y Ganancias"
+msgstr "Estado de Resultados"
msgctxt "field:account.account.type,name:"
msgid "Name"
@@ -652,7 +646,7 @@ msgstr "ID"
msgctxt "field:account.account.type.template,income_statement:"
msgid "Income Statement"
-msgstr "Pérdidas y Ganancias"
+msgstr "Estado de Resultados"
msgctxt "field:account.account.type.template,name:"
msgid "Name"
@@ -834,6 +828,30 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr "Cuenta Crédito"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr "Cuenta Débito"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Año Fiscal"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Libro Diario"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Período"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr "Año fiscal a cerrar"
@@ -846,10 +864,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Contrapartida Centralizada"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Código"
@@ -1066,10 +1080,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Línea Centralizada"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
@@ -1112,7 +1122,7 @@ msgstr "Período"
msgctxt "field:account.move,post_date:"
msgid "Post Date"
-msgstr "Fecha confirmación"
+msgstr "Fecha Confirmación"
msgctxt "field:account.move,post_number:"
msgid "Post Number"
@@ -1278,6 +1288,14 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Cuenta"
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Valor"
+
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de Moneda"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Fecha"
@@ -1383,7 +1401,7 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
+msgid "Posted Moves"
msgstr "Asiento Confirmado"
msgctxt "field:account.open_income_statement.start,company:"
@@ -1630,9 +1648,9 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
+msgstr "Tasa de Cambio"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -2122,9 +2140,9 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
+msgstr "Tasa de Cambio"
msgctxt "field:account.tax.template,rec_name:"
msgid "Name"
@@ -2253,7 +2271,7 @@ msgid "Leave empty for all open fiscal year"
msgstr "Dejarlo vacío para abrir todos los años fiscales."
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr "Muestra sólo asientos confirmados."
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2304,10 +2322,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Normalmente 1 o -1."
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "En %"
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "Usar para ordenar los impuestos."
@@ -2504,6 +2518,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Año fiscal - Línea de asiento"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr "Balance No-Diferido"
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
msgstr "Cerrar Año Fiscal"
@@ -2598,7 +2616,7 @@ msgstr "Desconciliar líneas"
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
-msgstr "Abrir Balance Histórico"
+msgstr "Abrir Cartera Vencida"
msgctxt "model:account.open_balance_sheet.start,name:"
msgid "Open Balance Sheet"
@@ -2610,7 +2628,7 @@ msgstr "Abrir Plan de Cuentas"
msgctxt "model:account.open_income_statement.start,name:"
msgid "Open Income Statement"
-msgstr "Abrir Pérdidas y Ganancias"
+msgstr "Abrir Estado de Resultados"
msgctxt "model:account.open_third_party_balance.start,name:"
msgid "Open Third Party Balance"
@@ -2686,7 +2704,7 @@ msgstr "Balance General"
msgctxt "model:ir.action,name:act_account_income_statement_tree"
msgid "Income Statement"
-msgstr "Pérdidas y Ganancias"
+msgstr "Estado de Resultados"
msgctxt "model:ir.action,name:act_account_list"
msgid "Accounts"
@@ -2720,6 +2738,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Tipos de cuenta"
+msgctxt "model:ir.action,name:act_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Balance No-Diferido"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Cerrar Año Fiscal"
@@ -2878,7 +2900,7 @@ msgstr "Desconciliar líneas"
msgctxt "model:ir.action,name:report_aged_balance"
msgid "Aged Balance"
-msgstr "Balance Histórico"
+msgstr "Cartera Vencida"
msgctxt "model:ir.action,name:report_general_journal"
msgid "General Journal"
@@ -2902,7 +2924,7 @@ msgstr "Crear Plan de Cuentas desde Plantilla"
msgctxt "model:ir.action,name:wizard_open_aged_balance"
msgid "Open Aged Balance"
-msgstr "Abrir Balance Histórico"
+msgstr "Abrir Cartera Vencida"
msgctxt "model:ir.action,name:wizard_open_balance_sheet"
msgid "Open Balance Sheet"
@@ -2910,7 +2932,7 @@ msgstr "Abrir Balance General"
msgctxt "model:ir.action,name:wizard_open_income_statement"
msgid "Open Income Statement"
-msgstr "Abrir Pérdidas y Ganancias"
+msgstr "Abrir Estado de Resultados"
msgctxt "model:ir.action,name:wizard_open_third_party_balance"
msgid "Open Third Party Balance"
@@ -2955,7 +2977,7 @@ msgstr "Conciliación de Asiento"
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
-msgstr "Contabilidad"
+msgstr "Gestión Financiera"
msgctxt "model:ir.ui.menu,name:menu_account_configuration"
msgid "Configuration"
@@ -2979,7 +3001,7 @@ msgstr "Tipos de cuenta"
msgctxt "model:ir.ui.menu,name:menu_account_type_template_tree"
msgid "Account Type Templates"
-msgstr "Plantillas deTipo de Cuenta"
+msgstr "Plantillas de Tipo de Cuenta"
msgctxt "model:ir.ui.menu,name:menu_account_type_tree"
msgid "Account Types"
@@ -2987,7 +3009,11 @@ msgstr "Tipos de Cuenta"
msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
-msgstr "Balance Histórico"
+msgstr "Cartera Vencida"
+
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Balance No-Diferido"
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
@@ -3019,7 +3045,7 @@ msgstr "Años Fiscales"
msgctxt "model:ir.ui.menu,name:menu_general_account_configuration"
msgid "General Account"
-msgstr "Cuenta General"
+msgstr "Cuentas"
msgctxt "model:ir.ui.menu,name:menu_journal_configuration"
msgid "Journals"
@@ -3063,7 +3089,7 @@ msgstr "Abrir Plan de Cuentas"
msgctxt "model:ir.ui.menu,name:menu_open_income_statement"
msgid "Income Statement"
-msgstr "Pérdidas y Ganancias"
+msgstr "Estado de Resultados"
msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
@@ -3167,15 +3193,15 @@ msgstr "/"
msgctxt "odt:account.aged_balance:"
msgid "Aged Balance for Customers"
-msgstr "Balance Histórico de Clientes"
+msgstr "Cartera Vencida de Clientes"
msgctxt "odt:account.aged_balance:"
msgid "Aged Balance for Suppliers"
-msgstr "Balance Histórico de Proveedores"
+msgstr "Cartera Vencida de Proveedores"
msgctxt "odt:account.aged_balance:"
msgid "Aged Balance for Suppliers and Customers"
-msgstr "Balance Histórico de Clientes y Proveedores"
+msgstr "Cartera Vencida de Clientes y Proveedores"
msgctxt "odt:account.aged_balance:"
msgid "Company:"
@@ -3247,7 +3273,7 @@ msgstr "Debe"
msgctxt "odt:account.general_ledger:"
msgid "Descr."
-msgstr ""
+msgstr "Descr."
msgctxt "odt:account.general_ledger:"
msgid "From Period:"
@@ -3257,16 +3283,14 @@ msgctxt "odt:account.general_ledger:"
msgid "General Ledger"
msgstr "Libro Mayor"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Move"
-msgstr "Movimiento"
+msgstr "Asiento"
msgctxt "odt:account.general_ledger:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Origin"
msgstr "Origen"
@@ -3319,7 +3343,6 @@ msgctxt "odt:account.move.general_journal:"
msgid "Debit"
msgstr "Debe"
-#, fuzzy
msgctxt "odt:account.move.general_journal:"
msgid "Description"
msgstr "Descripción"
@@ -3342,7 +3365,7 @@ msgstr "Asiento de Libro Diario:"
msgctxt "odt:account.move.general_journal:"
msgid "Origin:"
-msgstr ""
+msgstr "Origen:"
msgctxt "odt:account.move.general_journal:"
msgid "Posted"
@@ -3718,7 +3741,7 @@ msgstr "Balance General"
msgctxt "view:account.account.type:"
msgid "Income Statement"
-msgstr "Pérdidas y Ganancias"
+msgstr "Estado de Resultados"
msgctxt "view:account.account:"
msgid "Account"
@@ -3726,7 +3749,7 @@ msgstr "Cuenta"
msgctxt "view:account.account:"
msgid "Accounts"
-msgstr "Cuentas"
+msgstr "Plan de Cuentas"
msgctxt "view:account.account:"
msgid "Deferrals"
@@ -3764,6 +3787,10 @@ msgstr ""
"Ahora puede crear un plan de cuentas para su Compañia seleccionando una "
"plantilla de plan de cuentas."
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr "Balance No-Diferido"
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
msgstr "Cerrar Año Fiscal"
@@ -3782,7 +3809,7 @@ msgstr "Crear Períodos Trimestrales"
msgctxt "view:account.fiscalyear:"
msgid "Create Monthly Periods"
-msgstr "Crear Perodos Mensuales"
+msgstr "Crear Períodos Mensuales"
msgctxt "view:account.fiscalyear:"
msgid "Fiscal Year"
@@ -3910,7 +3937,7 @@ msgstr "Confirmar"
msgctxt "view:account.open_aged_balance.start:"
msgid "Open Aged Balance"
-msgstr "Abrir Balance Histórico"
+msgstr "Abrir Cartera Vencida"
msgctxt "view:account.open_aged_balance.start:"
msgid "Terms"
@@ -3926,7 +3953,7 @@ msgstr "Abrir Plan de Cuentas"
msgctxt "view:account.open_income_statement.start:"
msgid "Open Income Statement"
-msgstr "Abrir Pérdidas y Ganancias"
+msgstr "Abrir Estado de Resultados"
msgctxt "view:account.open_third_party_balance.start:"
msgid "Open Third Party Balance"
@@ -4033,6 +4060,10 @@ msgid "Tax Rules"
msgstr "Reglas de Impuesto"
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr "Código"
@@ -4057,6 +4088,10 @@ msgid "Taxes Templates"
msgstr "Plantillas de Impuesto"
msgctxt "view:account.tax:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr "Código"
@@ -4124,6 +4159,14 @@ msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "Aceptar"
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Cerrar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index eaa7a6c..6098aae 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -8,7 +8,7 @@ msgstr "El cierre debe ser único por cuenta y ejercicio fiscal."
msgctxt "error:account.account.deferral:"
msgid "You can not modify Account Deferral records"
-msgstr "No puede modificar los registros de cuentas de cierre."
+msgstr "No puede modificar los registros del cierre contable."
msgctxt "error:account.account:"
msgid "You can not delete account \"%s\" because it has move lines."
@@ -21,16 +21,16 @@ msgstr "No puede borrar cuentas que tienen hijas."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" have the same post move sequence."
msgstr ""
-"El año fiscal \"%(first)s\" y \"%(second)s\" tienen la misma secuencia de "
-"asiento confirmado."
+"Los ejercicios fiscales \"%(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 "El año fiscal \"%(first)s\" y \"%(second)s\" se superponen."
+msgstr "Los ejercicios fiscales \"%(first)s\" y \"%(second)s\" se superponen."
msgctxt "error:account.fiscalyear:"
msgid "No fiscal year defined for \"%s\"."
-msgstr "No se ha definido un año fiscal para \"%s\"."
+msgstr "No se ha definido un ejercicio fiscal para \"%s\"."
msgctxt "error:account.fiscalyear:"
msgid "The balance of the account \"%s\" must be zero."
@@ -39,24 +39,24 @@ 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 asientos confirmados en el año fiscal "
-"\"%s\"."
+"No puede cambiar la secuencia de asientos confirmados en el ejercicio fiscal"
+" \"%s\"."
msgctxt "error:account.fiscalyear:"
msgid ""
"You can not close fiscal year \"%s\" until you close all previous fiscal "
"years."
msgstr ""
-"No puede cerrar el año fiscal \"%s\" hasta que cierre todos los años "
-"fiscales previos."
+"No puede cerrar el ejercicio fiscal \"%s\" hasta que cierre todos los "
+"ejercicios fiscales anteriores."
msgctxt "error:account.fiscalyear:"
msgid ""
"You can not reopen fiscal year \"%s\" until you reopen all later fiscal "
"years."
msgstr ""
-"No puede reabrir el año fiscal \"%s\" hasta que reabra todos los años "
-"fiscales posteriores."
+"No puede reabrir el ejercicio fiscal \"%s\" hasta que reabra todos los "
+"ejercicios fiscales posteriores."
msgctxt "error:account.journal.period:"
msgid "You can not create a journal - period on closed period \"%s\"."
@@ -104,7 +104,8 @@ msgctxt "error:account.move.line:"
msgid ""
"You can not create a move line with account \"%s\" because it is a view "
"account."
-msgstr "No puede crear un apunte con cuenta \"%s\" porque es una cuenta de vista."
+msgstr ""
+"No puede crear un apunte con cuenta \"%s\" porque es una cuenta tipo vista."
msgctxt "error:account.move.line:"
msgid "You can not create a move line with account \"%s\" because it is inactive."
@@ -160,19 +161,9 @@ 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 ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-"No se puede crear el asiento \"%(move)s\" porque ya hay un asiento en el "
-"diario \"%(journal)s\" y no puede crear más de un asiento por período en un "
-"diario centralizado."
-
-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 "
+"No puede crear líneas con cuentas de diferentes empresas en el asiento "
"\"%s\"."
msgctxt "error:account.move:"
@@ -226,12 +217,12 @@ msgid ""
"Company of sequence \"%(sequence)s\" does not match the company of period "
"\"%(period)s\" to which it is assigned to."
msgstr ""
-"La empresa de secuencia \"%(sequence)s\" no coincide con la empresa del "
+"La empresa de la secuencia \"%(sequence)s\" no coincide con la empresa del "
"período \"%(period)s\" a la que está asignada."
msgctxt "error:account.period:"
msgid "Dates of period \"%s\" are outside are outside it's fiscal year dates."
-msgstr "Las fechas del período \"%s\" están fuera de las fechas de su año fiscal."
+msgstr "Las fechas del período \"%s\" están fuera de su ejercicio fiscal."
msgctxt "error:account.period:"
msgid "No period defined for date \"%s\"."
@@ -259,7 +250,8 @@ msgstr ""
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 está cerrado."
+msgstr ""
+"No puede crear un período en el ejercicio fiscal \"%s\" porque está cerrado."
msgctxt "error:account.period:"
msgid "You can not modify/delete period \"%s\" because it has moves."
@@ -270,7 +262,7 @@ msgid ""
"You can not open period \"%(period)s\" because its fiscal year "
"\"%(fiscalyear)s\" is closed."
msgstr ""
-"No puede abrir el período \"%(period)s\" porque su año fiscal "
+"No puede abrir el período \"%(period)s\" porque su ejercicio fiscal "
"\"%(fiscalyear)s\" está cerrado."
msgctxt "field:account.account,active:"
@@ -421,6 +413,10 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Cuenta"
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Saldo"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -829,6 +825,30 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr "Cuenta haber"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr "Cuenta debe"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Ejercicio fiscal"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Diario"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Período"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr "Ejercicio fiscal a cerrar"
@@ -841,10 +861,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Contrapartida centralizada"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Código"
@@ -1061,10 +1077,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Línea centralizada"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr "Fecha creación"
@@ -1273,6 +1285,14 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Cuenta"
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Importe"
+
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de moneda"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Fecha"
@@ -1378,7 +1398,7 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
+msgid "Posted Moves"
msgstr "Asiento confirmado"
msgctxt "field:account.open_income_statement.start,company:"
@@ -1625,8 +1645,8 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
msgstr "Porcentaje"
msgctxt "field:account.tax,rec_name:"
@@ -2117,8 +2137,8 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
msgstr "Porcentaje"
msgctxt "field:account.tax.template,rec_name:"
@@ -2248,7 +2268,7 @@ msgid "Leave empty for all open fiscal year"
msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr "Muestra sólo asientos confirmados."
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2299,10 +2319,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Normalmente 1 o -1."
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "En %."
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "Sirve para ordenar los impuestos."
@@ -2500,6 +2516,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Ejercicio fiscal - Apunte"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr "Crear asiento de regularización"
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
msgstr "Cerrar ejercicio fiscal"
@@ -2716,6 +2736,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Tipos de cuenta"
+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_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Cerrar ejercicio fiscal"
@@ -2985,6 +3009,10 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr "Balance histórico"
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Crear asiento de regularización"
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr "Planes contables"
@@ -3757,6 +3785,10 @@ msgstr ""
"Ahora puede crear un plan contable para su empresa seleccionando una "
"plantilla de plan contable."
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr "Crear asiento de regularización"
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
msgstr "Cerrar ejercicio fiscal"
@@ -4026,6 +4058,10 @@ msgid "Tax Rules"
msgstr "Reglas de impuesto"
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr "Código"
@@ -4050,6 +4086,10 @@ msgid "Taxes Templates"
msgstr "Plantillas de impuesto"
msgctxt "view:account.tax:"
+msgid "%"
+msgstr "%"
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr "Código"
@@ -4117,6 +4157,14 @@ msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr "Cancelar"
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "Aceptar"
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Cerrar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 04a0343..f296133 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -7,14 +7,6 @@ msgid "Deferral must be unique by account and fiscal year"
msgstr "Le report doit être unique par compte et par année fiscale"
msgctxt "error:account.account.deferral:"
-msgid "Deferral must be unique by account and fiscal year"
-msgstr "Le report doit être unique par compte et par année fiscale"
-
-msgctxt "error:account.account.deferral:"
-msgid "You can not modify Account Deferral records"
-msgstr "Vous ne pouvez pas modifier les enregistrements de report de compte"
-
-msgctxt "error:account.account.deferral:"
msgid "You can not modify Account Deferral records"
msgstr "Vous ne pouvez pas modifier les enregistrements de report de compte"
@@ -183,16 +175,6 @@ msgstr ""
"valide."
msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-"Le mouvement \"%(move)s\" ne peut pas être créé car il y a déjà un mouvement"
-" dans le journal \"%(journal)s\" et vous ne pouvez créer plus d'un mouvement"
-" par période dans un journal centralisé."
-
-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"
@@ -249,8 +231,8 @@ msgid ""
"Company of sequence \"%(sequence)s\" does not match the company of period "
"\"%(period)s\" to which it is assigned to."
msgstr ""
-"La companie de la séquence \"%(sequence)s\" ne correspond à la companie 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."
@@ -286,7 +268,7 @@ 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 "
-"fermée."
+"clôturée."
msgctxt "error:account.period:"
msgid "You can not modify/delete period \"%s\" because it has moves."
@@ -300,7 +282,7 @@ msgid ""
"\"%(fiscalyear)s\" is closed."
msgstr ""
"Vous ne pouvez ouvrir la période \"%(period)s\" car son année fiscale "
-"\"%(fiscalyear)s\" is closed."
+"\"%(fiscalyear)s\" est clôturée."
msgctxt "field:account.account,active:"
msgid "Active"
@@ -450,6 +432,10 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Compte"
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Balance"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -858,6 +844,30 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr "Compte de crédit"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr "Compte de débit"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Année fiscale"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Journal"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Période"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr "Année fiscale à clôturer"
@@ -870,10 +880,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Actif"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Contre partie centralisée"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Code"
@@ -1090,10 +1096,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Ligne centralisée"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr "Date de création"
@@ -1204,7 +1206,7 @@ msgstr "Journal"
msgctxt "field:account.move.line,maturity_date:"
msgid "Maturity Date"
-msgstr "Date de maturité"
+msgstr "Date d'échéance"
msgctxt "field:account.move.line,move:"
msgid "Move"
@@ -1302,6 +1304,14 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Compte"
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Date"
@@ -1407,8 +1417,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
-msgstr "Mouvement posté"
+msgid "Posted Moves"
+msgstr "Mouvements postés"
msgctxt "field:account.open_income_statement.start,company:"
msgid "Company"
@@ -1654,9 +1664,9 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Parent"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
-msgstr "Pourcentage"
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
+msgstr "Taux"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -2146,9 +2156,9 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Parent"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
-msgstr "Pourcentage"
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
+msgstr "Taux"
msgctxt "field:account.tax.template,rec_name:"
msgid "Name"
@@ -2277,7 +2287,7 @@ msgid "Leave empty for all open fiscal year"
msgstr "laisser vide pour toute les années fiscales ouvertes"
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr "Montrer seulement les mouvements postés"
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2328,10 +2338,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Habituellement 1 ou -1"
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "En %"
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "Utilisé pour trier les taxes"
@@ -2490,7 +2496,7 @@ msgstr "Long terme"
msgctxt ""
"model:account.account.type.template,name:account_type_template_minimal"
msgid "Minimal Account Type Chart"
-msgstr "Type de plan comptable minimal"
+msgstr "Plan de type de compte minimal"
msgctxt ""
"model:account.account.type.template,name:account_type_template_off_balance"
@@ -2508,15 +2514,15 @@ msgstr "Configuration comptable"
msgctxt "model:account.create_chart.account,name:"
msgid "Create Chart"
-msgstr "Créer le plan comptable"
+msgstr "Créer un plan"
msgctxt "model:account.create_chart.properties,name:"
msgid "Create Chart"
-msgstr "Créer le plan comptable"
+msgstr "Créer un plan"
msgctxt "model:account.create_chart.start,name:"
msgid "Create Chart"
-msgstr "Créer le plan comptable"
+msgstr "Créer un plan"
msgctxt "model:account.fiscalyear,name:"
msgid "Fiscal Year"
@@ -2526,9 +2532,13 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Année fiscale - Ligne de mouvement"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr "Équilibrer les non-reports"
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
-msgstr "Fermer l'année fiscale"
+msgstr "Clôturer une année fiscale"
msgctxt "model:account.journal,name:"
msgid "Journal"
@@ -2552,7 +2562,7 @@ msgstr "Stock"
msgctxt "model:account.journal.period,name:"
msgid "Journal - Period"
-msgstr "Journal - Période"
+msgstr "Journal - période"
msgctxt "model:account.journal.type,name:"
msgid "Journal Type"
@@ -2600,7 +2610,7 @@ msgstr "Ouvrir le journal - Demande"
msgctxt "model:account.move.open_reconcile_lines.start,name:"
msgid "Open Reconcile Lines"
-msgstr "Ouvrir les lignes réconciliées"
+msgstr "Ouvrir les lignes à réconcilier"
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
@@ -2660,7 +2670,7 @@ msgstr "Code de taxe"
msgctxt "model:account.tax.code.open_chart.start,name:"
msgid "Open Chart of Tax Codes"
-msgstr "Ouvrir le plan de taxes"
+msgstr "Ouvrir le plan de codes de taxe"
msgctxt "model:account.tax.code.template,name:"
msgid "Tax Code Template"
@@ -2696,11 +2706,11 @@ msgstr "Modèle de compte de taxe"
msgctxt "model:account.update_chart.start,name:"
msgid "Update Chart"
-msgstr "Mise à jour du plan comptable"
+msgstr "Mise à jour d'un plan"
msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
-msgstr "Mise à jour du plan comptable"
+msgstr "Mise à jour d'un plan"
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
@@ -2742,9 +2752,13 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Types de compte"
+msgctxt "model:ir.action,name:act_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Équilibrer les non-reports"
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
-msgstr "Fermer l'année fiscale"
+msgstr "Clôturer une année fiscale"
msgctxt "model:ir.action,name:act_code_tax_open_chart"
msgid "Open Chart of Tax Codes"
@@ -2772,7 +2786,7 @@ msgstr "Journaux - périodes"
msgctxt "model:ir.action,name:act_journal_period_reopen"
msgid "Re-Open Journals - Periods"
-msgstr "Réouvrir les journaux - Périodes"
+msgstr "Réouvrir les journaux - périodes"
msgctxt "model:ir.action,name:act_journal_period_tree"
msgid "Journals - Periods"
@@ -2820,7 +2834,7 @@ msgstr "Ouvrir journal"
msgctxt "model:ir.action,name:act_open_reconcile_lines"
msgid "Open Reconcile Lines"
-msgstr "Ouvrir les lignes réconciliées"
+msgstr "Ouvrir les lignes à réconcilier"
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
@@ -2952,7 +2966,7 @@ msgstr "Imprimer la balance"
msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
-msgstr "Mise à jour du plan comptable depuis un modèle"
+msgstr "Mise à jour d'un plan comptable depuis un modèle"
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
@@ -3011,13 +3025,17 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr "Balance âgée"
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Équilibrer les non-reports"
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr "Plans"
msgctxt "model:ir.ui.menu,name:menu_close_fiscalyear"
msgid "Close Fiscal Year"
-msgstr "Clôturer l'année fiscale"
+msgstr "Clôturer une année fiscale"
msgctxt "model:ir.ui.menu,name:menu_code_tax_open_chart"
msgid "Open Chart of Tax Codes"
@@ -3053,7 +3071,7 @@ msgstr "Journaux"
msgctxt "model:ir.ui.menu,name:menu_journal_period_form"
msgid "Close Journals - Periods"
-msgstr "Fermer Journaux - périodes"
+msgstr "Fermer les journaux - périodes"
msgctxt "model:ir.ui.menu,name:menu_journal_period_tree"
msgid "Journals - Periods"
@@ -3169,7 +3187,7 @@ msgstr "Balance tiers"
msgctxt "model:ir.ui.menu,name:menu_update_chart"
msgid "Update Chart of Accounts from Template"
-msgstr "Mise à jour du plan comptable depuis un modèle"
+msgstr "Mise à jour d'un plan comptable depuis un modèle"
msgctxt "model:ir.ui.menu,name:menuitem_account_configuration"
msgid "Account Configuration"
@@ -3320,14 +3338,6 @@ msgid "/"
msgstr "/"
msgctxt "odt:account.move.general_journal:"
-msgid "/"
-msgstr "/"
-
-msgctxt "odt:account.move.general_journal:"
-msgid "Account"
-msgstr "Compte"
-
-msgctxt "odt:account.move.general_journal:"
msgid "Account"
msgstr "Compte"
@@ -3336,14 +3346,6 @@ msgid "Company:"
msgstr "Société :"
msgctxt "odt:account.move.general_journal:"
-msgid "Company:"
-msgstr "Société :"
-
-msgctxt "odt:account.move.general_journal:"
-msgid "Credit"
-msgstr "Crédit"
-
-msgctxt "odt:account.move.general_journal:"
msgid "Credit"
msgstr "Crédit"
@@ -3352,14 +3354,6 @@ msgid "Date:"
msgstr "Date :"
msgctxt "odt:account.move.general_journal:"
-msgid "Date:"
-msgstr "Date :"
-
-msgctxt "odt:account.move.general_journal:"
-msgid "Debit"
-msgstr "Débit"
-
-msgctxt "odt:account.move.general_journal:"
msgid "Debit"
msgstr "Débit"
@@ -3372,14 +3366,6 @@ msgid "Draft"
msgstr "Brouillon"
msgctxt "odt:account.move.general_journal:"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt "odt:account.move.general_journal:"
-msgid "From Date:"
-msgstr "De la Date :"
-
-msgctxt "odt:account.move.general_journal:"
msgid "From Date:"
msgstr "De la Date :"
@@ -3388,14 +3374,6 @@ msgid "General Journal"
msgstr "Journal général"
msgctxt "odt:account.move.general_journal:"
-msgid "General Journal"
-msgstr "Journal général"
-
-msgctxt "odt:account.move.general_journal:"
-msgid "Journal Entry:"
-msgstr "Entrée journal :"
-
-msgctxt "odt:account.move.general_journal:"
msgid "Journal Entry:"
msgstr "Entrée journal :"
@@ -3408,14 +3386,6 @@ msgid "Posted"
msgstr "Posté"
msgctxt "odt:account.move.general_journal:"
-msgid "Posted"
-msgstr "Posté"
-
-msgctxt "odt:account.move.general_journal:"
-msgid "Print Date:"
-msgstr "Date d'impression :"
-
-msgctxt "odt:account.move.general_journal:"
msgid "Print Date:"
msgstr "Date d'impression :"
@@ -3424,14 +3394,6 @@ msgid "To Date:"
msgstr "À la Date :"
msgctxt "odt:account.move.general_journal:"
-msgid "To Date:"
-msgstr "À la Date :"
-
-msgctxt "odt:account.move.general_journal:"
-msgid "User:"
-msgstr "Utilisateur :"
-
-msgctxt "odt:account.move.general_journal:"
msgid "User:"
msgstr "Utilisateur :"
@@ -3439,10 +3401,6 @@ msgctxt "odt:account.move.general_journal:"
msgid "at"
msgstr "à"
-msgctxt "odt:account.move.general_journal:"
-msgid "at"
-msgstr "à"
-
msgctxt "odt:account.third_party_balance:"
msgid "/"
msgstr "/"
@@ -3548,14 +3506,6 @@ msgid "Expense"
msgstr "Charge"
msgctxt "selection:account.account,kind:"
-msgid "Expense"
-msgstr "Charge"
-
-msgctxt "selection:account.account,kind:"
-msgid "Other"
-msgstr "Autre"
-
-msgctxt "selection:account.account,kind:"
msgid "Other"
msgstr "Autre"
@@ -3564,14 +3514,6 @@ msgid "Payable"
msgstr "À Payer"
msgctxt "selection:account.account,kind:"
-msgid "Payable"
-msgstr "À Payer"
-
-msgctxt "selection:account.account,kind:"
-msgid "Receivable"
-msgstr "À recevoir"
-
-msgctxt "selection:account.account,kind:"
msgid "Receivable"
msgstr "À recevoir"
@@ -3580,10 +3522,6 @@ msgid "Revenue"
msgstr "Produit"
msgctxt "selection:account.account,kind:"
-msgid "Revenue"
-msgstr "Produit"
-
-msgctxt "selection:account.account,kind:"
msgid "Stock"
msgstr "Stock"
@@ -3591,14 +3529,6 @@ msgctxt "selection:account.account,kind:"
msgid "View"
msgstr "Vue"
-msgctxt "selection:account.account,kind:"
-msgid "View"
-msgstr "Vue"
-
-msgctxt "selection:account.account.template,kind:"
-msgid "Expense"
-msgstr "Charge"
-
msgctxt "selection:account.account.template,kind:"
msgid "Expense"
msgstr "Charge"
@@ -3608,14 +3538,6 @@ msgid "Other"
msgstr "Autre"
msgctxt "selection:account.account.template,kind:"
-msgid "Other"
-msgstr "Autre"
-
-msgctxt "selection:account.account.template,kind:"
-msgid "Payable"
-msgstr "À Payer"
-
-msgctxt "selection:account.account.template,kind:"
msgid "Payable"
msgstr "À Payer"
@@ -3624,14 +3546,6 @@ msgid "Receivable"
msgstr "À recevoir"
msgctxt "selection:account.account.template,kind:"
-msgid "Receivable"
-msgstr "À recevoir"
-
-msgctxt "selection:account.account.template,kind:"
-msgid "Revenue"
-msgstr "Produit"
-
-msgctxt "selection:account.account.template,kind:"
msgid "Revenue"
msgstr "Produit"
@@ -3643,14 +3557,6 @@ msgctxt "selection:account.account.template,kind:"
msgid "View"
msgstr "Vue"
-msgctxt "selection:account.account.template,kind:"
-msgid "View"
-msgstr "Vue"
-
-msgctxt "selection:account.account.type,display_balance:"
-msgid "Credit - Debit"
-msgstr "Crédit - Débit"
-
msgctxt "selection:account.account.type,display_balance:"
msgid "Credit - Debit"
msgstr "Crédit - Débit"
@@ -3659,14 +3565,6 @@ msgctxt "selection:account.account.type,display_balance:"
msgid "Debit - Credit"
msgstr "Débit - Crédit"
-msgctxt "selection:account.account.type,display_balance:"
-msgid "Debit - Credit"
-msgstr "Débit - Crédit"
-
-msgctxt "selection:account.account.type.template,display_balance:"
-msgid "Credit - Debit"
-msgstr "Crédit - Débit"
-
msgctxt "selection:account.account.type.template,display_balance:"
msgid "Credit - Debit"
msgstr "Crédit - Débit"
@@ -3675,14 +3573,6 @@ msgctxt "selection:account.account.type.template,display_balance:"
msgid "Debit - Credit"
msgstr "Débit - Crédit"
-msgctxt "selection:account.account.type.template,display_balance:"
-msgid "Debit - Credit"
-msgstr "Débit - Crédit"
-
-msgctxt "selection:account.fiscalyear,state:"
-msgid "Close"
-msgstr "Clôturé"
-
msgctxt "selection:account.fiscalyear,state:"
msgid "Close"
msgstr "Clôturé"
@@ -3691,14 +3581,6 @@ msgctxt "selection:account.fiscalyear,state:"
msgid "Open"
msgstr "Ouverte"
-msgctxt "selection:account.fiscalyear,state:"
-msgid "Open"
-msgstr "Ouverte"
-
-msgctxt "selection:account.journal.period,state:"
-msgid "Close"
-msgstr "Clôturée"
-
msgctxt "selection:account.journal.period,state:"
msgid "Close"
msgstr "Clôturée"
@@ -3707,14 +3589,6 @@ msgctxt "selection:account.journal.period,state:"
msgid "Open"
msgstr "Ouverte"
-msgctxt "selection:account.journal.period,state:"
-msgid "Open"
-msgstr "Ouverte"
-
-msgctxt "selection:account.move,state:"
-msgid "Draft"
-msgstr "Brouillon"
-
msgctxt "selection:account.move,state:"
msgid "Draft"
msgstr "Brouillon"
@@ -3723,14 +3597,6 @@ msgctxt "selection:account.move,state:"
msgid "Posted"
msgstr "Posté"
-msgctxt "selection:account.move,state:"
-msgid "Posted"
-msgstr "Posté"
-
-msgctxt "selection:account.move.line,move_state:"
-msgid "Draft"
-msgstr "Brouillon"
-
msgctxt "selection:account.move.line,move_state:"
msgid "Draft"
msgstr "Brouillon"
@@ -3739,14 +3605,6 @@ msgctxt "selection:account.move.line,move_state:"
msgid "Posted"
msgstr "Posté"
-msgctxt "selection:account.move.line,move_state:"
-msgid "Posted"
-msgstr "Posté"
-
-msgctxt "selection:account.move.line,state:"
-msgid "Draft"
-msgstr "Brouillon"
-
msgctxt "selection:account.move.line,state:"
msgid "Draft"
msgstr "Brouillon"
@@ -3755,10 +3613,6 @@ msgctxt "selection:account.move.line,state:"
msgid "Valid"
msgstr "Valide"
-msgctxt "selection:account.move.line,state:"
-msgid "Valid"
-msgstr "Valide"
-
msgctxt "selection:account.open_aged_balance.start,balance_type:"
msgid "Both"
msgstr "Les deux"
@@ -3784,14 +3638,6 @@ msgid "Close"
msgstr "Clôturée"
msgctxt "selection:account.period,state:"
-msgid "Close"
-msgstr "Clôturée"
-
-msgctxt "selection:account.period,state:"
-msgid "Open"
-msgstr "Ouverte"
-
-msgctxt "selection:account.period,state:"
msgid "Open"
msgstr "Ouverte"
@@ -3800,14 +3646,6 @@ msgid "Adjustment"
msgstr "Ajustement"
msgctxt "selection:account.period,type:"
-msgid "Adjustment"
-msgstr "Ajustement"
-
-msgctxt "selection:account.period,type:"
-msgid "Standard"
-msgstr "Standard"
-
-msgctxt "selection:account.period,type:"
msgid "Standard"
msgstr "Standard"
@@ -3816,14 +3654,6 @@ msgid "Fixed"
msgstr "Fixé"
msgctxt "selection:account.tax,type:"
-msgid "Fixed"
-msgstr "Fixé"
-
-msgctxt "selection:account.tax,type:"
-msgid "None"
-msgstr "Aucun"
-
-msgctxt "selection:account.tax,type:"
msgid "None"
msgstr "Aucun"
@@ -3831,10 +3661,6 @@ msgctxt "selection:account.tax,type:"
msgid "Percentage"
msgstr "Pourcentage"
-msgctxt "selection:account.tax,type:"
-msgid "Percentage"
-msgstr "Pourcentage"
-
msgctxt "selection:account.tax.code.open_chart.start,method:"
msgid "By Fiscal Year"
msgstr "Par année fiscale"
@@ -3884,14 +3710,6 @@ msgid "Fixed"
msgstr "Fixe"
msgctxt "selection:account.tax.template,type:"
-msgid "Fixed"
-msgstr "Fixe"
-
-msgctxt "selection:account.tax.template,type:"
-msgid "None"
-msgstr "Aucun"
-
-msgctxt "selection:account.tax.template,type:"
msgid "None"
msgstr "Aucun"
@@ -3899,14 +3717,6 @@ msgctxt "selection:account.tax.template,type:"
msgid "Percentage"
msgstr "Pourcentage"
-msgctxt "selection:account.tax.template,type:"
-msgid "Percentage"
-msgstr "Pourcentage"
-
-msgctxt "view:account.account.deferral:"
-msgid "Account Deferral"
-msgstr "Compte Report"
-
msgctxt "view:account.account.deferral:"
msgid "Account Deferral"
msgstr "Compte Report"
@@ -3915,14 +3725,6 @@ msgctxt "view:account.account.deferral:"
msgid "Account Deferrals"
msgstr "Comptes Report"
-msgctxt "view:account.account.deferral:"
-msgid "Account Deferrals"
-msgstr "Comptes Report"
-
-msgctxt "view:account.account.template:"
-msgid "Account Template"
-msgstr "Compte modèle"
-
msgctxt "view:account.account.template:"
msgid "Account Template"
msgstr "Compte modèle"
@@ -3931,14 +3733,6 @@ msgctxt "view:account.account.template:"
msgid "Account Templates"
msgstr "Modèles de compte"
-msgctxt "view:account.account.template:"
-msgid "Account Templates"
-msgstr "Modèles de compte"
-
-msgctxt "view:account.account.type.template:"
-msgid "Account Type Template"
-msgstr "Modèle de type de compte"
-
msgctxt "view:account.account.type.template:"
msgid "Account Type Template"
msgstr "Modèle de type de compte"
@@ -3947,14 +3741,6 @@ msgctxt "view:account.account.type.template:"
msgid "Account Types Templates"
msgstr "Modèles de type de compte"
-msgctxt "view:account.account.type.template:"
-msgid "Account Types Templates"
-msgstr "Modèles de type de compte"
-
-msgctxt "view:account.account.type:"
-msgid "Account Type"
-msgstr "Type de compte"
-
msgctxt "view:account.account.type:"
msgid "Account Type"
msgstr "Type de compte"
@@ -3964,22 +3750,10 @@ msgid "Account Types"
msgstr "Types de compte"
msgctxt "view:account.account.type:"
-msgid "Account Types"
-msgstr "Types de compte"
-
-msgctxt "view:account.account.type:"
msgid "Balance Sheet"
msgstr "Bilan"
msgctxt "view:account.account.type:"
-msgid "Balance Sheet"
-msgstr "Bilan"
-
-msgctxt "view:account.account.type:"
-msgid "Income Statement"
-msgstr "Compte de résultat"
-
-msgctxt "view:account.account.type:"
msgid "Income Statement"
msgstr "Compte de résultat"
@@ -3988,14 +3762,6 @@ msgid "Account"
msgstr "Compte"
msgctxt "view:account.account:"
-msgid "Account"
-msgstr "Compte"
-
-msgctxt "view:account.account:"
-msgid "Accounts"
-msgstr "Comptes"
-
-msgctxt "view:account.account:"
msgid "Accounts"
msgstr "Comptes"
@@ -4004,22 +3770,10 @@ msgid "Deferrals"
msgstr "Reports"
msgctxt "view:account.account:"
-msgid "Deferrals"
-msgstr "Reports"
-
-msgctxt "view:account.account:"
msgid "General Information"
msgstr "Information générale"
msgctxt "view:account.account:"
-msgid "General Information"
-msgstr "Information générale"
-
-msgctxt "view:account.account:"
-msgid "Notes"
-msgstr "Notes"
-
-msgctxt "view:account.account:"
msgid "Notes"
msgstr "Notes"
@@ -4029,7 +3783,7 @@ msgstr "Configuration comptable"
msgctxt "view:account.create_chart.account:"
msgid "Create Chart of Accounts"
-msgstr "Créer le plan comptable"
+msgstr "Créer un plan comptable"
msgctxt "view:account.create_chart.properties:"
msgid "Create Default Properties"
@@ -4037,7 +3791,7 @@ msgstr "Créer les propriétés par défaut"
msgctxt "view:account.create_chart.start:"
msgid "Create Chart of Accounts"
-msgstr "Créer le plan comptable"
+msgstr "Créer un plan comptable"
msgctxt "view:account.create_chart.start:"
msgid ""
@@ -4047,39 +3801,27 @@ msgstr ""
"Vous pouvez maintenant créer un plan comptable pour votre société sur base "
"d'un modèle"
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr "Équilibrer les non-reports"
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
-msgstr "Fermer l'année fiscale"
-
-msgctxt "view:account.fiscalyear:"
-msgid "Are you sure to close fiscal year?"
-msgstr "Etes-vous sûr de clôturer l'année fiscale?"
+msgstr "Clôturer une année fiscale"
msgctxt "view:account.fiscalyear:"
msgid "Are you sure to close fiscal year?"
-msgstr "Etes-vous sûr de clôturer l'année fiscale?"
-
-msgctxt "view:account.fiscalyear:"
-msgid "Close Fiscal Year"
-msgstr "Fermer l'année fiscale"
+msgstr "Êtes-vous sûr de clôturer l'année fiscale?"
msgctxt "view:account.fiscalyear:"
msgid "Close Fiscal Year"
-msgstr "Fermer l'année fiscale"
+msgstr "Clôturer une année fiscale"
msgctxt "view:account.fiscalyear:"
msgid "Create 3 Months Periods"
msgstr "Créer des périodes de 3 mois"
msgctxt "view:account.fiscalyear:"
-msgid "Create 3 Months Periods"
-msgstr "Créer des périodes de 3 mois"
-
-msgctxt "view:account.fiscalyear:"
-msgid "Create Monthly Periods"
-msgstr "Créer des périodes mensuelles"
-
-msgctxt "view:account.fiscalyear:"
msgid "Create Monthly Periods"
msgstr "Créer des périodes mensuelles"
@@ -4088,14 +3830,6 @@ msgid "Fiscal Year"
msgstr "Année fiscale"
msgctxt "view:account.fiscalyear:"
-msgid "Fiscal Year"
-msgstr "Année fiscale"
-
-msgctxt "view:account.fiscalyear:"
-msgid "Fiscal Years"
-msgstr "Années fiscales"
-
-msgctxt "view:account.fiscalyear:"
msgid "Fiscal Years"
msgstr "Années fiscales"
@@ -4104,14 +3838,6 @@ msgid "Periods"
msgstr "Périodes"
msgctxt "view:account.fiscalyear:"
-msgid "Periods"
-msgstr "Périodes"
-
-msgctxt "view:account.fiscalyear:"
-msgid "Re-Open Fiscal Year"
-msgstr "Ré-ouvrir l'année fiscale"
-
-msgctxt "view:account.fiscalyear:"
msgid "Re-Open Fiscal Year"
msgstr "Ré-ouvrir l'année fiscale"
@@ -4119,21 +3845,9 @@ msgctxt "view:account.fiscalyear:"
msgid "Sequences"
msgstr "Séquences"
-msgctxt "view:account.fiscalyear:"
-msgid "Sequences"
-msgstr "Séquences"
-
-msgctxt "view:account.journal.period:"
-msgid "Journal - Period"
-msgstr "Journal - Période"
-
msgctxt "view:account.journal.period:"
msgid "Journal - Period"
-msgstr "Journal - Période"
-
-msgctxt "view:account.journal.period:"
-msgid "Journals - Periods"
-msgstr "Journaux - périodes"
+msgstr "Journal - période"
msgctxt "view:account.journal.period:"
msgid "Journals - Periods"
@@ -4144,14 +3858,6 @@ msgid "Journal Type"
msgstr "Type de journal"
msgctxt "view:account.journal.type:"
-msgid "Journal Type"
-msgstr "Type de journal"
-
-msgctxt "view:account.journal.type:"
-msgid "Journal Types"
-msgstr "Types de journal"
-
-msgctxt "view:account.journal.type:"
msgid "Journal Types"
msgstr "Types de journal"
@@ -4168,14 +3874,6 @@ msgid "Journal View"
msgstr "Vue de journal"
msgctxt "view:account.journal.view:"
-msgid "Journal View"
-msgstr "Vue de journal"
-
-msgctxt "view:account.journal.view:"
-msgid "Journal Views"
-msgstr "Vues des journaux"
-
-msgctxt "view:account.journal.view:"
msgid "Journal Views"
msgstr "Vues des journaux"
@@ -4184,22 +3882,10 @@ msgid "General Information"
msgstr "Information générale"
msgctxt "view:account.journal:"
-msgid "General Information"
-msgstr "Information générale"
-
-msgctxt "view:account.journal:"
msgid "Journal"
msgstr "Journal"
msgctxt "view:account.journal:"
-msgid "Journal"
-msgstr "Journal"
-
-msgctxt "view:account.journal:"
-msgid "Journals"
-msgstr "Journaux"
-
-msgctxt "view:account.journal:"
msgid "Journals"
msgstr "Journaux"
@@ -4208,14 +3894,6 @@ msgid "Account Move Line"
msgstr "Ligne de mouvement comptable"
msgctxt "view:account.move.line:"
-msgid "Account Move Line"
-msgstr "Ligne de mouvement comptable"
-
-msgctxt "view:account.move.line:"
-msgid "Account Move Lines"
-msgstr "Lignes de mouvement comptable"
-
-msgctxt "view:account.move.line:"
msgid "Account Move Lines"
msgstr "Lignes de mouvement comptable"
@@ -4224,14 +3902,6 @@ msgid "Credit"
msgstr "Crédit"
msgctxt "view:account.move.line:"
-msgid "Credit"
-msgstr "Crédit"
-
-msgctxt "view:account.move.line:"
-msgid "Debit"
-msgstr "Débit"
-
-msgctxt "view:account.move.line:"
msgid "Debit"
msgstr "Débit"
@@ -4243,13 +3913,9 @@ msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
msgstr "Ouvrir journal"
-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éconciliées"
+msgstr "Ouvrir les lignes à réconcilier"
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
@@ -4259,14 +3925,6 @@ msgctxt "view:account.move.reconcile_lines.writeoff:"
msgid "Write-Off"
msgstr "Pertes et profits"
-msgctxt "view:account.move.reconcile_lines.writeoff:"
-msgid "Write-Off"
-msgstr "Pertes et profits"
-
-msgctxt "view:account.move.reconciliation:"
-msgid "Reconciliation"
-msgstr "Réconciliation"
-
msgctxt "view:account.move.reconciliation:"
msgid "Reconciliation"
msgstr "Réconciliation"
@@ -4275,14 +3933,6 @@ msgctxt "view:account.move.reconciliation:"
msgid "Reconciliations"
msgstr "Réconciliations"
-msgctxt "view:account.move.reconciliation:"
-msgid "Reconciliations"
-msgstr "Réconciliations"
-
-msgctxt "view:account.move:"
-msgid "Account Move"
-msgstr "Mouvement comptable"
-
msgctxt "view:account.move:"
msgid "Account Move"
msgstr "Mouvement comptable"
@@ -4292,24 +3942,12 @@ msgid "Account Moves"
msgstr "Mouvements comptables"
msgctxt "view:account.move:"
-msgid "Account Moves"
-msgstr "Mouvements comptables"
-
-msgctxt "view:account.move:"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt "view:account.move:"
msgid "Draft"
msgstr "Brouillon"
msgctxt "view:account.move:"
msgid "Post"
-msgstr "Posté"
-
-msgctxt "view:account.move:"
-msgid "Post"
-msgstr "Posté"
+msgstr "Poster"
msgctxt "view:account.open_aged_balance.start:"
msgid "Open Aged Balance"
@@ -4340,14 +3978,6 @@ msgid "Period"
msgstr "Période"
msgctxt "view:account.period:"
-msgid "Period"
-msgstr "Période"
-
-msgctxt "view:account.period:"
-msgid "Periods"
-msgstr "Périodes"
-
-msgctxt "view:account.period:"
msgid "Periods"
msgstr "Périodes"
@@ -4368,14 +3998,6 @@ msgid "Children"
msgstr "Enfants"
msgctxt "view:account.tax.code.template:"
-msgid "Children"
-msgstr "Enfants"
-
-msgctxt "view:account.tax.code.template:"
-msgid "Description"
-msgstr "Description"
-
-msgctxt "view:account.tax.code.template:"
msgid "Description"
msgstr "Description"
@@ -4384,14 +4006,6 @@ msgid "Tax Code Template"
msgstr "Modèle de code de taxe"
msgctxt "view:account.tax.code.template:"
-msgid "Tax Code Template"
-msgstr "Modèle de code de taxe"
-
-msgctxt "view:account.tax.code.template:"
-msgid "Tax Codes Templates"
-msgstr "Modèles de code de taxe"
-
-msgctxt "view:account.tax.code.template:"
msgid "Tax Codes Templates"
msgstr "Modèles de code de taxe"
@@ -4400,14 +4014,6 @@ msgid "Children"
msgstr "Enfants"
msgctxt "view:account.tax.code:"
-msgid "Children"
-msgstr "Enfants"
-
-msgctxt "view:account.tax.code:"
-msgid "Description"
-msgstr "Description"
-
-msgctxt "view:account.tax.code:"
msgid "Description"
msgstr "Description"
@@ -4416,14 +4022,6 @@ msgid "Tax Code"
msgstr "Code de taxe"
msgctxt "view:account.tax.code:"
-msgid "Tax Code"
-msgstr "Code de taxe"
-
-msgctxt "view:account.tax.code:"
-msgid "Tax Codes"
-msgstr "Codes de taxe"
-
-msgctxt "view:account.tax.code:"
msgid "Tax Codes"
msgstr "Codes de taxe"
@@ -4432,14 +4030,6 @@ msgid "Tax Group"
msgstr "Groupe de taxe"
msgctxt "view:account.tax.group:"
-msgid "Tax Group"
-msgstr "Groupe de taxe"
-
-msgctxt "view:account.tax.group:"
-msgid "Tax Groups"
-msgstr "Groupes de taxes"
-
-msgctxt "view:account.tax.group:"
msgid "Tax Groups"
msgstr "Groupes de taxes"
@@ -4448,14 +4038,6 @@ msgid "Account Tax Line"
msgstr "Ligne comptable de taxe"
msgctxt "view:account.tax.line:"
-msgid "Account Tax Line"
-msgstr "Ligne comptable de taxe"
-
-msgctxt "view:account.tax.line:"
-msgid "Account Tax Lines"
-msgstr "Lignes comptable de taxe"
-
-msgctxt "view:account.tax.line:"
msgid "Account Tax Lines"
msgstr "Lignes comptable de taxe"
@@ -4464,21 +4046,9 @@ msgid "Tax Rule Line Template"
msgstr "Modèle de ligne de règle de taxe"
msgctxt "view:account.tax.rule.line.template:"
-msgid "Tax Rule Line Template"
-msgstr "Modèle de ligne de règle de taxe"
-
-msgctxt "view:account.tax.rule.line.template:"
msgid "Tax Rule Line Templates"
msgstr "Modèles de ligne de règle de taxe"
-msgctxt "view:account.tax.rule.line.template:"
-msgid "Tax Rule Line Templates"
-msgstr "Modèles de ligne de règle de taxe"
-
-msgctxt "view:account.tax.rule.line:"
-msgid "Tax Rule Line"
-msgstr "Ligne de règle de taxe"
-
msgctxt "view:account.tax.rule.line:"
msgid "Tax Rule Line"
msgstr "Ligne de règle de taxe"
@@ -4487,14 +4057,6 @@ msgctxt "view:account.tax.rule.line:"
msgid "Tax Rule Lines"
msgstr "Lignes de règle de taxe"
-msgctxt "view:account.tax.rule.line:"
-msgid "Tax Rule Lines"
-msgstr "Lignes de règle de taxe"
-
-msgctxt "view:account.tax.rule.template:"
-msgid "Tax Rule Template"
-msgstr "Modèle de règle de taxe"
-
msgctxt "view:account.tax.rule.template:"
msgid "Tax Rule Template"
msgstr "Modèle de règle de taxe"
@@ -4503,14 +4065,6 @@ msgctxt "view:account.tax.rule.template:"
msgid "Tax Rules"
msgstr "Règles de taxe"
-msgctxt "view:account.tax.rule.template:"
-msgid "Tax Rules"
-msgstr "Règles de taxe"
-
-msgctxt "view:account.tax.rule:"
-msgid "Tax Rule"
-msgstr "Règle de taxe"
-
msgctxt "view:account.tax.rule:"
msgid "Tax Rule"
msgstr "Règle de taxe"
@@ -4519,13 +4073,9 @@ msgctxt "view:account.tax.rule:"
msgid "Tax Rules"
msgstr "Règles de taxe"
-msgctxt "view:account.tax.rule:"
-msgid "Tax Rules"
-msgstr "Règles de taxe"
-
msgctxt "view:account.tax.template:"
-msgid "Code"
-msgstr "Code"
+msgid "%"
+msgstr "%"
msgctxt "view:account.tax.template:"
msgid "Code"
@@ -4536,14 +4086,6 @@ msgid "Credit Note"
msgstr "Note de Crédit"
msgctxt "view:account.tax.template:"
-msgid "Credit Note"
-msgstr "Note de Crédit"
-
-msgctxt "view:account.tax.template:"
-msgid "General Information"
-msgstr "Information générale"
-
-msgctxt "view:account.tax.template:"
msgid "General Information"
msgstr "Information générale"
@@ -4552,14 +4094,6 @@ msgid "Invoice"
msgstr "Facture"
msgctxt "view:account.tax.template:"
-msgid "Invoice"
-msgstr "Facture"
-
-msgctxt "view:account.tax.template:"
-msgid "Tax Template"
-msgstr "Modèle de taxe"
-
-msgctxt "view:account.tax.template:"
msgid "Tax Template"
msgstr "Modèle de taxe"
@@ -4567,13 +4101,9 @@ msgctxt "view:account.tax.template:"
msgid "Taxes Templates"
msgstr "Modèles de taxes"
-msgctxt "view:account.tax.template:"
-msgid "Taxes Templates"
-msgstr "Modèles de taxes"
-
msgctxt "view:account.tax:"
-msgid "Code"
-msgstr "Code"
+msgid "%"
+msgstr "%"
msgctxt "view:account.tax:"
msgid "Code"
@@ -4584,22 +4114,10 @@ msgid "Credit Note"
msgstr "Note de crédit"
msgctxt "view:account.tax:"
-msgid "Credit Note"
-msgstr "Note de crédit"
-
-msgctxt "view:account.tax:"
msgid "General Information"
msgstr "Information générale"
msgctxt "view:account.tax:"
-msgid "General Information"
-msgstr "Information générale"
-
-msgctxt "view:account.tax:"
-msgid "Invoice"
-msgstr "Facture"
-
-msgctxt "view:account.tax:"
msgid "Invoice"
msgstr "Facture"
@@ -4608,32 +4126,20 @@ msgid "Tax"
msgstr "Taxe"
msgctxt "view:account.tax:"
-msgid "Tax"
-msgstr "Taxe"
-
-msgctxt "view:account.tax:"
-msgid "Taxes"
-msgstr "Taxes"
-
-msgctxt "view:account.tax:"
msgid "Taxes"
msgstr "Taxes"
msgctxt "view:account.update_chart.start:"
msgid "Update Chart of Accounts"
-msgstr "Mise à jour du plan comptable"
+msgstr "Mise à jour d'un plan comptable"
msgctxt "view:account.update_chart.succeed:"
msgid "Update Chart of Accounts"
-msgstr "Mise à jour du plan comptable"
+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"
-
-msgctxt "view:party.party:"
-msgid "Account"
-msgstr "Compte"
+msgstr "Mise à jour du plan comptable réussie !"
msgctxt "view:party.party:"
msgid "Account"
@@ -4643,10 +4149,6 @@ msgctxt "view:party.party:"
msgid "Taxes"
msgstr "Taxes"
-msgctxt "view:party.party:"
-msgid "Taxes"
-msgstr "Taxes"
-
msgctxt "wizard_button:account.create_chart,account,create_account:"
msgid "Create"
msgstr "Créer"
@@ -4671,6 +4173,14 @@ msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr "Annuler"
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "Ok"
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Annuler"
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Fermer"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 01c030e..bcf2988 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -139,13 +139,6 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr ""
msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-
-msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
@@ -383,6 +376,11 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Rekening"
+#, fuzzy
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Balans"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr ""
@@ -795,6 +793,33 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr ""
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr ""
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Boekjaar"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Dagboek"
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Periode"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr ""
@@ -807,10 +832,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Actief"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Gecentraliseerd tegenrekening"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Code"
@@ -1027,10 +1048,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Gecentraliseerde regel"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr ""
@@ -1246,6 +1263,16 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Rekening"
+#, fuzzy
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Bedrag"
+
+#, fuzzy
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Datum"
@@ -1357,7 +1384,7 @@ msgid "ID"
msgstr ""
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
+msgid "Posted Moves"
msgstr ""
#, fuzzy
@@ -1613,9 +1640,10 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Bovenliggend niveau"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
-msgstr "Percentage"
+#, fuzzy
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
+msgstr "Verhouding"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -2110,9 +2138,10 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Bovenliggend niveau"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
-msgstr "Percentage"
+#, fuzzy
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
+msgstr "Verhouding"
msgctxt "field:account.tax.template,rec_name:"
msgid "Name"
@@ -2239,7 +2268,7 @@ msgid "Leave empty for all open fiscal year"
msgstr ""
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr ""
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2290,10 +2319,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Doorgaans 1 of -1"
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "In %"
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "Gebruiken om belastingen te ordenen"
@@ -2488,6 +2513,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Boekjaar - boeking"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr ""
+
#, fuzzy
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
@@ -2716,6 +2745,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Rekeningtypen"
+msgctxt "model:ir.action,name:act_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Sluit boekjaar"
@@ -2993,6 +3026,10 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr "Ouderdomsanalyse"
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr "Rekeningschema's"
@@ -3821,6 +3858,10 @@ msgid ""
"of account template."
msgstr ""
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr ""
+
#, fuzzy
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
@@ -4101,6 +4142,10 @@ msgid "Tax Rules"
msgstr "Belastingbepalingen"
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr "Code"
@@ -4125,6 +4170,10 @@ msgid "Taxes Templates"
msgstr "Belastingsjablonen"
msgctxt "view:account.tax:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr "Code"
@@ -4197,6 +4246,16 @@ msgid "Cancel"
msgstr "Annuleren"
#, fuzzy
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "Oké"
+
+#, fuzzy
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Annuleren"
+
+#, fuzzy
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Sluiten"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 140395e..2d6dc28 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -161,16 +161,6 @@ msgid "You can not reconcile line \"%s\" because it is not in valid state."
msgstr "Вы не можете сверить строку \"%s\" так как она в ошибочном состоянии."
msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
-"Проводка \"%(move)s\" не может быть создана так как уже существует проводка "
-"в журнале \"%(journal)s\" и вы не можете создать более одной проводки за "
-"период в централизованном журнале."
-
-msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
"Вы не можете создать строки для счетов разных организаций в проводке \"%s\"."
@@ -420,6 +410,11 @@ msgctxt "field:account.account.deferral,account:"
msgid "Account"
msgstr "Счет"
+#, fuzzy
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Баланс"
+
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
msgstr "Дата создания"
@@ -828,6 +823,34 @@ msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr ""
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Финансовый год"
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Журнал"
+
+#, fuzzy
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Период"
+
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
msgstr "Финансовый год для закрытия"
@@ -840,10 +863,6 @@ msgctxt "field:account.journal,active:"
msgid "Active"
msgstr "Действующий"
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Централизованный контрагент"
-
msgctxt "field:account.journal,code:"
msgid "Code"
msgstr "Код"
@@ -1060,10 +1079,6 @@ msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Централизованная линия"
-
msgctxt "field:account.move,create_date:"
msgid "Create Date"
msgstr "Дата создания"
@@ -1272,6 +1287,16 @@ msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
msgstr "Счет"
+#, fuzzy
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Сумма"
+
+#, fuzzy
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Кол-во цифр валюты"
+
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
msgstr "Дата"
@@ -1376,8 +1401,9 @@ msgctxt "field:account.open_chart.start,id:"
msgid "ID"
msgstr "ID"
+#, fuzzy
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
+msgid "Posted Moves"
msgstr "Проведенная операция"
msgctxt "field:account.open_income_statement.start,company:"
@@ -1624,9 +1650,10 @@ msgctxt "field:account.tax,parent:"
msgid "Parent"
msgstr "Предок"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
-msgstr "Процент"
+#, fuzzy
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
+msgstr "Курс"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
@@ -2116,9 +2143,10 @@ msgctxt "field:account.tax.template,parent:"
msgid "Parent"
msgstr "Предок"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
-msgstr "Процент"
+#, fuzzy
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
+msgstr "Курс"
msgctxt "field:account.tax.template,rec_name:"
msgid "Name"
@@ -2244,8 +2272,9 @@ msgctxt "help:account.open_chart.start,fiscalyear:"
msgid "Leave empty for all open fiscal year"
msgstr "Оставьте пустым для всех открытых финансовых годов"
+#, fuzzy
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
+msgid "Show posted moves only"
msgstr "Показать только завершенные проводки"
msgctxt "help:account.open_income_statement.start,posted:"
@@ -2296,10 +2325,6 @@ msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
msgstr "Обычно 1 или -1"
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "в %"
-
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
msgstr "Используется для сортировки налогов"
@@ -2494,6 +2519,10 @@ msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
msgstr "Финансовый год - Проводки"
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
msgstr "Закрыть финансовый год"
@@ -2710,6 +2739,10 @@ msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
msgstr "Типы счетов"
+msgctxt "model:ir.action,name:act_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:ir.action,name:act_close_fiscalyear"
msgid "Close Fiscal Year"
msgstr "Закрыть финансовый год"
@@ -2979,6 +3012,10 @@ msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
msgstr "Сальдовый отчет"
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
msgstr "Схемы счетов"
@@ -3751,6 +3788,10 @@ msgstr ""
"Теперь вы можете создать схему счетов для вашей организации выбрав один из "
"шаблонов схемы счетов."
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr ""
+
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
msgstr "Закрыть финансовый год"
@@ -4020,6 +4061,10 @@ msgid "Tax Rules"
msgstr "Правила налогов"
msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.tax.template:"
msgid "Code"
msgstr "Код"
@@ -4044,6 +4089,10 @@ msgid "Taxes Templates"
msgstr "Шаблоны налогов"
msgctxt "view:account.tax:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.tax:"
msgid "Code"
msgstr "Код"
@@ -4111,6 +4160,16 @@ msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
msgstr "Отменить"
+#, fuzzy
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "Ок"
+
+#, fuzzy
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Отменить"
+
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
msgstr "Закрыть"
diff --git a/locale/nl_NL.po b/locale/sl_SI.po
similarity index 73%
copy from locale/nl_NL.po
copy to locale/sl_SI.po
index 01c030e..5686ef9 100644
--- a/locale/nl_NL.po
+++ b/locale/sl_SI.po
@@ -4,267 +4,289 @@ 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 "Historie moet uniek zijn per rekening en boekjaar"
+msgstr "Odlog mora biti enoličen po kontu in poslovnem letu"
msgctxt "error:account.account.deferral:"
msgid "You can not modify Account Deferral records"
-msgstr "Historische rekeninggegevens kunt u niet wijzigen"
+msgstr "Zapisov odloženih kontov ni možno popravljati"
msgctxt "error:account.account:"
msgid "You can not delete account \"%s\" because it has move lines."
-msgstr ""
+msgstr "Konta \"%s\" ni možno brisati zaradi obstoječih knjiženih postavk."
msgctxt "error:account.account:"
msgid "You can not delete accounts that have children."
-msgstr ""
+msgstr "Kontov s podkonti ni možno brisati."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" have the same post move sequence."
-msgstr ""
+msgstr "Poslovni leti \"%(first)s\" in \"%(second)s\" imata enako štetje knjižb."
msgctxt "error:account.fiscalyear:"
msgid "Fiscal year \"%(first)s\" and \"%(second)s\" overlap."
-msgstr ""
+msgstr "Poslovni leti \"%(first)s\" in \"%(second)s\" se prekrivata."
msgctxt "error:account.fiscalyear:"
msgid "No fiscal year defined for \"%s\"."
-msgstr ""
+msgstr "Poslovno leto \"%s\" ne obstaja."
msgctxt "error:account.fiscalyear:"
msgid "The balance of the account \"%s\" must be zero."
-msgstr ""
+msgstr "Saldo konta \"%s\" mora biti nič."
msgctxt "error:account.fiscalyear:"
msgid "You can not change the post move sequence in fiscal year \"%s\"."
-msgstr ""
+msgstr "Štetje knjižb v poslovnem letu \"%s\" ni možno spreminjati."
msgctxt "error:account.fiscalyear:"
msgid ""
"You can not close fiscal year \"%s\" until you close all previous fiscal "
"years."
msgstr ""
+"Poslovnega leta \"%s\" ni možno zaključiti, dokler niso zaključena vsa "
+"prejšnja poslovna leta."
msgctxt "error:account.fiscalyear:"
msgid ""
"You can not reopen fiscal year \"%s\" until you reopen all later fiscal "
"years."
msgstr ""
+"Poslovnega leta \"%s\" ni možno ponovno odpreti, dokler niso ponovno odprta "
+"vsa prejšnja leta."
msgctxt "error:account.journal.period:"
msgid "You can not create a journal - period on closed period \"%s\"."
-msgstr ""
+msgstr "Dnevnika za zaključeno obdobje \"%s\" ni možno ustvarjati."
msgctxt "error:account.journal.period:"
msgid "You can not modify/delete journal - period \"%s\" because it has moves."
msgstr ""
+"Dnevnika za obdobje \"%s\" ni možno popravljati/brisati zaradi obstoječih "
+"knjižb."
msgctxt "error:account.journal.period:"
msgid ""
"You can not open journal - period \"%(journal_period)s\" because period "
"\"%(period)s\" is closed."
msgstr ""
+"Dnevnika za obdobje \"%(journal_period)s\" ni možno odpirati zaradi "
+"zaključenega obdobja \"%(period)s\"."
msgctxt "error:account.journal.period:"
msgid "You can only open one journal per period."
-msgstr ""
+msgstr "Na obdobje je možen samo en dnevnik."
msgctxt "error:account.journal.type:"
msgid "The code must be unique."
-msgstr ""
+msgstr "Šifra mora biti enolična."
msgctxt "error:account.move.line:"
msgid "Line \"%s\" (%d) already reconciled."
-msgstr ""
+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 ""
+msgstr "Knjižba ni možno ustvariti zaradi neobstoječega dnevnika."
msgctxt "error:account.move.line:"
msgid "Wrong credit/debit values."
-msgstr ""
+msgstr "Napačne vrednosti za debet/kredit."
msgctxt "error:account.move.line:"
msgid "You can not add/modify lines in closed journal period \"%s\"."
msgstr ""
+"Postavk dnevnika na zaključenem obdobju \"%s\" ni možno "
+"dodajati/popravljati."
msgctxt "error:account.move.line:"
msgid ""
"You can not create a move line with account \"%s\" because it is a view "
"account."
-msgstr ""
+msgstr "Knjižbe na konto \"%s\" ni možno ustvariti, 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 ""
+msgstr "Knjižbe na konto \"%s\" ni možno ustvariti, ker je neaktiven."
msgctxt "error:account.move.line:"
msgid "You can not modify line \"%s\" because it is reconciled."
-msgstr ""
+msgstr "Postavke \"%s\" ni možno popravljati, ker je že usklajena."
msgctxt "error:account.move.line:"
msgid "You can not modify lines of move \"%s\" because it is already posted."
-msgstr ""
+msgstr "Postavk \"%s\" ni možno popravljati, ker so že knjižene."
msgctxt "error:account.move.reconciliation:"
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."
msgctxt "error:account.move.reconciliation:"
msgid "You can not modify a reconciliation."
-msgstr ""
+msgstr "Uskladitve ni možno popravljati."
msgctxt "error:account.move.reconciliation:"
msgid ""
"You can not reconcile line \"%(line)s\" because it's account \"%(account)s\""
" is configured as not reconcilable."
msgstr ""
+"Postavke \"%(line)s\" ni možno uskladiti, ker je na njenem kontu "
+"\"%(account)s\" usklajevanje onemogočeno."
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 ""
+"Postavke \"%(line)s\" ni možno uskladiti, ker se njen konto \"%(account1)s\""
+" razlikuje od \"%(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 ""
+"Postavke \"%(line)s\" ni možni uskladiti zaradi njene stranke \"%(party1)s\""
+" različne od %(party2)s\"."
msgctxt "error:account.move.reconciliation:"
msgid "You can not reconcile line \"%s\" because it is not in valid state."
-msgstr ""
-
-msgctxt "error:account.move:"
-msgid ""
-"Move \"%(move)s\" cannot be created because there is already a move in "
-"journal \"%(journal)s\" and you cannot create more than one move per period "
-"in a centralized journal."
-msgstr ""
+msgstr "Postavke \"%s\" ni možno uskladiti zaradi neveljavnega stanja."
msgctxt "error:account.move:"
msgid "You can not create lines on accountsof different companies in move \"%s\"."
msgstr ""
+"Postavk na kontih različnih podjetjih v knjižbi \"%s\" ni možno ustvarjati."
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."
msgctxt "error:account.move:"
msgid "You can not modify move \"%s\" because it is already posted."
-msgstr ""
+msgstr "Knjižene postavke \"%s\" ni možno popravljati."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is an unbalanced."
-msgstr ""
+msgstr "Neuravnovešene postavke \"%s\" ni možno knjižiti."
msgctxt "error:account.move:"
msgid "You can not post move \"%s\" because it is empty."
-msgstr ""
+msgstr "Prazne postavke \"%s\" ni možno knjižiti."
msgctxt "error:account.move:"
msgid "You can not set posted move \"%(move)s\" to draft in journal \"%(journal)s\"."
msgstr ""
+"Knjižene postavke \"%(move)s\" v dnevniku \"%(journal)s\" ni možno "
+"preklopiti v stanje osnutka."
msgctxt "error:account.move:"
msgid ""
"You can not set to draft move \"%(move)s\" because period \"%(period)s\" is "
"closed."
msgstr ""
+"Knjižbe \"%(move)s\" ni možno preklopiti v stanje osnutka zaradi "
+"zaključenega obdobja \"%(period)s\"."
-#, fuzzy
msgctxt "error:account.open_aged_balance:"
msgid "Warning"
-msgstr "Waarschuwing"
+msgstr "Opozorilo"
msgctxt "error:account.open_aged_balance:"
msgid "You cannot define overlapping terms"
-msgstr ""
+msgstr "Prekrivajoči roki niso možni."
msgctxt "error:account.period:"
msgid "\"%(first)s\" and \"%(second)s\" periods overlap."
-msgstr ""
+msgstr "Obdobji \"%(first)s\" in \"%(second)s\" se prekrivata."
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 ""
+"Podjetje štetja \"%(sequence)s\" se ne ujema s podjetjem dodeljenga obdobja "
+"\"%(period)s\"."
msgctxt "error:account.period:"
msgid "Dates of period \"%s\" are outside are outside it's fiscal year dates."
-msgstr ""
+msgstr "Datumi obdobja \"%s\" so izven časovnega okvira poslovnega leta."
msgctxt "error:account.period:"
msgid "No period defined for date \"%s\"."
-msgstr ""
+msgstr "Za datum \"%s\" obdobja ni možno najti."
msgctxt "error:account.period:"
msgid "Period \"%(first)s\" and \"%(second)s\" have the same sequence."
-msgstr ""
+msgstr "Obdobji \"%(first)s\" in \"%(second)s\" imata enaki štetji."
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 ""
+"Štetja knjižb obdobja \"%s\" ni možno spreminjati zaradi obstoječih knjižb."
msgctxt "error:account.period:"
msgid ""
"You can not close period \"%s\" because there are non posted moves in this "
"period."
-msgstr ""
+msgstr "Obdobja \"%s\" ni možno zaključiti zaradi obstoječih neknjiženih postavk."
msgctxt "error:account.period:"
msgid "You can not create a period on fiscal year \"%s\" because it is closed."
-msgstr ""
+msgstr "Obdobja na zaključenem poslovnem letu \"%s\" ni možno ustvarjati."
msgctxt "error:account.period:"
msgid "You can not modify/delete period \"%s\" because it has moves."
-msgstr ""
+msgstr "Obdobja \"%s\" ni možno popravljati/brisati zaradi obstoječih knjižb."
msgctxt "error:account.period:"
msgid ""
"You can not open period \"%(period)s\" because its fiscal year "
"\"%(fiscalyear)s\" is closed."
msgstr ""
+"Obdobja \"%(period)s\" ni možno odpirati zaradi zaključenega poslovnega leta"
+" \"%(fiscalyear)s\"."
msgctxt "field:account.account,active:"
msgid "Active"
-msgstr "Actief"
+msgstr "Aktivno"
msgctxt "field:account.account,balance:"
msgid "Balance"
-msgstr "Balans"
+msgstr "Bilanca"
msgctxt "field:account.account,childs:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Podkonti"
msgctxt "field:account.account,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.account,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.account,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.account,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.account,credit:"
msgid "Credit"
-msgstr "Credit"
+msgstr "Kredit"
msgctxt "field:account.account,currency:"
msgid "Currency"
@@ -272,979 +294,995 @@ msgstr "Valuta"
msgctxt "field:account.account,currency_digits:"
msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "Decimalke"
msgctxt "field:account.account,debit:"
msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
msgctxt "field:account.account,deferral:"
msgid "Deferral"
-msgstr "Historisch"
+msgstr "Odlog"
msgctxt "field:account.account,deferrals:"
msgid "Deferrals"
-msgstr "Historie"
+msgstr "Odlogi"
msgctxt "field:account.account,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.account,kind:"
msgid "Kind"
-msgstr "Soort"
+msgstr "Vrsta"
msgctxt "field:account.account,left:"
msgid "Left"
-msgstr "Links"
+msgstr "Levo"
msgctxt "field:account.account,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.account,note:"
msgid "Note"
-msgstr "Aantekening"
+msgstr "Opomba"
msgctxt "field:account.account,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "Matični konto"
msgctxt "field:account.account,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.account,reconcile:"
msgid "Reconcile"
-msgstr "Afletteren"
+msgstr "Uskladitev"
msgctxt "field:account.account,right:"
msgid "Right"
-msgstr "Rechts"
+msgstr "Desno"
-#, fuzzy
msgctxt "field:account.account,second_currency:"
msgid "Secondary Currency"
-msgstr "Alternatieve valuta"
+msgstr "Druga valuta"
msgctxt "field:account.account,taxes:"
msgid "Default Taxes"
-msgstr "Standaard belastingen"
+msgstr "Privzeti davki"
msgctxt "field:account.account,template:"
msgid "Template"
-msgstr "Sjabloon"
+msgstr "Predloga"
msgctxt "field:account.account,type:"
msgid "Type"
-msgstr "Type"
+msgstr "Tip"
msgctxt "field:account.account,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.account,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.account-account.tax,account:"
msgid "Account"
-msgstr "Rekening"
+msgstr "Konto"
msgctxt "field:account.account-account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.account-account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.account-account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.account-account.tax,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.account-account.tax,tax:"
msgid "Tax"
-msgstr "Belasting"
+msgstr "Davek"
msgctxt "field:account.account-account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.account-account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.account.deferral,account:"
msgid "Account"
-msgstr "Rekening"
+msgstr "Konto"
+
+msgctxt "field:account.account.deferral,balance:"
+msgid "Balance"
+msgstr "Bilanca"
msgctxt "field:account.account.deferral,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.account.deferral,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.account.deferral,credit:"
msgid "Credit"
-msgstr "Credit"
+msgstr "Kredit"
msgctxt "field:account.account.deferral,currency_digits:"
msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "Decimalke"
msgctxt "field:account.account.deferral,debit:"
msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
msgctxt "field:account.account.deferral,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.account.deferral,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.account.deferral,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.account.deferral,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.account.deferral,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.account.template,childs:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Podkonti"
msgctxt "field:account.account.template,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.account.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.account.template,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.account.template,deferral:"
msgid "Deferral"
-msgstr "Historisch"
+msgstr "Odlog"
msgctxt "field:account.account.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.account.template,kind:"
msgid "Kind"
-msgstr "Soort"
+msgstr "Vrsta"
msgctxt "field:account.account.template,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.account.template,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "Matični konto"
msgctxt "field:account.account.template,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.account.template,reconcile:"
msgid "Reconcile"
-msgstr "Afletteren"
+msgstr "Uskladitev"
msgctxt "field:account.account.template,taxes:"
msgid "Default Taxes"
-msgstr "Standaard belastingen"
+msgstr "Privzeti davki"
msgctxt "field:account.account.template,type:"
msgid "Type"
-msgstr "Type"
+msgstr "Tip"
msgctxt "field:account.account.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.account.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.account.template-account.tax.template,account:"
msgid "Account Template"
-msgstr "Rekeningsjabloon"
+msgstr "Predloga konta"
msgctxt "field:account.account.template-account.tax.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.account.template-account.tax.template,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.account.template-account.tax.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.account.template-account.tax.template,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.account.template-account.tax.template,tax:"
msgid "Tax Template"
-msgstr "Belasting sjabloon"
+msgstr "Predloga davka"
msgctxt "field:account.account.template-account.tax.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.account.template-account.tax.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.account.type,amount:"
msgid "Amount"
-msgstr "Bedrag"
+msgstr "Znesek"
msgctxt "field:account.account.type,balance_sheet:"
msgid "Balance Sheet"
-msgstr "Balansoverzicht"
+msgstr "Bilanca stanja"
msgctxt "field:account.account.type,childs:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Podtipi"
msgctxt "field:account.account.type,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.account.type,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.account.type,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.account.type,currency_digits:"
msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "Decimalke"
msgctxt "field:account.account.type,display_balance:"
msgid "Display Balance"
-msgstr "Toon balans"
+msgstr "Prikaz bilance"
msgctxt "field:account.account.type,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.account.type,income_statement:"
msgid "Income Statement"
-msgstr "Winst- & verliesrekening"
+msgstr "Izkaz poslovnega izida"
msgctxt "field:account.account.type,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.account.type,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "Matični tip"
msgctxt "field:account.account.type,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.account.type,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr "Zap.št."
msgctxt "field:account.account.type,template:"
msgid "Template"
-msgstr "Sjabloon"
+msgstr "Predloga"
msgctxt "field:account.account.type,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.account.type,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.account.type.template,balance_sheet:"
msgid "Balance Sheet"
-msgstr "Balansoverzicht"
+msgstr "Bilanca stanja"
msgctxt "field:account.account.type.template,childs:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Podtipi"
msgctxt "field:account.account.type.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.account.type.template,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.account.type.template,display_balance:"
msgid "Display Balance"
-msgstr "Toon balans"
+msgstr "Prikaz bilance"
msgctxt "field:account.account.type.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.account.type.template,income_statement:"
msgid "Income Statement"
-msgstr "Winst- & verliesrekening"
+msgstr "Izkaz poslovnega izida"
msgctxt "field:account.account.type.template,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.account.type.template,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "Matični tip"
msgctxt "field:account.account.type.template,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.account.type.template,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr "Zap.št."
msgctxt "field:account.account.type.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.account.type.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.configuration,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.configuration,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.configuration,default_account_payable:"
msgid "Default Account Payable"
-msgstr ""
+msgstr "Privzeti obveznostni konto"
msgctxt "field:account.configuration,default_account_receivable:"
msgid "Default Account Receivable"
-msgstr ""
+msgstr "Privzeti terjatveni konto"
msgctxt "field:account.configuration,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:account.configuration,rec_name:"
msgid "Name"
-msgstr "Naam bijlage"
+msgstr "Ime"
msgctxt "field:account.configuration,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.configuration,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
-#, fuzzy
msgctxt "field:account.create_chart.account,account_template:"
msgid "Account Template"
-msgstr "Rekeningsjabloon"
+msgstr "Predloga konta"
-#, fuzzy
msgctxt "field:account.create_chart.account,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.create_chart.account,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.create_chart.properties,account_payable:"
msgid "Default Payable Account"
-msgstr ""
+msgstr "Privzeti obveznostni konto"
msgctxt "field:account.create_chart.properties,account_receivable:"
msgid "Default Receivable Account"
-msgstr ""
+msgstr "Privzeti terjatveni konto"
-#, fuzzy
msgctxt "field:account.create_chart.properties,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.create_chart.properties,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.create_chart.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.fiscalyear,close_lines:"
msgid "Close Lines"
-msgstr "Boekingen afsluiten"
+msgstr "Zapri postavke"
msgctxt "field:account.fiscalyear,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.fiscalyear,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.fiscalyear,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.fiscalyear,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.fiscalyear,end_date:"
msgid "Ending Date"
-msgstr "Einddatum"
+msgstr "Do"
msgctxt "field:account.fiscalyear,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.fiscalyear,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.fiscalyear,periods:"
msgid "Periods"
-msgstr "Perioden"
+msgstr "Obdobja"
msgctxt "field:account.fiscalyear,post_move_sequence:"
msgid "Post Move Sequence"
-msgstr "Boeking bevestigingsreeks"
+msgstr "Štetje knjižb"
msgctxt "field:account.fiscalyear,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.fiscalyear,start_date:"
msgid "Starting Date"
-msgstr "Start datum"
+msgstr "Od"
msgctxt "field:account.fiscalyear,state:"
msgid "State"
-msgstr "Status"
+msgstr "Stanje"
msgctxt "field:account.fiscalyear,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.fiscalyear,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.fiscalyear-account.move.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.fiscalyear-account.move.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.fiscalyear-account.move.line,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.fiscalyear-account.move.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.fiscalyear-account.move.line,line:"
msgid "Line"
-msgstr "Regel"
+msgstr "Postavka"
msgctxt "field:account.fiscalyear-account.move.line,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.fiscalyear-account.move.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.fiscalyear-account.move.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,credit_account:"
+msgid "Credit Account"
+msgstr "Kreditni konto"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,debit_account:"
+msgid "Debit Account"
+msgstr "Debetni konto"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,fiscalyear:"
+msgid "Fiscal Year"
+msgstr "Poslovno leto"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,journal:"
+msgid "Journal"
+msgstr "Dnevnik"
+
+msgctxt "field:account.fiscalyear.balance_non_deferral.start,period:"
+msgid "Period"
+msgstr "Obdobje"
msgctxt "field:account.fiscalyear.close.start,close_fiscalyear:"
msgid "Fiscal Year to close"
-msgstr ""
+msgstr "Zaključitev poslovnega leta"
msgctxt "field:account.fiscalyear.close.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.journal,active:"
msgid "Active"
-msgstr "Actief"
-
-msgctxt "field:account.journal,centralised:"
-msgid "Centralised counterpart"
-msgstr "Gecentraliseerd tegenrekening"
+msgstr "Aktivno"
msgctxt "field:account.journal,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.journal,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.journal,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.journal,credit_account:"
msgid "Default Credit Account"
-msgstr "Standaard creditrekening"
+msgstr "Privzeti kreditni konto"
msgctxt "field:account.journal,debit_account:"
msgid "Default Debit Account"
-msgstr "Standaard debitrekening"
+msgstr "Privzeti debetni konto"
msgctxt "field:account.journal,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.journal,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.journal,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.journal,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr "Zap.št."
msgctxt "field:account.journal,type:"
msgid "Type"
-msgstr "Type"
+msgstr "Tip"
msgctxt "field:account.journal,update_posted:"
msgid "Allow cancelling moves"
-msgstr "Sta annuleren van boekingen toe"
+msgstr "Dovoli storniranje knjižb"
msgctxt "field:account.journal,view:"
msgid "View"
-msgstr "Overzicht"
+msgstr "Pogled"
msgctxt "field:account.journal,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.journal,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.journal.period,active:"
msgid "Active"
-msgstr "Actief"
+msgstr "Aktivno"
msgctxt "field:account.journal.period,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.journal.period,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.journal.period,icon:"
msgid "Icon"
-msgstr "Icoon"
+msgstr "Ikona"
msgctxt "field:account.journal.period,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.journal.period,journal:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "field:account.journal.period,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.journal.period,period:"
msgid "Period"
-msgstr "Periode"
+msgstr "Obdobje"
msgctxt "field:account.journal.period,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.journal.period,state:"
msgid "State"
-msgstr "Status"
+msgstr "Stanje"
msgctxt "field:account.journal.period,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.journal.period,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.journal.type,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.journal.type,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.journal.type,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.journal.type,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.journal.type,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.journal.type,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.journal.type,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.journal.type,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.journal.view,columns:"
msgid "Columns"
-msgstr "Kolommen"
+msgstr "Stolpci"
msgctxt "field:account.journal.view,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.journal.view,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.journal.view,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.journal.view,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.journal.view,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.journal.view,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.journal.view,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.journal.view.column,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.journal.view.column,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.journal.view.column,field:"
msgid "Field"
-msgstr "Veld"
+msgstr "Polje"
msgctxt "field:account.journal.view.column,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.journal.view.column,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.journal.view.column,readonly:"
msgid "Readonly"
-msgstr "Alleen lezen"
+msgstr "Samo za branje"
msgctxt "field:account.journal.view.column,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.journal.view.column,required:"
msgid "Required"
-msgstr "Vereist"
+msgstr "Obvezno"
msgctxt "field:account.journal.view.column,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr "Zap.št."
msgctxt "field:account.journal.view.column,view:"
msgid "View"
-msgstr "Overzicht"
+msgstr "Pogled"
msgctxt "field:account.journal.view.column,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.journal.view.column,write_uid:"
msgid "Write User"
-msgstr ""
-
-msgctxt "field:account.move,centralised_line:"
-msgid "Centralised Line"
-msgstr "Gecentraliseerde regel"
+msgstr "Zapisal"
msgctxt "field:account.move,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.move,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.move,date:"
msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr "Dejanski datum"
-#, fuzzy
msgctxt "field:account.move,description:"
msgid "Description"
-msgstr "Specificatie"
+msgstr "Opis"
msgctxt "field:account.move,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.move,journal:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "field:account.move,lines:"
msgid "Lines"
-msgstr "Regels"
+msgstr "Postavke"
-#, fuzzy
msgctxt "field:account.move,number:"
msgid "Number"
-msgstr "Nummer"
+msgstr "Številka"
msgctxt "field:account.move,origin:"
msgid "Origin"
-msgstr ""
+msgstr "Poreklo"
msgctxt "field:account.move,period:"
msgid "Period"
-msgstr "Periode"
+msgstr "Obdobje"
msgctxt "field:account.move,post_date:"
msgid "Post Date"
-msgstr "Boekingsdatum"
+msgstr "Datum knjiženja"
msgctxt "field:account.move,post_number:"
msgid "Post Number"
-msgstr ""
+msgstr "Številka knjižbe"
msgctxt "field:account.move,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.move,state:"
msgid "State"
-msgstr "Status"
+msgstr "Stanje"
msgctxt "field:account.move,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.move,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.move.line,account:"
msgid "Account"
-msgstr "Rekening"
+msgstr "Konto"
msgctxt "field:account.move.line,amount_second_currency:"
msgid "Amount Second Currency"
-msgstr "Bedrag alternatieve valuta"
+msgstr "Znesek v drugi valuti"
msgctxt "field:account.move.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.move.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.move.line,credit:"
msgid "Credit"
-msgstr "Credit"
+msgstr "Kredit"
msgctxt "field:account.move.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "Decimalke"
msgctxt "field:account.move.line,date:"
msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr "Dejanski datum"
msgctxt "field:account.move.line,debit:"
msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
-#, fuzzy
msgctxt "field:account.move.line,description:"
msgid "Description"
-msgstr "Specificatie"
+msgstr "Opis"
msgctxt "field:account.move.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.move.line,journal:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "field:account.move.line,maturity_date:"
msgid "Maturity Date"
-msgstr "Vervaldag"
+msgstr "Datum dospelosti"
msgctxt "field:account.move.line,move:"
msgid "Move"
-msgstr "Boeking"
+msgstr "Knjižba"
msgctxt "field:account.move.line,move_state:"
msgid "Move State"
-msgstr "Status boeking"
+msgstr "Stanje knjižbe"
msgctxt "field:account.move.line,origin:"
msgid "Origin"
-msgstr ""
+msgstr "Poreklo"
msgctxt "field:account.move.line,party:"
msgid "Party"
-msgstr "Relatie"
+msgstr "Stranka"
msgctxt "field:account.move.line,period:"
msgid "Period"
-msgstr "Periode"
+msgstr "Obdobje"
msgctxt "field:account.move.line,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.move.line,reconciliation:"
msgid "Reconciliation"
-msgstr "Aflettering"
+msgstr "Uskladitev"
msgctxt "field:account.move.line,second_currency:"
msgid "Second Currency"
-msgstr "Tweede valuta"
+msgstr "Druga valuta"
msgctxt "field:account.move.line,second_currency_digits:"
msgid "Second Currency Digits"
-msgstr "Tweede valuta decimalen"
+msgstr "Decimalke druge valute"
msgctxt "field:account.move.line,state:"
msgid "State"
-msgstr "Status"
+msgstr "Stanje"
msgctxt "field:account.move.line,tax_lines:"
msgid "Tax Lines"
-msgstr "Belasting regels"
+msgstr "Davčne postavke"
msgctxt "field:account.move.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.move.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.move.open_journal.ask,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.move.open_journal.ask,journal:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "field:account.move.open_journal.ask,period:"
msgid "Period"
-msgstr "Periode"
+msgstr "Obdobje"
-#, fuzzy
msgctxt "field:account.move.open_reconcile_lines.start,account:"
msgid "Account"
-msgstr "Rekeningen"
+msgstr "Konto"
msgctxt "field:account.move.open_reconcile_lines.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:account.move.print_general_journal.start,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
-#, fuzzy
msgctxt "field:account.move.print_general_journal.start,from_date:"
msgid "From Date"
-msgstr "Vanaf datum"
+msgstr "Od"
msgctxt "field:account.move.print_general_journal.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.move.print_general_journal.start,posted:"
msgid "Posted Move"
-msgstr ""
+msgstr "Knjižbe"
-#, fuzzy
msgctxt "field:account.move.print_general_journal.start,to_date:"
msgid "To Date"
-msgstr "Tot datum"
+msgstr "Do"
msgctxt "field:account.move.reconcile_lines.writeoff,account:"
msgid "Account"
-msgstr "Rekening"
+msgstr "Konto"
+
+msgctxt "field:account.move.reconcile_lines.writeoff,amount:"
+msgid "Amount"
+msgstr "Znesek"
+
+msgctxt "field:account.move.reconcile_lines.writeoff,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimalke"
msgctxt "field:account.move.reconcile_lines.writeoff,date:"
msgid "Date"
@@ -1252,2093 +1290,2032 @@ msgstr "Datum"
msgctxt "field:account.move.reconcile_lines.writeoff,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.move.reconcile_lines.writeoff,journal:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "field:account.move.reconciliation,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.move.reconciliation,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.move.reconciliation,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.move.reconciliation,lines:"
msgid "Lines"
-msgstr "Regels"
+msgstr "Postavke"
msgctxt "field:account.move.reconciliation,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.move.reconciliation,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.move.reconciliation,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.move.reconciliation,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.move.unreconcile_lines.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:account.open_aged_balance.start,balance_type:"
msgid "Type"
-msgstr "Type"
+msgstr "Tip"
-#, fuzzy
msgctxt "field:account.open_aged_balance.start,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.open_aged_balance.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.open_aged_balance.start,posted:"
msgid "Posted Move"
-msgstr ""
+msgstr "Knjižbe"
msgctxt "field:account.open_aged_balance.start,term1:"
msgid "First Term"
-msgstr ""
+msgstr "Prvi rok"
msgctxt "field:account.open_aged_balance.start,term2:"
msgid "Second Term"
-msgstr ""
+msgstr "Drugi rok"
msgctxt "field:account.open_aged_balance.start,term3:"
msgid "Third Term"
-msgstr ""
+msgstr "Tretji rok"
-#, fuzzy
msgctxt "field:account.open_aged_balance.start,unit:"
msgid "Unit"
-msgstr "Eenheid"
+msgstr "Enota"
-#, fuzzy
msgctxt "field:account.open_balance_sheet.start,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
-#, fuzzy
msgctxt "field:account.open_balance_sheet.start,date:"
msgid "Date"
-msgstr "Vervaldatum"
+msgstr "Datum"
msgctxt "field:account.open_balance_sheet.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.open_balance_sheet.start,posted:"
msgid "Posted Move"
-msgstr ""
+msgstr "Knjižbe"
-#, fuzzy
msgctxt "field:account.open_chart.start,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.open_chart.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.open_chart.start,posted:"
-msgid "Posted Move"
-msgstr ""
+msgid "Posted Moves"
+msgstr "Knjižbe"
-#, fuzzy
msgctxt "field:account.open_income_statement.start,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.open_income_statement.start,end_period:"
msgid "End Period"
-msgstr ""
+msgstr "Do"
-#, fuzzy
msgctxt "field:account.open_income_statement.start,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.open_income_statement.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.open_income_statement.start,posted:"
msgid "Posted Move"
-msgstr ""
+msgstr "Knjižbe"
msgctxt "field:account.open_income_statement.start,start_period:"
msgid "Start Period"
-msgstr ""
+msgstr "Od"
-#, fuzzy
msgctxt "field:account.open_third_party_balance.start,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
-#, fuzzy
msgctxt "field:account.open_third_party_balance.start,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.open_third_party_balance.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.open_third_party_balance.start,posted:"
msgid "Posted Move"
-msgstr ""
+msgstr "Knjižbe"
msgctxt "field:account.period,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
-#, fuzzy
msgctxt "field:account.period,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.period,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.period,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.period,end_date:"
msgid "Ending Date"
-msgstr "Einddatum"
+msgstr "Do"
msgctxt "field:account.period,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.period,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.period,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.period,post_move_sequence:"
msgid "Post Move Sequence"
-msgstr "Boeking bevestigingsreeks"
+msgstr "Štetje knjižb"
msgctxt "field:account.period,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.period,start_date:"
msgid "Starting Date"
-msgstr "Start datum"
+msgstr "Od"
msgctxt "field:account.period,state:"
msgid "State"
-msgstr "Status"
+msgstr "Stanje"
msgctxt "field:account.period,type:"
msgid "Type"
-msgstr "Type"
+msgstr "Tip"
msgctxt "field:account.period,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.period,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
-#, fuzzy
msgctxt "field:account.print_general_ledger.start,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.print_general_ledger.start,empty_account:"
msgid "Empty Account"
-msgstr ""
+msgstr "Prazni konti"
msgctxt "field:account.print_general_ledger.start,end_period:"
msgid "End Period"
-msgstr ""
+msgstr "Do"
-#, fuzzy
msgctxt "field:account.print_general_ledger.start,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.print_general_ledger.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.print_general_ledger.start,posted:"
msgid "Posted Move"
-msgstr ""
+msgstr "Knjižbe"
msgctxt "field:account.print_general_ledger.start,start_period:"
msgid "Start Period"
-msgstr ""
+msgstr "Od"
-#, fuzzy
msgctxt "field:account.print_trial_balance.start,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.print_trial_balance.start,empty_account:"
msgid "Empty Account"
-msgstr ""
+msgstr "Prazni konti"
msgctxt "field:account.print_trial_balance.start,end_period:"
msgid "End Period"
-msgstr ""
+msgstr "Do"
-#, fuzzy
msgctxt "field:account.print_trial_balance.start,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.print_trial_balance.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.print_trial_balance.start,posted:"
msgid "Posted Move"
-msgstr ""
+msgstr "Knjižbe"
msgctxt "field:account.print_trial_balance.start,start_period:"
msgid "Start Period"
-msgstr ""
+msgstr "Od"
msgctxt "field:account.tax,active:"
msgid "Active"
-msgstr "Actief"
+msgstr "Aktivno"
msgctxt "field:account.tax,amount:"
msgid "Amount"
-msgstr "Bedrag"
+msgstr "Znesek"
msgctxt "field:account.tax,childs:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Poddavki"
msgctxt "field:account.tax,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.tax,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax,credit_note_account:"
msgid "Credit Note Account"
-msgstr "Creditnota rekening"
+msgstr "Konto dobropisa"
msgctxt "field:account.tax,credit_note_base_code:"
msgid "Credit Note Base Code"
-msgstr "Creditnota basisbedragcode"
+msgstr "Šifra osnove dobropisa"
msgctxt "field:account.tax,credit_note_base_sign:"
msgid "Credit Note Base Sign"
-msgstr "Creditnota basisbedragteken"
+msgstr "Predznak osnove dobropisa"
msgctxt "field:account.tax,credit_note_tax_code:"
msgid "Credit Note Tax Code"
-msgstr "Creditnota belastingcode"
+msgstr "Šifra davka dobropisa"
msgctxt "field:account.tax,credit_note_tax_sign:"
msgid "Credit Note Tax Sign"
-msgstr "Creditnota belastingteken"
+msgstr "Predznak davka dobropisa"
msgctxt "field:account.tax,currency_digits:"
msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "Decimalke"
msgctxt "field:account.tax,description:"
msgid "Description"
-msgstr "Omschrijving"
+msgstr "Opis"
msgctxt "field:account.tax,group:"
msgid "Group"
-msgstr "Groep"
+msgstr "Skupina"
msgctxt "field:account.tax,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.tax,invoice_account:"
msgid "Invoice Account"
-msgstr "Factuurrekening"
+msgstr "Konto računa"
msgctxt "field:account.tax,invoice_base_code:"
msgid "Invoice Base Code"
-msgstr "Factuur basis"
+msgstr "Šifra osnove računa"
msgctxt "field:account.tax,invoice_base_sign:"
msgid "Invoice Base Sign"
-msgstr "Factuur basis teken"
+msgstr "Predznak osnove računa"
msgctxt "field:account.tax,invoice_tax_code:"
msgid "Invoice Tax Code"
-msgstr "Factuur belasting"
+msgstr "Šifra davka računa"
msgctxt "field:account.tax,invoice_tax_sign:"
msgid "Invoice Tax Sign"
-msgstr "Factuur belasting teken"
+msgstr "Predznak davka računa"
msgctxt "field:account.tax,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.tax,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "Matični davek"
-msgctxt "field:account.tax,percentage:"
-msgid "Percentage"
-msgstr "Percentage"
+msgctxt "field:account.tax,rate:"
+msgid "Rate"
+msgstr "Stopnja"
msgctxt "field:account.tax,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr "Zap.št."
msgctxt "field:account.tax,template:"
msgid "Template"
-msgstr "Sjabloon"
+msgstr "Predloga"
msgctxt "field:account.tax,type:"
msgid "Type"
-msgstr "Type"
+msgstr "Tip"
msgctxt "field:account.tax,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.tax.code,active:"
msgid "Active"
-msgstr "Actief"
+msgstr "Aktivno"
msgctxt "field:account.tax.code,childs:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Podšifre"
msgctxt "field:account.tax.code,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.tax.code,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.tax.code,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.code,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.code,currency_digits:"
msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "Decimalke"
msgctxt "field:account.tax.code,description:"
msgid "Description"
-msgstr "Omschrijving"
+msgstr "Opis"
msgctxt "field:account.tax.code,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.tax.code,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.tax.code,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "Matična šifra"
msgctxt "field:account.tax.code,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.code,sum:"
msgid "Sum"
-msgstr "Totaal"
+msgstr "Vsota"
msgctxt "field:account.tax.code,template:"
msgid "Template"
-msgstr "Sjabloon"
+msgstr "Predloga"
msgctxt "field:account.tax.code,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.code,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
-#, fuzzy
msgctxt "field:account.tax.code.open_chart.start,fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "field:account.tax.code.open_chart.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.tax.code.open_chart.start,method:"
msgid "Method"
-msgstr ""
+msgstr "Metoda"
-#, fuzzy
msgctxt "field:account.tax.code.open_chart.start,periods:"
msgid "Periods"
-msgstr "Perioden"
+msgstr "Obdobja"
msgctxt "field:account.tax.code.template,account:"
msgid "Account Template"
-msgstr "Rekeningsjabloon"
+msgstr "Predloga konta"
msgctxt "field:account.tax.code.template,childs:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Podšifre"
msgctxt "field:account.tax.code.template,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.tax.code.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.code.template,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.code.template,description:"
msgid "Description"
-msgstr "Omschrijving"
+msgstr "Opis"
msgctxt "field:account.tax.code.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.tax.code.template,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.tax.code.template,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "Matična šifra"
msgctxt "field:account.tax.code.template,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.code.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.code.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.tax.group,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.tax.group,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.group,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.group,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:account.tax.group,kind:"
msgid "Kind"
-msgstr "Soort"
+msgstr "Vrsta"
msgctxt "field:account.tax.group,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.tax.group,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.group,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.group,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.tax.line,amount:"
msgid "Amount"
-msgstr "Bedrag"
+msgstr "Znesek"
msgctxt "field:account.tax.line,code:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "field:account.tax.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "Decimalke"
msgctxt "field:account.tax.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.tax.line,move_line:"
msgid "Move Line"
-msgstr "Boekingsregel"
+msgstr "Postavka knjižbe"
msgctxt "field:account.tax.line,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.line,tax:"
msgid "Tax"
-msgstr "Belasting"
+msgstr "Davek"
msgctxt "field:account.tax.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.tax.rule,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr "Podjetje"
msgctxt "field:account.tax.rule,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.rule,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.rule,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:account.tax.rule,kind:"
msgid "Kind"
-msgstr "Soort"
+msgstr "Vrsta"
msgctxt "field:account.tax.rule,lines:"
msgid "Lines"
-msgstr "Regels"
+msgstr "Postavke"
msgctxt "field:account.tax.rule,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.tax.rule,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.rule,template:"
msgid "Template"
-msgstr "Sjabloon"
+msgstr "Predloga"
msgctxt "field:account.tax.rule,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.rule,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.tax.rule.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.rule.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.rule.line,group:"
msgid "Tax Group"
-msgstr "Belastinggroep"
+msgstr "Davčna skupina"
msgctxt "field:account.tax.rule.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.tax.rule.line,origin_tax:"
msgid "Original Tax"
-msgstr "Basis belasting"
+msgstr "Izvorni davek"
msgctxt "field:account.tax.rule.line,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.rule.line,rule:"
msgid "Rule"
-msgstr "Regel"
+msgstr "Pravilo"
msgctxt "field:account.tax.rule.line,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr "Zap.št."
msgctxt "field:account.tax.rule.line,tax:"
msgid "Substitution Tax"
-msgstr "Vervangende belasting"
+msgstr "Nadomestni davek"
msgctxt "field:account.tax.rule.line,template:"
msgid "Template"
-msgstr "Sjabloon"
+msgstr "Predloga"
msgctxt "field:account.tax.rule.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.rule.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.tax.rule.line.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.rule.line.template,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.rule.line.template,group:"
msgid "Tax Group"
-msgstr "Belastinggroep"
+msgstr "Davčna skupina"
msgctxt "field:account.tax.rule.line.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.tax.rule.line.template,origin_tax:"
msgid "Original Tax"
-msgstr "Basis belasting"
+msgstr "Izvorni davek"
msgctxt "field:account.tax.rule.line.template,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.rule.line.template,rule:"
msgid "Rule"
-msgstr "Regel"
+msgstr "Pravilo"
msgctxt "field:account.tax.rule.line.template,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr "Zap.št."
msgctxt "field:account.tax.rule.line.template,tax:"
msgid "Substitution Tax"
-msgstr "Vervangende belasting"
+msgstr "Nadomestni davek"
msgctxt "field:account.tax.rule.line.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.rule.line.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.tax.rule.template,account:"
msgid "Account Template"
-msgstr "Rekeningsjabloon"
+msgstr "Predloga konta"
msgctxt "field:account.tax.rule.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.rule.template,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.rule.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
-#, fuzzy
msgctxt "field:account.tax.rule.template,kind:"
msgid "Kind"
-msgstr "Soort"
+msgstr "Vrsta"
msgctxt "field:account.tax.rule.template,lines:"
msgid "Lines"
-msgstr "Regels"
+msgstr "Postavke"
msgctxt "field:account.tax.rule.template,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.tax.rule.template,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.rule.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.rule.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.tax.template,account:"
msgid "Account Template"
-msgstr "Rekeningsjabloon"
+msgstr "Predloga konta"
msgctxt "field:account.tax.template,amount:"
msgid "Amount"
-msgstr "Bedrag"
+msgstr "Znesek"
msgctxt "field:account.tax.template,childs:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Poddavki"
msgctxt "field:account.tax.template,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Ustvarjeno"
msgctxt "field:account.tax.template,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Ustvaril"
msgctxt "field:account.tax.template,credit_note_account:"
msgid "Credit Note Account"
-msgstr "Creditnota rekening"
+msgstr "Konto dobropisa"
msgctxt "field:account.tax.template,credit_note_base_code:"
msgid "Credit Note Base Code"
-msgstr "Creditnota basisbedragcode"
+msgstr "Šifra osnove dobropisa"
msgctxt "field:account.tax.template,credit_note_base_sign:"
msgid "Credit Note Base Sign"
-msgstr "Creditnota basisbedragteken"
+msgstr "Predznak osnove dobropisa"
msgctxt "field:account.tax.template,credit_note_tax_code:"
msgid "Credit Note Tax Code"
-msgstr "Creditnota belastingcode"
+msgstr "Šifra davka dobropisa"
msgctxt "field:account.tax.template,credit_note_tax_sign:"
msgid "Credit Note Tax Sign"
-msgstr "Creditnota belastingteken"
+msgstr "Predznak davka dobropisa"
msgctxt "field:account.tax.template,description:"
msgid "Description"
-msgstr "Omschrijving"
+msgstr "Opis"
msgctxt "field:account.tax.template,group:"
msgid "Group"
-msgstr "Groep"
+msgstr "Skupina"
msgctxt "field:account.tax.template,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.tax.template,invoice_account:"
msgid "Invoice Account"
-msgstr "Factuurrekening"
+msgstr "Konto računa"
msgctxt "field:account.tax.template,invoice_base_code:"
msgid "Invoice Base Code"
-msgstr "Factuur basis"
+msgstr "Šifra osnove računa"
msgctxt "field:account.tax.template,invoice_base_sign:"
msgid "Invoice Base Sign"
-msgstr "Factuur basis teken"
+msgstr "Predznak osnove računa"
msgctxt "field:account.tax.template,invoice_tax_code:"
msgid "Invoice Tax Code"
-msgstr "Factuur belasting"
+msgstr "Šifra davka računa"
msgctxt "field:account.tax.template,invoice_tax_sign:"
msgid "Invoice Tax Sign"
-msgstr "Factuur belasting teken"
+msgstr "Predznak davka računa"
msgctxt "field:account.tax.template,name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Naziv"
msgctxt "field:account.tax.template,parent:"
msgid "Parent"
-msgstr "Bovenliggend niveau"
+msgstr "Matični davek"
-msgctxt "field:account.tax.template,percentage:"
-msgid "Percentage"
-msgstr "Percentage"
+msgctxt "field:account.tax.template,rate:"
+msgid "Rate"
+msgstr "Stopnja"
msgctxt "field:account.tax.template,rec_name:"
msgid "Name"
-msgstr "Naam"
+msgstr "Ime"
msgctxt "field:account.tax.template,sequence:"
msgid "Sequence"
-msgstr "Reeks"
+msgstr "Zap.št."
msgctxt "field:account.tax.template,type:"
msgid "Type"
-msgstr "Type"
+msgstr "Tip"
msgctxt "field:account.tax.template,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Zapisano"
msgctxt "field:account.tax.template,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisal"
msgctxt "field:account.update_chart.start,account:"
msgid "Root Account"
-msgstr ""
+msgstr "Korenski konto"
msgctxt "field:account.update_chart.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:account.update_chart.succeed,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:party.party,account_payable:"
msgid "Account Payable"
-msgstr "Rekening betalen"
+msgstr "Konto obveznosti"
msgctxt "field:party.party,account_receivable:"
msgid "Account Receivable"
-msgstr "Rekening ontvangen"
+msgstr "Konto terjatev"
msgctxt "field:party.party,customer_tax_rule:"
msgid "Customer Tax Rule"
-msgstr "Belastingregel verkopen"
+msgstr "Davčno pravilo kupca"
msgctxt "field:party.party,payable:"
msgid "Payable"
-msgstr "Te betalen"
+msgstr "Obveznosti"
msgctxt "field:party.party,payable_today:"
msgid "Payable Today"
-msgstr "Te betalen per vandaag"
+msgstr "Trenutne obveznosti"
msgctxt "field:party.party,receivable:"
msgid "Receivable"
-msgstr "Te ontvangen"
+msgstr "Terjatve"
msgctxt "field:party.party,receivable_today:"
msgid "Receivable Today"
-msgstr "Te ontvangen per vandaag"
+msgstr "Trenutne terjatve"
msgctxt "field:party.party,supplier_tax_rule:"
msgid "Supplier Tax Rule"
-msgstr "Belastingregel inkopen"
+msgstr "Davčno pravilo dobavitelja"
msgctxt "help:account.account,reconcile:"
msgid ""
"Allow move lines of this account \n"
"to be reconciled."
-msgstr "Sta boekingen op deze rekening toe"
+msgstr "Dopušča usklajevanje knjiženih postavk tega konta."
msgctxt "help:account.account,second_currency:"
msgid ""
"Force all moves for this account \n"
"to have this secondary currency."
-msgstr "Forceer alle boekingen voor deze rekening"
+msgstr "Vsem vknjižbam za ta konto prisili uporabo te druge valute."
msgctxt "help:account.account,taxes:"
msgid ""
"Default tax for manual encoding of move lines \n"
"for journal types: \"expense\" and \"revenue\""
msgstr ""
-"Standaard belasting voor handmatig coderen van boekingen\n"
-"voor de dagboektypen: \"kosten\" en \"opbrengsten\""
+"Privzeti davek pri ročno vnešenih postavkah \n"
+"za dnevnike tipa \"odhodek\" in \"prihodek\""
msgctxt "help:account.account.type,sequence:"
msgid "Use to order the account type"
-msgstr "Gebruiken om rekeningtype te ordenen"
+msgstr "Za razvrščanje tipov kontov"
msgctxt "help:account.move,post_number:"
msgid "Also known as Folio Number"
-msgstr ""
+msgstr "Znana tudi kot 'Folio' številka"
msgctxt "help:account.move.line,amount_second_currency:"
msgid "The amount expressed in a second currency"
-msgstr "Het bedrag uitgedrukt in een tweede valuta"
+msgstr "Znesek v drugotni valuti"
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 ""
-"Dit veld wordt gebruikt voor betalen en ontvangen.\n"
-"Bepaal de uiterste betaaldatum."
+"To polje se uporablja za postavke obveznosti in terjatev.\n"
+"Vstavite lahko datum zapadlosti plačila."
msgctxt "help:account.move.line,second_currency:"
msgid "The second currency"
-msgstr "De tweede valuta"
+msgstr "Druga valuta"
msgctxt "help:account.move.print_general_journal.start,posted:"
msgid "Show only posted move"
-msgstr ""
+msgstr "Prikaži samo knjižene postavke"
msgctxt "help:account.open_aged_balance.start,posted:"
msgid "Show only posted move"
-msgstr ""
+msgstr "Prikaži samo knjižene postavke"
msgctxt "help:account.open_balance_sheet.start,posted:"
msgid "Show only posted move"
-msgstr ""
+msgstr "Prikaži samo knjižene postavke"
msgctxt "help:account.open_chart.start,fiscalyear:"
msgid "Leave empty for all open fiscal year"
-msgstr ""
+msgstr "Pusti prazno za vsa odpra poslovna leta"
msgctxt "help:account.open_chart.start,posted:"
-msgid "Show only posted move"
-msgstr ""
+msgid "Show posted moves only"
+msgstr "Prikaži samo knjižene postavke"
msgctxt "help:account.open_income_statement.start,posted:"
msgid "Show only posted move"
-msgstr ""
+msgstr "Prikaži samo knjižene postavke"
msgctxt "help:account.open_third_party_balance.start,posted:"
msgid "Show only posted move"
-msgstr ""
+msgstr "Prikaži samo knjižene postavke"
msgctxt "help:account.print_general_ledger.start,empty_account:"
msgid "With account without move"
-msgstr ""
+msgstr "S praznimi konti"
msgctxt "help:account.print_general_ledger.start,posted:"
msgid "Show only posted move"
-msgstr ""
+msgstr "Prikaži samo knjižene postavke"
msgctxt "help:account.print_trial_balance.start,empty_account:"
msgid "With account without move"
-msgstr ""
+msgstr "S praznimi konti"
msgctxt "help:account.print_trial_balance.start,posted:"
msgid "Show only posted move"
-msgstr ""
+msgstr "Prikaži samo knjižene postavke"
msgctxt "help:account.tax,amount:"
msgid "In company's currency"
-msgstr "In de valuta van het bedrijf"
+msgstr "V valuti podjetja"
msgctxt "help:account.tax,credit_note_base_sign:"
msgid "Usualy 1 or -1"
-msgstr "Doorgaans 1 of -1"
+msgstr "Ponavadi 1 ali -1"
msgctxt "help:account.tax,credit_note_tax_sign:"
msgid "Usualy 1 or -1"
-msgstr "Doorgaans 1 of -1"
+msgstr "Ponavadi 1 ali -1"
msgctxt "help:account.tax,description:"
msgid "The name that will be used in reports"
-msgstr "De naam die gebruikt zal worden in de rapportages"
+msgstr "Opis se uporablja v poročilih"
msgctxt "help:account.tax,invoice_base_sign:"
msgid "Usualy 1 or -1"
-msgstr "Doorgaans 1 of -1"
+msgstr "Ponavadi 1 ali -1"
msgctxt "help:account.tax,invoice_tax_sign:"
msgid "Usualy 1 or -1"
-msgstr "Doorgaans 1 of -1"
-
-msgctxt "help:account.tax,percentage:"
-msgid "In %"
-msgstr "In %"
+msgstr "Ponavadi 1 ali -1"
msgctxt "help:account.tax,sequence:"
msgid "Use to order the taxes"
-msgstr "Gebruiken om belastingen te ordenen"
+msgstr "Za razvrščanje davkov"
msgctxt "help:account.tax.code.open_chart.start,fiscalyear:"
msgid "Leave empty for all open fiscal year"
-msgstr ""
+msgstr "Prazno za vsa odprta poslovna leta"
msgctxt "help:account.tax.code.open_chart.start,periods:"
msgid "Leave empty for all periods of all open fiscal year"
-msgstr ""
+msgstr "Prazno za vsa obdobja vse odprtih poslovnih let"
msgctxt "help:account.tax.rule.line,origin_tax:"
msgid ""
"If the original tax is filled, the rule will be applied only for this tax."
-msgstr ""
-"Als de basisbelasting is ingevuld zal de regel alleen toegepast worden voor "
-"deze belasting."
+msgstr "Če je izvorni davek vnešen, velja predpis samo za ta davek."
msgctxt "help:account.tax.rule.line.template,origin_tax:"
msgid ""
"If the original tax template is filled, the rule will be applied only for "
"this tax template."
msgstr ""
-"Als de basisbelasting is ingevuld zal de regel alleen toegepast worden voor "
-"deze belastingsjabloon."
+"Če je izvorna predloga davka vnešena, velja predpis samo za to predlogo "
+"davka"
msgctxt "help:party.party,customer_tax_rule:"
msgid "Apply this rule on taxes when party is customer."
-msgstr "Pas deze belastingregel toe als de relatie een klant is."
+msgstr "Če je stranka kupec, uporabi ta davčni predpis."
msgctxt "help:party.party,supplier_tax_rule:"
msgid "Apply this rule on taxes when party is supplier."
-msgstr "Pas deze belastingregel toe als de relatie een leverancier is."
+msgstr "Če je stranka dobavitelj, uporabi ta davčni predpis."
msgctxt "model:account.account,name:"
msgid "Account"
-msgstr "Rekening"
+msgstr "Konto"
msgctxt "model:account.account-account.tax,name:"
msgid "Account - Tax"
-msgstr "Rekening - belastingen"
+msgstr "Konto - Davek"
msgctxt "model:account.account.deferral,name:"
msgid "Account Deferral"
-msgstr "Rekening met historie"
+msgstr "Odlog"
msgctxt "model:account.account.template,name:"
msgid "Account Template"
-msgstr "Rekeningsjabloon"
+msgstr "Predloga konta"
msgctxt "model:account.account.template,name:account_template_cash"
msgid "Main Cash"
-msgstr "Basis kasrekening"
+msgstr "Glavna denarna sredstva"
msgctxt "model:account.account.template,name:account_template_expense"
msgid "Main Expense"
-msgstr "Basis kostenrekening"
+msgstr "Glavni odhodki"
msgctxt "model:account.account.template,name:account_template_payable"
msgid "Main Payable"
-msgstr "Basisrekening betalen"
+msgstr "Glavne obveznosti"
msgctxt "model:account.account.template,name:account_template_receivable"
msgid "Main Receivable"
-msgstr "Basisrekening ontvangen"
+msgstr "Glavne terjatve"
msgctxt "model:account.account.template,name:account_template_revenue"
msgid "Main Revenue"
-msgstr "Basis opbrengstrekening"
+msgstr "Glavni prihodki"
msgctxt "model:account.account.template,name:account_template_root"
msgid "Minimal Account Chart"
-msgstr "Basaal rekeningschema"
+msgstr "Minimalni kontni načrt"
msgctxt "model:account.account.template,name:account_template_tax"
msgid "Main Tax"
-msgstr "Basis belastingrekening"
+msgstr "Glavni davki"
msgctxt "model:account.account.template-account.tax.template,name:"
msgid "Account Template - Tax Template"
-msgstr "Rekeningsjabloon - Belastingsjabloon"
+msgstr "Predloga konta - Predloga davka"
msgctxt "model:account.account.type,name:"
msgid "Account Type"
-msgstr "Rekeningtype"
+msgstr "Tip konta"
msgctxt "model:account.account.type.template,name:"
msgid "Account Type Template"
-msgstr "Rekeningtype sjabloon"
+msgstr "Predloga tipa konta"
msgctxt "model:account.account.type.template,name:account_type_template_asset"
msgid "Asset"
-msgstr "Activa"
+msgstr "Sredstvo"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_current"
msgid "Current"
-msgstr "Actueel"
+msgstr "Kratkoročno"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_current_cash"
msgid "Cash"
-msgstr "Kas"
+msgstr "Denarna sredstva"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_current_receivable"
msgid "Receivable"
-msgstr "Ontvangen"
+msgstr "Terjatve"
msgctxt ""
"model:account.account.type.template,name:account_type_template_asset_long_term"
msgid "Long-term"
-msgstr "Langlopend"
+msgstr "Dolgoročno"
msgctxt ""
"model:account.account.type.template,name:account_type_template_equity"
msgid "Equity"
-msgstr "Eigen vermogen"
+msgstr "Kapital"
msgctxt ""
"model:account.account.type.template,name:account_type_template_expense"
msgid "Expense"
-msgstr "Kosten"
+msgstr "Odhodki"
msgctxt ""
"model:account.account.type.template,name:account_type_template_income"
msgid "Income"
-msgstr "Inkomsten"
+msgstr "Prihodki"
msgctxt ""
"model:account.account.type.template,name:account_type_template_liability"
msgid "Liability"
-msgstr "Verplichting"
+msgstr "Obveznosti"
msgctxt ""
"model:account.account.type.template,name:account_type_template_liability_current"
msgid "Current"
-msgstr "Actueel"
+msgstr "Kratkoročno"
msgctxt ""
"model:account.account.type.template,name:account_type_template_liability_current_payable"
msgid "Payable"
-msgstr "Betalen"
+msgstr "Obveznosti"
msgctxt ""
"model:account.account.type.template,name:account_type_template_liability_current_tax"
msgid "Tax"
-msgstr "Belasting"
+msgstr "Davek"
msgctxt ""
"model:account.account.type.template,name:account_type_template_liability_long_term"
msgid "Long-term"
-msgstr "Langlopend"
+msgstr "Dolgoročno"
msgctxt ""
"model:account.account.type.template,name:account_type_template_minimal"
msgid "Minimal Account Type Chart"
-msgstr "Basaal rekeningschematype"
+msgstr "Minimalni kontni načrt"
msgctxt ""
"model:account.account.type.template,name:account_type_template_off_balance"
msgid "Off-Balance"
-msgstr "Buiten balans"
+msgstr "Zunaj bilance"
msgctxt ""
"model:account.account.type.template,name:account_type_template_revenue"
msgid "Revenue"
-msgstr "Opbrengst"
+msgstr "Prihodki"
msgctxt "model:account.configuration,name:"
msgid "Account Configuration"
-msgstr ""
+msgstr "Kontna konfiguracija"
msgctxt "model:account.create_chart.account,name:"
msgid "Create Chart"
-msgstr ""
+msgstr "Ustvari načrt"
msgctxt "model:account.create_chart.properties,name:"
msgid "Create Chart"
-msgstr ""
+msgstr "Ustvari načrt"
msgctxt "model:account.create_chart.start,name:"
msgid "Create Chart"
-msgstr ""
+msgstr "Ustvari načrt"
msgctxt "model:account.fiscalyear,name:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "model:account.fiscalyear-account.move.line,name:"
msgid "Fiscal Year - Move Line"
-msgstr "Boekjaar - boeking"
+msgstr "Poslovno leto - Knjižbe"
+
+msgctxt "model:account.fiscalyear.balance_non_deferral.start,name:"
+msgid "Balance Non-Deferral"
+msgstr "Razknjižba neodložljivih kontov"
-#, fuzzy
msgctxt "model:account.fiscalyear.close.start,name:"
msgid "Close Fiscal Year"
-msgstr "Sluit boekjaar"
+msgstr "Zaključi poslovno leto"
msgctxt "model:account.journal,name:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "model:account.journal,name:journal_cash"
msgid "Cash"
-msgstr "Kas"
+msgstr "Denarna sredstva"
msgctxt "model:account.journal,name:journal_expense"
msgid "Expense"
-msgstr "Kosten"
+msgstr "Odhodki"
msgctxt "model:account.journal,name:journal_revenue"
msgid "Revenue"
-msgstr "Opbrengst"
+msgstr "Prihodki"
msgctxt "model:account.journal,name:journal_stock"
msgid "Stock"
-msgstr "Voorraad"
+msgstr "Zaloga"
msgctxt "model:account.journal.period,name:"
msgid "Journal - Period"
-msgstr "Dagboek - periode"
+msgstr "Dnevnik po odbobjih"
msgctxt "model:account.journal.type,name:"
msgid "Journal Type"
-msgstr "Dagboektype"
+msgstr "Tip dnevnika"
msgctxt "model:account.journal.type,name:journal_type_cash"
msgid "Cash"
-msgstr "Kas"
+msgstr "Denarna sredstva"
msgctxt "model:account.journal.type,name:journal_type_expense"
msgid "Expense"
-msgstr "Kosten"
+msgstr "Odhodki"
msgctxt "model:account.journal.type,name:journal_type_general"
msgid "General"
-msgstr "Algemeen"
+msgstr "Splošno"
msgctxt "model:account.journal.type,name:journal_type_revenue"
msgid "Revenue"
-msgstr "Opbrengst"
+msgstr "Prihodki"
msgctxt "model:account.journal.type,name:journal_type_situation"
msgid "Situation"
-msgstr "Situatie"
+msgstr "Situacija"
msgctxt "model:account.journal.view,name:"
msgid "Journal View"
-msgstr "Dagboek indeling"
+msgstr "Vpogled v dnevnik"
msgctxt "model:account.journal.view.column,name:"
msgid "Journal View Column"
-msgstr "Dagboek indelingkolom"
+msgstr "Stolpec vpogleda"
msgctxt "model:account.move,name:"
msgid "Account Move"
-msgstr "Boeking"
+msgstr "Knjižba"
msgctxt "model:account.move.line,name:"
msgid "Account Move Line"
-msgstr "Boekingsregel"
+msgstr "Postavka knjižbe"
msgctxt "model:account.move.open_journal.ask,name:"
msgid "Open Journal Ask"
-msgstr "Open dagboek vragen"
+msgstr "Odpri dnevnik"
-#, fuzzy
msgctxt "model:account.move.open_reconcile_lines.start,name:"
msgid "Open Reconcile Lines"
-msgstr "Open afletteren"
+msgstr "Uskladitev postavk"
-#, fuzzy
msgctxt "model:account.move.print_general_journal.start,name:"
msgid "Print General Journal"
-msgstr "Algemeen dagboek afdrukken"
+msgstr "Izpis glavnega dnevnika"
msgctxt "model:account.move.reconcile_lines.writeoff,name:"
msgid "Reconcile Lines Write-Off"
-msgstr "Afschrijving boekingen afletteren"
+msgstr "Odpis usklajenih postavk"
msgctxt "model:account.move.reconciliation,name:"
msgid "Account Move Reconciliation Lines"
-msgstr "Afletterregels"
+msgstr "Usklajene postavke knjiženja"
-#, fuzzy
msgctxt "model:account.move.unreconcile_lines.start,name:"
msgid "Unreconcile Lines"
-msgstr "Afletteren ongedaan maken"
+msgstr "Odpravi uskladitev postavk"
-#, fuzzy
msgctxt "model:account.open_aged_balance.start,name:"
msgid "Open Aged Balance"
-msgstr "Ouderdomsanalyse openen"
+msgstr "Odpri bilanco zapadlih postavk"
-#, fuzzy
msgctxt "model:account.open_balance_sheet.start,name:"
msgid "Open Balance Sheet"
-msgstr "Open balans"
+msgstr "Odpri bilanco stanja"
msgctxt "model:account.open_chart.start,name:"
msgid "Open Chart of Accounts"
-msgstr ""
+msgstr "Odpri kontni načrt"
-#, fuzzy
msgctxt "model:account.open_income_statement.start,name:"
msgid "Open Income Statement"
-msgstr "Winst- & verliesrekening openen"
+msgstr "Odpri izkaz poslovnega izida"
-#, fuzzy
msgctxt "model:account.open_third_party_balance.start,name:"
msgid "Open Third Party Balance"
-msgstr "Openstaande posten openen"
+msgstr "Odpri bilanco kupcev in dobaviteljev"
msgctxt "model:account.period,name:"
msgid "Period"
-msgstr "Periode"
+msgstr "Obdobje"
msgctxt "model:account.print_general_ledger.start,name:"
msgid "Print General Ledger"
-msgstr ""
+msgstr "Izpis glavne knjige"
-#, fuzzy
msgctxt "model:account.print_trial_balance.start,name:"
msgid "Print Trial Balance"
-msgstr "Proefbalans afdrukken"
+msgstr "Izpis bruto bilance"
msgctxt "model:account.tax,name:"
msgid "Account Tax"
-msgstr "Rekening belastingen"
+msgstr "Davek"
msgctxt "model:account.tax.code,name:"
msgid "Tax Code"
-msgstr "Belastingcode"
+msgstr "Davčna šifra"
msgctxt "model:account.tax.code.open_chart.start,name:"
msgid "Open Chart of Tax Codes"
-msgstr ""
+msgstr "Odpri načrt davčnih šifer"
msgctxt "model:account.tax.code.template,name:"
msgid "Tax Code Template"
-msgstr "Belastingcode sjabloon"
+msgstr "Predloga davčne šifre"
msgctxt "model:account.tax.group,name:"
msgid "Tax Group"
-msgstr "Belastinggroep"
+msgstr "Davčna skupina"
msgctxt "model:account.tax.line,name:"
msgid "Tax Line"
-msgstr "Belasting regel"
+msgstr "Davčna postavka"
msgctxt "model:account.tax.rule,name:"
msgid "Tax Rule"
-msgstr "Belastingbepaling"
+msgstr "Davčno pravilo"
msgctxt "model:account.tax.rule.line,name:"
msgid "Tax Rule Line"
-msgstr "Belastingbepaling regel"
+msgstr "Postavka davčnega pravila"
msgctxt "model:account.tax.rule.line.template,name:"
msgid "Tax Rule Line Template"
-msgstr "Belastingbepaling regelsjabloon"
+msgstr "Predloga postavke davčnega pravila"
msgctxt "model:account.tax.rule.template,name:"
msgid "Tax Rule Template"
-msgstr "Belastingbepaling sjabloon"
+msgstr "Predloga davčnega pravila"
msgctxt "model:account.tax.template,name:"
msgid "Account Tax Template"
-msgstr "Rekening belastingsjabloon"
+msgstr "Predloga davka"
msgctxt "model:account.update_chart.start,name:"
msgid "Update Chart"
-msgstr ""
+msgstr "Posodobitev načrta"
msgctxt "model:account.update_chart.succeed,name:"
msgid "Update Chart"
-msgstr ""
+msgstr "Posodobitev načrta"
msgctxt "model:ir.action,name:act_account_balance_sheet_tree"
msgid "Balance Sheet"
-msgstr "Balansoverzicht"
+msgstr "Bilanca stanja"
msgctxt "model:ir.action,name:act_account_income_statement_tree"
msgid "Income Statement"
-msgstr "Winst- & verliesrekening"
+msgstr "Izkaz poslovnega izida"
-#, fuzzy
msgctxt "model:ir.action,name:act_account_list"
msgid "Accounts"
-msgstr "Rekeningen"
+msgstr "Konti"
-#, fuzzy
msgctxt "model:ir.action,name:act_account_list2"
msgid "Accounts"
-msgstr "Rekeningen"
+msgstr "Konti"
msgctxt "model:ir.action,name:act_account_template_tree"
msgid "Account Templates"
-msgstr "Rekeningsjablonen"
+msgstr "Predloge kontov"
msgctxt "model:ir.action,name:act_account_tree"
msgid "Accounts"
-msgstr "Rekeningen"
+msgstr "Konti"
msgctxt "model:ir.action,name:act_account_tree2"
msgid "Accounts"
-msgstr "Rekeningen"
+msgstr "Konti"
-#, fuzzy
msgctxt "model:ir.action,name:act_account_type_list"
msgid "Account Types"
-msgstr "Rekeningtypen"
+msgstr "Tip kontov"
msgctxt "model:ir.action,name:act_account_type_template_tree"
msgid "Account Type Templates"
-msgstr "Rekeningtype sjablonen"
+msgstr "Predloge tipov kontov"
msgctxt "model:ir.action,name:act_account_type_tree"
msgid "Account Types"
-msgstr "Rekeningtypen"
+msgstr "Tipi kontov"
+
+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_close_fiscalyear"
msgid "Close Fiscal Year"
-msgstr "Sluit boekjaar"
+msgstr "Zaključi poslovno leto"
msgctxt "model:ir.action,name:act_code_tax_open_chart"
msgid "Open Chart of Tax Codes"
-msgstr ""
+msgstr "Odpri načrt šifer davkov"
msgctxt "model:ir.action,name:act_configuration_form"
msgid "Account Configuration"
-msgstr ""
+msgstr "Kontna konfiguracija"
msgctxt "model:ir.action,name:act_fiscalyear_form"
msgid "Fiscal Years"
-msgstr "Boekjaren"
+msgstr "Poslovna leta"
msgctxt "model:ir.action,name:act_journal_form"
msgid "Journals"
-msgstr "Dagboeken"
+msgstr "Dnevniki"
-#, fuzzy
msgctxt "model:ir.action,name:act_journal_period_close"
msgid "Close Journals - Periods"
-msgstr "Sluit dagboeken - perioden"
+msgstr "Zaključi dnevnike po obdobjih"
msgctxt "model:ir.action,name:act_journal_period_form"
msgid "Journals - Periods"
-msgstr "Dagboeken - perioden"
+msgstr "Dnevniki po obdobjih"
msgctxt "model:ir.action,name:act_journal_period_reopen"
msgid "Re-Open Journals - Periods"
-msgstr ""
+msgstr "Znova odpri dnevnike po obdobjih"
msgctxt "model:ir.action,name:act_journal_period_tree"
msgid "Journals - Periods"
-msgstr "Dagboeken"
+msgstr "Dnevniki po obdobjih"
msgctxt "model:ir.action,name:act_journal_period_tree2"
msgid "Journals - Periods"
-msgstr "Dagboeken - perioden"
+msgstr "Dnevniki po obdobjih"
msgctxt "model:ir.action,name:act_journal_type_form"
msgid "Journal Types"
-msgstr "Dagboektypen"
+msgstr "Tipi dnevnikov"
msgctxt "model:ir.action,name:act_journal_view_form"
msgid "Journal Views"
-msgstr "Dagboek indelingen"
+msgstr "Dnevniški vpogledi"
msgctxt "model:ir.action,name:act_move_form"
msgid "Account Moves"
-msgstr "Boekingen"
+msgstr "Knjižbe"
msgctxt "model:ir.action,name:act_move_line_form"
msgid "Account Move Lines"
-msgstr "Boekingsregels"
+msgstr "Postavke knjižb"
msgctxt "model:ir.action,name:act_move_line_payable"
msgid "Payable Lines"
-msgstr ""
+msgstr "Postavke obveznosti"
msgctxt "model:ir.action,name:act_move_line_receivable"
msgid "Receivable Lines"
-msgstr ""
+msgstr "Postavke terjatev"
msgctxt "model:ir.action,name:act_open_account"
msgid "Open Move Account"
-msgstr "Boeking rekening openen"
+msgstr "Odpri konto postavke"
msgctxt "model:ir.action,name:act_open_chart"
msgid "Open Chart of Accounts"
-msgstr ""
+msgstr "Odpri kontni načrt"
msgctxt "model:ir.action,name:act_open_journal"
msgid "Open Journal"
-msgstr "Open dagboek"
+msgstr "Odpri dnevnik"
msgctxt "model:ir.action,name:act_open_reconcile_lines"
msgid "Open Reconcile Lines"
-msgstr "Open afletteren"
+msgstr "Uskladitev postavk"
msgctxt "model:ir.action,name:act_open_tax_code"
msgid "Open Tax Code"
-msgstr "Open belastingcode"
+msgstr "Odpri davčno šifro"
msgctxt "model:ir.action,name:act_open_type"
msgid "Open Type"
-msgstr ""
+msgstr "Odpri tip"
-#, fuzzy
msgctxt "model:ir.action,name:act_period_close"
msgid "Close Periods"
-msgstr "Perioden afsluiten"
+msgstr "Zaključi obdobja"
msgctxt "model:ir.action,name:act_period_form"
msgid "Periods"
-msgstr "Perioden"
+msgstr "Obdobja"
msgctxt "model:ir.action,name:act_period_form2"
msgid "Periods"
-msgstr "Perioden"
+msgstr "Obdobja"
msgctxt "model:ir.action,name:act_period_reopen"
msgid "Re-Open Periods"
-msgstr ""
+msgstr "Znova odpri obdobja"
msgctxt "model:ir.action,name:act_reconcile_lines"
msgid "Reconcile Lines"
-msgstr "Boekingen afletteren"
+msgstr "Uskladi postavke"
-#, fuzzy
msgctxt "model:ir.action,name:act_tax_code_list"
msgid "Tax Codes"
-msgstr "Belastingen"
+msgstr "Davčne šifre"
msgctxt "model:ir.action,name:act_tax_code_template_tree"
msgid "Tax Codes Templates"
-msgstr "Belastingcodes sjablonen"
+msgstr "Predloge davčnih šifer"
msgctxt "model:ir.action,name:act_tax_code_tree"
msgid "Tax Codes"
-msgstr "Belastingcodes"
+msgstr "Davčne šifre"
msgctxt "model:ir.action,name:act_tax_code_tree2"
msgid "Tax Codes"
-msgstr "Belastingcodes"
+msgstr "Davčne šifre"
msgctxt "model:ir.action,name:act_tax_group_form"
msgid "Tax Groups"
-msgstr "Belastinggroepen"
+msgstr "Davčne skupine"
msgctxt "model:ir.action,name:act_tax_line_form"
msgid "Tax Lines"
-msgstr "Belasting regels"
+msgstr "Davčne postavke"
-#, fuzzy
msgctxt "model:ir.action,name:act_tax_list"
msgid "Taxes"
-msgstr "Belastingen"
+msgstr "Davki"
msgctxt "model:ir.action,name:act_tax_rule_form"
msgid "Tax Rules"
-msgstr "Belastingbepalingen"
+msgstr "Davčna pravila"
msgctxt "model:ir.action,name:act_tax_rule_template_form"
msgid "Tax Rule Templates"
-msgstr "Belastingbepaling sjablonen"
+msgstr "Predloge davčnih pravil"
msgctxt "model:ir.action,name:act_tax_template_tree"
msgid "Taxes Templates"
-msgstr "Belastingsjablonen"
+msgstr "Predloge davkov"
msgctxt "model:ir.action,name:act_tax_tree"
msgid "Taxes"
-msgstr "Belastingen"
+msgstr "Davki"
msgctxt "model:ir.action,name:act_unreconcile_lines"
msgid "Unreconcile Lines"
-msgstr "Afletteren ongedaan maken"
+msgstr "Odpravi uskladitev postavk"
msgctxt "model:ir.action,name:report_aged_balance"
msgid "Aged Balance"
-msgstr "Ouderdomsanalyse"
+msgstr "Bilanca zapadlih postavk"
msgctxt "model:ir.action,name:report_general_journal"
msgid "General Journal"
-msgstr "Algemeen dagboek"
+msgstr "Glavni dnevnik"
msgctxt "model:ir.action,name:report_general_ledger"
msgid "General Ledger"
-msgstr "Grootboek"
+msgstr "Glavna knjiga"
msgctxt "model:ir.action,name:report_third_party_balance"
msgid "Third Party Balance"
-msgstr "Openstaande posten"
+msgstr "Bilanca kupcev in dobaviteljev"
msgctxt "model:ir.action,name:report_trial_balance"
msgid "Trial Balance"
-msgstr "Proefbalans"
+msgstr "Bruto bilanca"
msgctxt "model:ir.action,name:wizard_create_chart"
msgid "Create Chart of Accounts from Template"
-msgstr ""
+msgstr "Ustvari kontni načrt iz predloge"
msgctxt "model:ir.action,name:wizard_open_aged_balance"
msgid "Open Aged Balance"
-msgstr "Ouderdomsanalyse openen"
+msgstr "Odpri bilanco zapadlih postavk"
msgctxt "model:ir.action,name:wizard_open_balance_sheet"
msgid "Open Balance Sheet"
-msgstr "Open balans"
+msgstr "Odpri bilanco stanja"
msgctxt "model:ir.action,name:wizard_open_income_statement"
msgid "Open Income Statement"
-msgstr "Winst- & verliesrekening openen"
+msgstr "Odpri izkaz poslovnega izida"
msgctxt "model:ir.action,name:wizard_open_third_party_balance"
msgid "Open Third Party Balance"
-msgstr "Openstaande posten openen"
+msgstr "Odpri bilanco kupcev in dobaviteljev"
msgctxt "model:ir.action,name:wizard_print_general_journal"
msgid "Print General Journal"
-msgstr "Algemeen dagboek afdrukken"
+msgstr "Izpis glavnega dnevnika"
-#, fuzzy
msgctxt "model:ir.action,name:wizard_print_general_ledger"
msgid "Print General Legder"
-msgstr "Grootboek afdrukken"
+msgstr "Izpis glavne knjige"
msgctxt "model:ir.action,name:wizard_print_trial_balance"
msgid "Print Trial Balance"
-msgstr "Proefbalans afdrukken"
+msgstr "Izpis bruto bilance"
msgctxt "model:ir.action,name:wizard_update_chart"
msgid "Update Chart of Accounts from Template"
-msgstr ""
+msgstr "Posodobitev kontnega načrta iz predloge"
msgctxt "model:ir.sequence,name:sequence_account_journal"
msgid "Default Account Journal"
-msgstr "Standaard rekeningdagboek"
+msgstr "Privzeti kontni dnevnik"
msgctxt "model:ir.sequence,name:sequence_account_move_reconciliation"
msgid "Default Account Move Reconciliation"
-msgstr "Standaard boeking aflettering"
+msgstr "Privzeta uskladitev kontnih prenosov"
msgctxt "model:ir.sequence.type,name:sequence_type_account_journal"
msgid "Account Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "model:ir.sequence.type,name:sequence_type_account_move"
msgid "Account Move"
-msgstr "Boeking"
+msgstr "Knjižba"
msgctxt ""
"model:ir.sequence.type,name:sequence_type_account_move_reconciliation"
msgid "Account Move Reconciliation"
-msgstr "Afletteren"
+msgstr "Uskladitev kontnega prenosa"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_account"
msgid "Financial"
-msgstr "Financiële administratie"
+msgstr "Finance"
msgctxt "model:ir.ui.menu,name:menu_account_configuration"
msgid "Configuration"
-msgstr "Instellingen"
+msgstr "Nastavitve"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_account_list"
msgid "Accounts"
-msgstr "Rekeningen"
+msgstr "Konti"
msgctxt "model:ir.ui.menu,name:menu_account_template_tree"
msgid "Account Templates"
-msgstr "Rekeningsjablonen"
+msgstr "Predloge kontov"
msgctxt "model:ir.ui.menu,name:menu_account_tree"
msgid "Accounts"
-msgstr "Rekeningen"
+msgstr "Konti"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_account_type_list"
msgid "Account Types"
-msgstr "Rekeningtypen"
+msgstr "Tipi kontov"
msgctxt "model:ir.ui.menu,name:menu_account_type_template_tree"
msgid "Account Type Templates"
-msgstr "Rekeningtype sjablonen"
+msgstr "Predloge tipov kontov"
msgctxt "model:ir.ui.menu,name:menu_account_type_tree"
msgid "Account Types"
-msgstr "Rekeningtypen"
+msgstr "Tipi kontov"
msgctxt "model:ir.ui.menu,name:menu_aged_balance"
msgid "Aged Balance"
-msgstr "Ouderdomsanalyse"
+msgstr "Bilanca zapadlih postavk"
+
+msgctxt "model:ir.ui.menu,name:menu_balance_non_deferral"
+msgid "Balance Non-Deferral"
+msgstr "Razknjižba neodložljivih kontov"
msgctxt "model:ir.ui.menu,name:menu_charts"
msgid "Charts"
-msgstr "Rekeningschema's"
+msgstr "Kontni načrt"
msgctxt "model:ir.ui.menu,name:menu_close_fiscalyear"
msgid "Close Fiscal Year"
-msgstr "Boekjaar afsluiten"
+msgstr "Zaključi poslovno leto"
msgctxt "model:ir.ui.menu,name:menu_code_tax_open_chart"
msgid "Open Chart of Tax Codes"
-msgstr ""
+msgstr "Odpri načrt šifer davkov"
msgctxt "model:ir.ui.menu,name:menu_create_chart"
msgid "Create Chart of Accounts from Template"
-msgstr ""
+msgstr "Ustvari kontni načrt"
msgctxt "model:ir.ui.menu,name:menu_entries"
msgid "Entries"
-msgstr "Boekingen"
+msgstr "Knjižbe"
msgctxt "model:ir.ui.menu,name:menu_fiscalyear_configuration"
msgid "Fiscal Years"
-msgstr "Boekjaren"
+msgstr "Poslovna leta"
msgctxt "model:ir.ui.menu,name:menu_fiscalyear_form"
msgid "Fiscal Years"
-msgstr "Boekjaren"
+msgstr "Poslovna leta"
msgctxt "model:ir.ui.menu,name:menu_general_account_configuration"
msgid "General Account"
-msgstr "Algemeen rekeningschema"
+msgstr "Splošno"
msgctxt "model:ir.ui.menu,name:menu_journal_configuration"
msgid "Journals"
-msgstr "Dagboeken"
+msgstr "Dnevniki"
msgctxt "model:ir.ui.menu,name:menu_journal_form"
msgid "Journals"
-msgstr "Dagboeken"
+msgstr "Dnevniki"
msgctxt "model:ir.ui.menu,name:menu_journal_period_form"
msgid "Close Journals - Periods"
-msgstr "Sluit dagboeken - perioden"
+msgstr "Zaključi dnevnike po obdobjih"
msgctxt "model:ir.ui.menu,name:menu_journal_period_tree"
msgid "Journals - Periods"
-msgstr "Dagboeken - perioden"
+msgstr "Dnevniki po obdobjih"
msgctxt "model:ir.ui.menu,name:menu_journal_period_tree2"
msgid "Journals - Periods"
-msgstr "Dagboeken - perioden"
+msgstr "Dnevniki po obdobjih"
msgctxt "model:ir.ui.menu,name:menu_journal_type_form"
msgid "Journal Types"
-msgstr "Dagboektypen"
+msgstr "Tipi dnevnikov"
msgctxt "model:ir.ui.menu,name:menu_journal_view_form"
msgid "Journal Views"
-msgstr "Dagboek indelingen"
+msgstr "Dnevniški vpogledi"
msgctxt "model:ir.ui.menu,name:menu_move_form"
msgid "Account Moves"
-msgstr "Boekingen"
+msgstr "Knjižbe"
msgctxt "model:ir.ui.menu,name:menu_open_balance_sheet"
msgid "Balance Sheet"
-msgstr "Balansoverzicht"
+msgstr "Bilanca stanja"
msgctxt "model:ir.ui.menu,name:menu_open_chart"
msgid "Open Chart of Accounts"
-msgstr ""
+msgstr "Odpri kontni načrt"
msgctxt "model:ir.ui.menu,name:menu_open_income_statement"
msgid "Income Statement"
-msgstr "Winst- & verliesrekening"
+msgstr "Izkaz poslovnega izida"
msgctxt "model:ir.ui.menu,name:menu_open_journal"
msgid "Open Journal"
-msgstr "Open dagboek"
+msgstr "Odpri dnevnik"
msgctxt "model:ir.ui.menu,name:menu_open_reconcile_lines"
msgid "Reconcile Lines"
-msgstr "Boekingen afletteren"
+msgstr "Uskladi postavke"
msgctxt "model:ir.ui.menu,name:menu_period_form"
msgid "Periods"
-msgstr "Perioden"
+msgstr "Obdobja"
msgctxt "model:ir.ui.menu,name:menu_period_form2"
msgid "Close Periods"
-msgstr "Perioden afsluiten"
+msgstr "Zaključi obdobja"
msgctxt "model:ir.ui.menu,name:menu_print_general_journal"
msgid "Print General Journal"
-msgstr "Algemeen dagboek afdrukken"
+msgstr "Izpis glavnega dnevnika"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_print_general_ledger"
msgid "Print General Legder"
-msgstr "Grootboek afdrukken"
+msgstr "Izpis glavne knjige"
msgctxt "model:ir.ui.menu,name:menu_print_trial_balance"
msgid "Print Trial Balance"
-msgstr "Proefbalans afdrukken"
+msgstr "Izpis bruto bilance"
msgctxt "model:ir.ui.menu,name:menu_processing"
msgid "Processing"
-msgstr "Verwerking"
+msgstr "Obdelava"
msgctxt "model:ir.ui.menu,name:menu_reporting"
msgid "Reporting"
-msgstr "Rapportage"
+msgstr "Poročila"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_tax_code_list"
msgid "Tax Codes"
-msgstr "Belastingen"
+msgstr "Davčne šifre"
msgctxt "model:ir.ui.menu,name:menu_tax_code_template_tree"
msgid "Tax Codes Templates"
-msgstr "Belastingcodes sjablonen"
+msgstr "Predloge davčnih šifer"
msgctxt "model:ir.ui.menu,name:menu_tax_code_tree"
msgid "Tax Codes"
-msgstr "Belastingcodes"
+msgstr "Davčne šifre"
msgctxt "model:ir.ui.menu,name:menu_tax_group_form"
msgid "Tax Groups"
-msgstr "Belastinggroepen"
+msgstr "Davčne skupine"
-#, fuzzy
msgctxt "model:ir.ui.menu,name:menu_tax_list"
msgid "Taxes"
-msgstr "Belastingen"
+msgstr "Davki"
msgctxt "model:ir.ui.menu,name:menu_tax_rule_form"
msgid "Tax Rules"
-msgstr "Belastingbepalingen"
+msgstr "Davčna pravila"
msgctxt "model:ir.ui.menu,name:menu_tax_rule_template_form"
msgid "Tax Rule Templates"
-msgstr "Belastingbepaling sjablonen"
+msgstr "Predloge davčnih pravil"
msgctxt "model:ir.ui.menu,name:menu_tax_template_tree"
msgid "Taxes Templates"
-msgstr "Belastingsjablonen"
+msgstr "Predloge davkov"
msgctxt "model:ir.ui.menu,name:menu_tax_tree"
msgid "Taxes"
-msgstr "Belastingen"
+msgstr "Davki"
msgctxt "model:ir.ui.menu,name:menu_taxes"
msgid "Taxes"
-msgstr "Belastingen"
+msgstr "Davki"
msgctxt "model:ir.ui.menu,name:menu_third_party_balance"
msgid "Third Party Balance"
-msgstr "Openstaande posten"
+msgstr "Bilanca kupcev in dobaviteljev"
msgctxt "model:ir.ui.menu,name:menu_update_chart"
msgid "Update Chart of Accounts from Template"
-msgstr ""
+msgstr "Posodobitev kontnega načrta iz predloge"
msgctxt "model:ir.ui.menu,name:menuitem_account_configuration"
msgid "Account Configuration"
-msgstr ""
+msgstr "Konfiguracija"
msgctxt "model:res.group,name:group_account"
msgid "Account"
-msgstr "Rekening"
+msgstr "Računovodstvo"
msgctxt "model:res.group,name:group_account_admin"
msgid "Account Administration"
-msgstr "Rekeningbeheer"
+msgstr "Računovodstvo - vodenje"
msgctxt "odt:account.aged_balance:"
msgid "/"
-msgstr ""
+msgstr "/"
msgctxt "odt:account.aged_balance:"
msgid "Aged Balance for Customers"
-msgstr ""
+msgstr "Bilanca zapadlih plačil kupcev"
msgctxt "odt:account.aged_balance:"
msgid "Aged Balance for Suppliers"
-msgstr ""
+msgstr "Bilanca zapadlih plačil dobaviteljev"
msgctxt "odt:account.aged_balance:"
msgid "Aged Balance for Suppliers and Customers"
-msgstr ""
+msgstr "Bilanca zapadlih plačil dobaviteljev in kupcev"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "Company:"
-msgstr "Bedrijf:"
+msgstr "Podjetje:"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "Day"
-msgstr "Dag"
+msgstr "Dan"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "Days"
-msgstr "Dagen"
+msgstr "Dnevi"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "Month"
-msgstr "Maand"
+msgstr "Mesec"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "Months"
-msgstr "Maanden"
+msgstr "Meseci"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "Party"
-msgstr "Relaties"
+msgstr "Stranka"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "Print Date:"
-msgstr "Datum afdruk:"
+msgstr "Izpisano:"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "Total"
-msgstr "Totaal"
+msgstr "Skupaj"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "User:"
-msgstr "Gebruiker:"
+msgstr "Izpisal:"
-#, fuzzy
msgctxt "odt:account.aged_balance:"
msgid "at"
-msgstr "om"
+msgstr "ob"
msgctxt "odt:account.general_ledger:"
msgid "/"
-msgstr ""
+msgstr "/"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Balance"
-msgstr "Balans"
+msgstr "Bilanca"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Company:"
-msgstr "Bedrijf:"
+msgstr "Podjetje:"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Credit"
-msgstr "Credit"
+msgstr "Kredit"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Date"
-msgstr "Vervaldatum"
+msgstr "Datum"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
msgctxt "odt:account.general_ledger:"
msgid "Descr."
-msgstr ""
+msgstr "Opis"
msgctxt "odt:account.general_ledger:"
msgid "From Period:"
-msgstr ""
+msgstr "Od:"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "General Ledger"
-msgstr "Grootboek"
+msgstr "Glavna knjiga"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Move"
-msgstr "Boeking"
+msgstr "Knjižba"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Name"
-msgstr "Naam bijlage"
+msgstr "Naziv"
msgctxt "odt:account.general_ledger:"
msgid "Origin"
-msgstr ""
+msgstr "Poreklo"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Print Date:"
-msgstr "Datum afdruk:"
+msgstr "Izpisano:"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "State"
-msgstr "Status"
+msgstr "Stanje"
msgctxt "odt:account.general_ledger:"
msgid "To Period:"
-msgstr ""
+msgstr "Do:"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "Total"
-msgstr "Totaal"
+msgstr "Skupaj"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "User:"
-msgstr "Gebruiker:"
+msgstr "Izpisal:"
-#, fuzzy
msgctxt "odt:account.general_ledger:"
msgid "at"
-msgstr "om"
+msgstr "ob"
msgctxt "odt:account.move.general_journal:"
msgid "/"
-msgstr ""
+msgstr "/"
msgctxt "odt:account.move.general_journal:"
msgid "Account"
-msgstr "Rekening"
+msgstr "Konto"
msgctxt "odt:account.move.general_journal:"
msgid "Company:"
-msgstr "Bedrijf:"
+msgstr "Podjetje:"
msgctxt "odt:account.move.general_journal:"
msgid "Credit"
-msgstr "Credit"
+msgstr "Kredit"
msgctxt "odt:account.move.general_journal:"
msgid "Date:"
@@ -3346,988 +3323,943 @@ msgstr "Datum:"
msgctxt "odt:account.move.general_journal:"
msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
-#, fuzzy
msgctxt "odt:account.move.general_journal:"
msgid "Description"
-msgstr "Specificatie"
+msgstr "Opis"
msgctxt "odt:account.move.general_journal:"
msgid "Draft"
-msgstr "Concept"
+msgstr "Osnutek"
msgctxt "odt:account.move.general_journal:"
msgid "From Date:"
-msgstr "Vanaf datum:"
+msgstr "Od:"
msgctxt "odt:account.move.general_journal:"
msgid "General Journal"
-msgstr "Algemeen dagboek"
+msgstr "Glavni dnevnik"
msgctxt "odt:account.move.general_journal:"
msgid "Journal Entry:"
-msgstr "Dagboek boeking:"
+msgstr "Vknjižba"
msgctxt "odt:account.move.general_journal:"
msgid "Origin:"
-msgstr ""
+msgstr "Poreklo:"
msgctxt "odt:account.move.general_journal:"
msgid "Posted"
-msgstr "Geboekt"
+msgstr "Knjiženo"
msgctxt "odt:account.move.general_journal:"
msgid "Print Date:"
-msgstr "Datum afdruk:"
+msgstr "Izpisano:"
msgctxt "odt:account.move.general_journal:"
msgid "To Date:"
-msgstr "Tot datum:"
+msgstr "Do:"
msgctxt "odt:account.move.general_journal:"
msgid "User:"
-msgstr "Gebruiker:"
+msgstr "Izpisal:"
msgctxt "odt:account.move.general_journal:"
msgid "at"
-msgstr "om"
+msgstr "ob"
msgctxt "odt:account.third_party_balance:"
msgid "/"
-msgstr ""
+msgstr "/"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "Balance"
-msgstr "Balans"
+msgstr "Bilanca"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "Company:"
-msgstr "Bedrijf:"
+msgstr "Podjetje:"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "Credit"
-msgstr "Credit"
+msgstr "Kredit"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "Party"
-msgstr "Relaties"
+msgstr "Stranka"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "Print Date:"
-msgstr "Datum afdruk:"
+msgstr "Izpisano:"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "Third Party Balance"
-msgstr "Openstaande posten"
+msgstr "Bilanca kupcev in dobaviteljev"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "Total"
-msgstr "Totaal"
+msgstr "Skupaj"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "User:"
-msgstr "Gebruiker:"
+msgstr "Izpisal:"
-#, fuzzy
msgctxt "odt:account.third_party_balance:"
msgid "at"
-msgstr "om"
+msgstr "ob"
msgctxt "odt:account.trial_balance:"
msgid "/"
-msgstr ""
+msgstr "/"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "Account"
-msgstr "Rekeningen"
+msgstr "Konto"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "Company:"
-msgstr "Bedrijf:"
+msgstr "Podjetje:"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "Credit"
-msgstr "Credit"
+msgstr "Kredit"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "End Balance"
-msgstr "Eindbalans"
+msgstr "Končni saldo"
msgctxt "odt:account.trial_balance:"
msgid "From Period:"
-msgstr ""
+msgstr "Od:"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "Print Date:"
-msgstr "Datum afdruk:"
+msgstr "Izpisano:"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "Start Balance"
-msgstr "Begin bedrag"
+msgstr "Začetni saldo"
msgctxt "odt:account.trial_balance:"
msgid "To Period:"
-msgstr ""
+msgstr "Do:"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "Total"
-msgstr "Totaal"
+msgstr "Skupaj"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "Trial Balance"
-msgstr "Proefbalans"
+msgstr "Bruto bilanca"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "User:"
-msgstr "Gebruiker:"
+msgstr "Izpisal:"
-#, fuzzy
msgctxt "odt:account.trial_balance:"
msgid "at"
-msgstr "om"
+msgstr "ob"
msgctxt "selection:account.account,kind:"
msgid "Expense"
-msgstr "Kosten"
+msgstr "Odhodek"
msgctxt "selection:account.account,kind:"
msgid "Other"
-msgstr "Overig"
+msgstr "Drugo"
msgctxt "selection:account.account,kind:"
msgid "Payable"
-msgstr "Crediteuren"
+msgstr "Obveznosti"
msgctxt "selection:account.account,kind:"
msgid "Receivable"
-msgstr "Debiteuren"
+msgstr "Terjatve"
msgctxt "selection:account.account,kind:"
msgid "Revenue"
-msgstr "Opbrengst"
+msgstr "Prihodek"
-#, fuzzy
msgctxt "selection:account.account,kind:"
msgid "Stock"
-msgstr "Voorraad"
+msgstr "Zaloga"
msgctxt "selection:account.account,kind:"
msgid "View"
-msgstr "Overzicht"
+msgstr "Pogled"
msgctxt "selection:account.account.template,kind:"
msgid "Expense"
-msgstr "Kosten"
+msgstr "Odhodek"
msgctxt "selection:account.account.template,kind:"
msgid "Other"
-msgstr "Overig"
+msgstr "Drugo"
msgctxt "selection:account.account.template,kind:"
msgid "Payable"
-msgstr "Crediteuren"
+msgstr "Obveznosti"
msgctxt "selection:account.account.template,kind:"
msgid "Receivable"
-msgstr "Debiteuren"
+msgstr "Terjatve"
msgctxt "selection:account.account.template,kind:"
msgid "Revenue"
-msgstr "Opbrengst"
+msgstr "Prihodek"
-#, fuzzy
msgctxt "selection:account.account.template,kind:"
msgid "Stock"
-msgstr "Voorraad"
+msgstr "Zaloga"
msgctxt "selection:account.account.template,kind:"
msgid "View"
-msgstr "Overzicht"
+msgstr "Pogled"
msgctxt "selection:account.account.type,display_balance:"
msgid "Credit - Debit"
-msgstr "Credit - Debit"
+msgstr "Kredit - Debet"
msgctxt "selection:account.account.type,display_balance:"
msgid "Debit - Credit"
-msgstr "Debit - Credit"
+msgstr "Debet - Kredit"
msgctxt "selection:account.account.type.template,display_balance:"
msgid "Credit - Debit"
-msgstr "Credit - Debit"
+msgstr "Kredit - Debet"
msgctxt "selection:account.account.type.template,display_balance:"
msgid "Debit - Credit"
-msgstr "Debit - Credit"
+msgstr "Debet - Kredit"
msgctxt "selection:account.fiscalyear,state:"
msgid "Close"
-msgstr "Sluiten"
+msgstr "Zaprto"
msgctxt "selection:account.fiscalyear,state:"
msgid "Open"
-msgstr "Open"
+msgstr "Odprto"
msgctxt "selection:account.journal.period,state:"
msgid "Close"
-msgstr "Sluiten"
+msgstr "Zaprto"
msgctxt "selection:account.journal.period,state:"
msgid "Open"
-msgstr "Open"
+msgstr "Odprto"
msgctxt "selection:account.move,state:"
msgid "Draft"
-msgstr "Concept"
+msgstr "Osnutek"
msgctxt "selection:account.move,state:"
msgid "Posted"
-msgstr "Geboekt"
+msgstr "Knjiženo"
msgctxt "selection:account.move.line,move_state:"
msgid "Draft"
-msgstr "Concept"
+msgstr "Osnutek"
msgctxt "selection:account.move.line,move_state:"
msgid "Posted"
-msgstr "Geboekt"
+msgstr "Knjiženo"
msgctxt "selection:account.move.line,state:"
msgid "Draft"
-msgstr "Concept"
+msgstr "Osnutek"
msgctxt "selection:account.move.line,state:"
msgid "Valid"
-msgstr "Geldig"
+msgstr "Odobreno"
msgctxt "selection:account.open_aged_balance.start,balance_type:"
msgid "Both"
-msgstr ""
+msgstr "Vse"
-#, fuzzy
msgctxt "selection:account.open_aged_balance.start,balance_type:"
msgid "Customer"
-msgstr "Klant"
+msgstr "Terjatve do kupcev"
-#, fuzzy
msgctxt "selection:account.open_aged_balance.start,balance_type:"
msgid "Supplier"
-msgstr "Leverancier"
+msgstr "Obveznosti dobaviteljem"
-#, fuzzy
msgctxt "selection:account.open_aged_balance.start,unit:"
msgid "Day"
-msgstr "Dag"
+msgstr "Dan"
-#, fuzzy
msgctxt "selection:account.open_aged_balance.start,unit:"
msgid "Month"
-msgstr "Maand"
+msgstr "mesec"
msgctxt "selection:account.period,state:"
msgid "Close"
-msgstr "Sluiten"
+msgstr "Zaprto"
msgctxt "selection:account.period,state:"
msgid "Open"
-msgstr "Open"
+msgstr "Odprto"
msgctxt "selection:account.period,type:"
msgid "Adjustment"
-msgstr "Aanpassing"
+msgstr "Izravnava"
msgctxt "selection:account.period,type:"
msgid "Standard"
-msgstr "Standaard"
+msgstr "Standardno"
msgctxt "selection:account.tax,type:"
msgid "Fixed"
-msgstr "Vast"
+msgstr "Fiksen"
msgctxt "selection:account.tax,type:"
msgid "None"
-msgstr "Geen"
+msgstr "Brez"
msgctxt "selection:account.tax,type:"
msgid "Percentage"
-msgstr "Percentage"
+msgstr "Odstoten"
msgctxt "selection:account.tax.code.open_chart.start,method:"
msgid "By Fiscal Year"
-msgstr ""
+msgstr "Po poslovnih letih"
msgctxt "selection:account.tax.code.open_chart.start,method:"
msgid "By Periods"
-msgstr ""
+msgstr "Po obdobjih"
msgctxt "selection:account.tax.group,kind:"
msgid "Both"
-msgstr ""
+msgstr "Vse"
msgctxt "selection:account.tax.group,kind:"
msgid "Purchase"
-msgstr ""
+msgstr "Nabava"
-#, fuzzy
msgctxt "selection:account.tax.group,kind:"
msgid "Sale"
-msgstr "Verkoop"
+msgstr "Prodaja"
msgctxt "selection:account.tax.rule,kind:"
msgid "Both"
-msgstr ""
+msgstr "Vse"
msgctxt "selection:account.tax.rule,kind:"
msgid "Purchase"
-msgstr ""
+msgstr "Nabava"
-#, fuzzy
msgctxt "selection:account.tax.rule,kind:"
msgid "Sale"
-msgstr "Verkoop"
+msgstr "Prodaja"
msgctxt "selection:account.tax.rule.template,kind:"
msgid "Both"
-msgstr ""
+msgstr "Vse"
msgctxt "selection:account.tax.rule.template,kind:"
msgid "Purchase"
-msgstr ""
+msgstr "Nabava"
-#, fuzzy
msgctxt "selection:account.tax.rule.template,kind:"
msgid "Sale"
-msgstr "Verkoop"
+msgstr "Prodaja"
msgctxt "selection:account.tax.template,type:"
msgid "Fixed"
-msgstr "Vast"
+msgstr "Fiksen"
msgctxt "selection:account.tax.template,type:"
msgid "None"
-msgstr "Geen"
+msgstr "Brez"
msgctxt "selection:account.tax.template,type:"
msgid "Percentage"
-msgstr "Percentage"
+msgstr "Odstoten"
msgctxt "view:account.account.deferral:"
msgid "Account Deferral"
-msgstr "Rekening met historie"
+msgstr "Odlog"
msgctxt "view:account.account.deferral:"
msgid "Account Deferrals"
-msgstr "Rekeninghistorie"
+msgstr "Odlogi"
msgctxt "view:account.account.template:"
msgid "Account Template"
-msgstr "Rekeningsjabloon"
+msgstr "Predloga konta"
msgctxt "view:account.account.template:"
msgid "Account Templates"
-msgstr "Rekeningsjablonen"
+msgstr "Predloge kontov"
msgctxt "view:account.account.type.template:"
msgid "Account Type Template"
-msgstr "Rekeningtype sjabloon"
+msgstr "Predloga tipa konta"
msgctxt "view:account.account.type.template:"
msgid "Account Types Templates"
-msgstr "Rekeningtypen sjablonen"
+msgstr "Predloge tipov kontov"
msgctxt "view:account.account.type:"
msgid "Account Type"
-msgstr "Rekeningtype"
+msgstr "Tip konta"
msgctxt "view:account.account.type:"
msgid "Account Types"
-msgstr "Rekeningtypen"
+msgstr "Tipi kontov"
msgctxt "view:account.account.type:"
msgid "Balance Sheet"
-msgstr "Balansoverzicht"
+msgstr "Bilanca"
msgctxt "view:account.account.type:"
msgid "Income Statement"
-msgstr "Winst- & verliesrekening"
+msgstr "Izkaz poslovnega izida"
msgctxt "view:account.account:"
msgid "Account"
-msgstr "Rekening"
+msgstr "Konto"
msgctxt "view:account.account:"
msgid "Accounts"
-msgstr "Rekeningen"
+msgstr "Konti"
msgctxt "view:account.account:"
msgid "Deferrals"
-msgstr "Historie"
+msgstr "Odlogi"
msgctxt "view:account.account:"
msgid "General Information"
-msgstr "Algemene informatie"
+msgstr "Splošno"
msgctxt "view:account.account:"
msgid "Notes"
-msgstr "Aantekeningen"
+msgstr "Opombe"
msgctxt "view:account.configuration:"
msgid "Account Configuration"
-msgstr ""
+msgstr "Kontna konfiguracija"
msgctxt "view:account.create_chart.account:"
msgid "Create Chart of Accounts"
-msgstr ""
+msgstr "Ustvari kontni načrt"
msgctxt "view:account.create_chart.properties:"
msgid "Create Default Properties"
-msgstr ""
+msgstr "Ustvari privzete lastnosti"
msgctxt "view:account.create_chart.start:"
msgid "Create Chart of Accounts"
-msgstr ""
+msgstr "Ustvari kontni načrt"
msgctxt "view:account.create_chart.start:"
msgid ""
"You can now create a chart of account for your company by selecting a chart "
"of account template."
msgstr ""
+"Sedaj lahko ustvarite kontni načrt za vaše podjetje s pomočjo predloge."
+
+msgctxt "view:account.fiscalyear.balance_non_deferral.start:"
+msgid "Balance Non-Deferral"
+msgstr "Razknjižba neodložljivih kontov"
-#, fuzzy
msgctxt "view:account.fiscalyear.close.start:"
msgid "Close Fiscal Year"
-msgstr "Sluit boekjaar"
+msgstr "Zaključi poslovno leto"
msgctxt "view:account.fiscalyear:"
msgid "Are you sure to close fiscal year?"
-msgstr "Weet u zeker dat u dit boekjaar wil afsluiten?"
+msgstr "Ali res želite zaključiti poslovno leto?"
msgctxt "view:account.fiscalyear:"
msgid "Close Fiscal Year"
-msgstr "Sluit boekjaar"
+msgstr "Zaključi poslovno leto"
msgctxt "view:account.fiscalyear:"
msgid "Create 3 Months Periods"
-msgstr "Maak perioden van 3 maanden"
+msgstr "Ustvari tromesečna obdobja"
msgctxt "view:account.fiscalyear:"
msgid "Create Monthly Periods"
-msgstr "Maak perioden van 1 maand"
+msgstr "Ustvari mesečna obdobja"
msgctxt "view:account.fiscalyear:"
msgid "Fiscal Year"
-msgstr "Boekjaar"
+msgstr "Poslovno leto"
msgctxt "view:account.fiscalyear:"
msgid "Fiscal Years"
-msgstr "Boekjaren"
+msgstr "Poslovna leta"
msgctxt "view:account.fiscalyear:"
msgid "Periods"
-msgstr "Perioden"
+msgstr "Obdobja"
msgctxt "view:account.fiscalyear:"
msgid "Re-Open Fiscal Year"
-msgstr "Heropen boekjaar"
+msgstr "Znova odpri poslovno leto"
msgctxt "view:account.fiscalyear:"
msgid "Sequences"
-msgstr "Reeksen"
+msgstr "Štetja"
msgctxt "view:account.journal.period:"
msgid "Journal - Period"
-msgstr "Dagboek - periode"
+msgstr "Dnevnik po obdobju"
msgctxt "view:account.journal.period:"
msgid "Journals - Periods"
-msgstr "Dagboeken - perioden"
+msgstr "Dnevniki po obdobjih"
msgctxt "view:account.journal.type:"
msgid "Journal Type"
-msgstr "Dagboektype"
+msgstr "Tip dnevnika"
msgctxt "view:account.journal.type:"
msgid "Journal Types"
-msgstr "Dagboektypen"
+msgstr "Tipi dnevnikov"
-#, fuzzy
msgctxt "view:account.journal.view.column:"
msgid "View Column"
-msgstr "Bekijk kolom"
+msgstr "Viden stolpec"
-#, fuzzy
msgctxt "view:account.journal.view.column:"
msgid "View Columns"
-msgstr "Bekijk kolomen"
+msgstr "Vidni stoplci"
msgctxt "view:account.journal.view:"
msgid "Journal View"
-msgstr "Dagboek indeling"
+msgstr "Dnevniški vpogled"
msgctxt "view:account.journal.view:"
msgid "Journal Views"
-msgstr "Dagboek indelingen"
+msgstr "Dnevniški vpogledi"
msgctxt "view:account.journal:"
msgid "General Information"
-msgstr "Algemene informatie"
+msgstr "Splošno"
msgctxt "view:account.journal:"
msgid "Journal"
-msgstr "Dagboek"
+msgstr "Dnevnik"
msgctxt "view:account.journal:"
msgid "Journals"
-msgstr "Dagboeken"
+msgstr "Dnevniki"
msgctxt "view:account.move.line:"
msgid "Account Move Line"
-msgstr "Boekingsregel"
+msgstr "Postavka knjižbe"
msgctxt "view:account.move.line:"
msgid "Account Move Lines"
-msgstr "Boekingsregels"
+msgstr "Postavke knjižb"
msgctxt "view:account.move.line:"
msgid "Credit"
-msgstr "Credit"
+msgstr "Kredit"
msgctxt "view:account.move.line:"
msgid "Debit"
-msgstr "Debit"
+msgstr "Debet"
-#, fuzzy
msgctxt "view:account.move.line:"
msgid "Other Info"
-msgstr "Aanvullende informatie"
+msgstr "Drugo"
msgctxt "view:account.move.open_journal.ask:"
msgid "Open Journal"
-msgstr "Open dagboek"
+msgstr "Odpri dnevnik"
-#, fuzzy
msgctxt "view:account.move.open_reconcile_lines.start:"
msgid "Open Reconcile Lines"
-msgstr "Open afletteren"
+msgstr "Uskladitev postavk"
-#, fuzzy
msgctxt "view:account.move.print_general_journal.start:"
msgid "Print General Journal"
-msgstr "Algemeen dagboek afdrukken"
+msgstr "Izpis glavnega dnevnika"
msgctxt "view:account.move.reconcile_lines.writeoff:"
msgid "Write-Off"
-msgstr "Afschrijven"
+msgstr "Odpis"
msgctxt "view:account.move.reconciliation:"
msgid "Reconciliation"
-msgstr "Aflettering"
+msgstr "Uskladitev"
msgctxt "view:account.move.reconciliation:"
msgid "Reconciliations"
-msgstr "Afletteringen"
+msgstr "Uskladitve"
msgctxt "view:account.move:"
msgid "Account Move"
-msgstr "Boeking"
+msgstr "Knjižba"
msgctxt "view:account.move:"
msgid "Account Moves"
-msgstr "Boekingen"
+msgstr "Knjižbe"
msgctxt "view:account.move:"
msgid "Draft"
-msgstr "Concept"
+msgstr "Osnutek"
msgctxt "view:account.move:"
msgid "Post"
-msgstr "Boeken"
+msgstr "Vknjižba"
-#, fuzzy
msgctxt "view:account.open_aged_balance.start:"
msgid "Open Aged Balance"
-msgstr "Ouderdomsanalyse openen"
+msgstr "Odpri bilanco zapadlih postavk"
msgctxt "view:account.open_aged_balance.start:"
msgid "Terms"
-msgstr ""
+msgstr "Roki"
-#, fuzzy
msgctxt "view:account.open_balance_sheet.start:"
msgid "Open Balance Sheet"
-msgstr "Open balans"
+msgstr "Odpri bilanco stanja"
msgctxt "view:account.open_chart.start:"
msgid "Open Chart of Accounts"
-msgstr ""
+msgstr "Odpri kontni načrt"
-#, fuzzy
msgctxt "view:account.open_income_statement.start:"
msgid "Open Income Statement"
-msgstr "Winst- & verliesrekening openen"
+msgstr "Odpri izkaz poslovnega izida"
-#, fuzzy
msgctxt "view:account.open_third_party_balance.start:"
msgid "Open Third Party Balance"
-msgstr "Openstaande posten openen"
+msgstr "Odpri bilanco kupcev in dobaviteljev"
msgctxt "view:account.period:"
msgid "Period"
-msgstr "Periode"
+msgstr "Obdobje"
msgctxt "view:account.period:"
msgid "Periods"
-msgstr "Perioden"
+msgstr "Obdobja"
msgctxt "view:account.print_general_ledger.start:"
msgid "Print General Ledger"
-msgstr ""
+msgstr "Izpis glavne knjige"
-#, fuzzy
msgctxt "view:account.print_trial_balance.start:"
msgid "Print Trial Balance"
-msgstr "Proefbalans afdrukken"
+msgstr "Izpis bruto bilance"
msgctxt "view:account.tax.code.open_chart.start:"
msgid "Open Chart of Tax Codes"
-msgstr ""
+msgstr "Odpri načrt davčnih šifer"
msgctxt "view:account.tax.code.template:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Podšifre"
msgctxt "view:account.tax.code.template:"
msgid "Description"
-msgstr "Omschrijving"
+msgstr "Opis"
msgctxt "view:account.tax.code.template:"
msgid "Tax Code Template"
-msgstr "Belastingcode sjabloon"
+msgstr "Predloga davčne šifre"
msgctxt "view:account.tax.code.template:"
msgid "Tax Codes Templates"
-msgstr "Belastingcodes sjablonen"
+msgstr "Predloge davčnih šifer"
msgctxt "view:account.tax.code:"
msgid "Children"
-msgstr "Onderliggende niveaus"
+msgstr "Podšifre"
msgctxt "view:account.tax.code:"
msgid "Description"
-msgstr "Omschrijving"
+msgstr "Opis"
msgctxt "view:account.tax.code:"
msgid "Tax Code"
-msgstr "Belastingcode"
+msgstr "Davčna šifra"
msgctxt "view:account.tax.code:"
msgid "Tax Codes"
-msgstr "Belastingen"
+msgstr "Davčne šifre"
msgctxt "view:account.tax.group:"
msgid "Tax Group"
-msgstr "Belastinggroep"
+msgstr "Davčna skupina"
msgctxt "view:account.tax.group:"
msgid "Tax Groups"
-msgstr "Belastinggroepen"
+msgstr "Davčne skupine"
msgctxt "view:account.tax.line:"
msgid "Account Tax Line"
-msgstr "Rekening belastingregel"
+msgstr "Davčna postavka"
msgctxt "view:account.tax.line:"
msgid "Account Tax Lines"
-msgstr "Rekening belastingregels"
+msgstr "Davčne postavke"
msgctxt "view:account.tax.rule.line.template:"
msgid "Tax Rule Line Template"
-msgstr "Belastingbepaling regelsjabloon"
+msgstr "Predloga postavke davčnega pravila"
msgctxt "view:account.tax.rule.line.template:"
msgid "Tax Rule Line Templates"
-msgstr "Belastingbepaling regelsjablonen"
+msgstr "Predloge postavk davčnega pravil"
msgctxt "view:account.tax.rule.line:"
msgid "Tax Rule Line"
-msgstr "Belastingbepaling regel"
+msgstr "Postavka davčnega pravila"
msgctxt "view:account.tax.rule.line:"
msgid "Tax Rule Lines"
-msgstr "Belastingbepaling regels"
+msgstr "Postavke davčnega pravila"
msgctxt "view:account.tax.rule.template:"
msgid "Tax Rule Template"
-msgstr "Belastingbepaling sjabloon"
+msgstr "Predloga davčnega pravila"
msgctxt "view:account.tax.rule.template:"
msgid "Tax Rules"
-msgstr "Belastingbepalingen"
+msgstr "Davčna pravila"
msgctxt "view:account.tax.rule:"
msgid "Tax Rule"
-msgstr "Belastingbepaling"
+msgstr "Davčno pravilo"
msgctxt "view:account.tax.rule:"
msgid "Tax Rules"
-msgstr "Belastingbepalingen"
+msgstr "Davčna pravila"
+
+msgctxt "view:account.tax.template:"
+msgid "%"
+msgstr "%"
msgctxt "view:account.tax.template:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "view:account.tax.template:"
msgid "Credit Note"
-msgstr "Credit verkoopnota"
+msgstr "Dobropis"
msgctxt "view:account.tax.template:"
msgid "General Information"
-msgstr "Algemene informatie"
+msgstr "Splošno"
msgctxt "view:account.tax.template:"
msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "Račun"
msgctxt "view:account.tax.template:"
msgid "Tax Template"
-msgstr "Belasting sjabloon"
+msgstr "Predloga davka"
msgctxt "view:account.tax.template:"
msgid "Taxes Templates"
-msgstr "Belastingsjablonen"
+msgstr "Predloge davkov"
+
+msgctxt "view:account.tax:"
+msgid "%"
+msgstr "%"
msgctxt "view:account.tax:"
msgid "Code"
-msgstr "Code"
+msgstr "Šifra"
msgctxt "view:account.tax:"
msgid "Credit Note"
-msgstr "Credit verkoopnota"
+msgstr "Dobropis"
msgctxt "view:account.tax:"
msgid "General Information"
-msgstr "Algemene informatie"
+msgstr "Splošno"
msgctxt "view:account.tax:"
msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "Račun"
msgctxt "view:account.tax:"
msgid "Tax"
-msgstr "Belasting"
+msgstr "Davek"
msgctxt "view:account.tax:"
msgid "Taxes"
-msgstr "Belastingen"
+msgstr "Davki"
msgctxt "view:account.update_chart.start:"
msgid "Update Chart of Accounts"
-msgstr ""
+msgstr "Posodobitev kontnega načrta"
msgctxt "view:account.update_chart.succeed:"
msgid "Update Chart of Accounts"
-msgstr ""
+msgstr "Posodobitev kontnega načrta"
msgctxt "view:account.update_chart.succeed:"
msgid "Update Chart of Accounts Succeed!"
-msgstr ""
+msgstr "Posodobitev kontnega načrta uspešna."
msgctxt "view:party.party:"
msgid "Account"
-msgstr "Rekeningen"
+msgstr "Konto"
msgctxt "view:party.party:"
msgid "Taxes"
-msgstr "Belastingen"
+msgstr "Davki"
msgctxt "wizard_button:account.create_chart,account,create_account:"
msgid "Create"
-msgstr ""
+msgstr "Ustvari"
-#, fuzzy
msgctxt "wizard_button:account.create_chart,account,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.create_chart,properties,create_properties:"
msgid "Create"
-msgstr ""
+msgstr "Ustvari"
-#, fuzzy
msgctxt "wizard_button:account.create_chart,properties,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
-#, fuzzy
msgctxt "wizard_button:account.create_chart,start,account:"
msgid "Ok"
-msgstr "Oké"
+msgstr "V redu"
-#, fuzzy
msgctxt "wizard_button:account.create_chart,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,balance:"
+msgid "Ok"
+msgstr "V redu"
+
+msgctxt "wizard_button:account.fiscalyear.balance_non_deferral,start,end:"
+msgid "Cancel"
+msgstr "Prekliči"
-#, fuzzy
msgctxt "wizard_button:account.fiscalyear.close,start,close:"
msgid "Close"
-msgstr "Sluiten"
+msgstr "Zaključi"
-#, fuzzy
msgctxt "wizard_button:account.fiscalyear.close,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.move.open_journal,ask,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
-#, fuzzy
msgctxt "wizard_button:account.move.open_journal,ask,open_:"
msgid "Open"
-msgstr "Open"
+msgstr "Odpri"
-#, fuzzy
msgctxt "wizard_button:account.move.open_reconcile_lines,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
-#, fuzzy
msgctxt "wizard_button:account.move.open_reconcile_lines,start,open_:"
msgid "Open"
-msgstr "Open"
+msgstr "Odpri"
-#, fuzzy
msgctxt "wizard_button:account.move.print_general_journal,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.move.print_general_journal,start,print_:"
msgid "Print"
-msgstr ""
+msgstr "Natisni"
msgctxt "wizard_button:account.move.reconcile_lines,writeoff,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.move.reconcile_lines,writeoff,reconcile:"
msgid "Reconcile"
-msgstr "Afletteren"
+msgstr "Uskladi"
-#, fuzzy
msgctxt "wizard_button:account.open_aged_balance,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.open_aged_balance,start,print_:"
msgid "Print"
-msgstr ""
+msgstr "Natisni"
-#, fuzzy
msgctxt "wizard_button:account.open_balance_sheet,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
-#, fuzzy
msgctxt "wizard_button:account.open_balance_sheet,start,open_:"
msgid "Open"
-msgstr "Open"
+msgstr "Odpri"
-#, fuzzy
msgctxt "wizard_button:account.open_chart,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
-#, fuzzy
msgctxt "wizard_button:account.open_chart,start,open_:"
msgid "Open"
-msgstr "Open"
+msgstr "Odpri"
-#, fuzzy
msgctxt "wizard_button:account.open_income_statement,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
-#, fuzzy
msgctxt "wizard_button:account.open_income_statement,start,open_:"
msgid "Open"
-msgstr "Open"
+msgstr "Odpri"
-#, fuzzy
msgctxt "wizard_button:account.open_third_party_balance,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.open_third_party_balance,start,print_:"
msgid "Print"
-msgstr ""
+msgstr "Natisni"
-#, fuzzy
msgctxt "wizard_button:account.print_general_ledger,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.print_general_ledger,start,print_:"
msgid "Print"
-msgstr ""
+msgstr "Natisni"
-#, fuzzy
msgctxt "wizard_button:account.print_trial_balance,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.print_trial_balance,start,print_:"
msgid "Print"
-msgstr ""
+msgstr "Natisni"
-#, fuzzy
msgctxt "wizard_button:account.tax.code.open_chart,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
-#, fuzzy
msgctxt "wizard_button:account.tax.code.open_chart,start,open_:"
msgid "Open"
-msgstr "Open"
+msgstr "Odpri"
-#, fuzzy
msgctxt "wizard_button:account.update_chart,start,end:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Prekliči"
msgctxt "wizard_button:account.update_chart,start,update:"
msgid "Update"
-msgstr ""
+msgstr "Posodobitev"
-#, fuzzy
msgctxt "wizard_button:account.update_chart,succeed,end:"
msgid "Ok"
-msgstr "Oké"
+msgstr "V redu"
diff --git a/move.py b/move.py
index c6381c8..1945302 100644
--- a/move.py
+++ b/move.py
@@ -2,22 +2,23 @@
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
import datetime
-import time
from itertools import groupby
from operator import itemgetter
+from sql.aggregate import Sum
+from sql.conditionals import Coalesce
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateTransition, StateView, StateAction, \
Button
from trytond.report import Report
-from trytond.backend import TableHandler, FIELDS
+from trytond import backend
from trytond.pyson import Eval, PYSONEncoder
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
from trytond.rpc import RPC
from trytond.tools import reduce_ids
-__all__ = ['Move', 'Reconciliation', 'Line', 'Move2', 'OpenJournalAsk',
+__all__ = ['Move', 'Reconciliation', 'Line', 'OpenJournalAsk',
'OpenJournal', 'OpenAccount', 'ReconcileLinesWriteOff', 'ReconcileLines',
'UnreconcileLinesStart', 'UnreconcileLines', 'OpenReconcileLinesStart',
'OpenReconcileLines', 'FiscalYearLine', 'FiscalYear2',
@@ -79,10 +80,6 @@ class Move(ModelSQL, ModelView):
'"%(move)s" to draft in journal "%(journal)s".'),
'modify_posted_move': ('You can not modify move "%s" because '
'it is already posted.'),
- 'period_centralized_journal': ('Move "%(move)s" cannot be '
- 'created because there is already a move in journal '
- '"%(journal)s" and you cannot create more than one move '
- 'per period in a centralized journal.'),
'company_in_move': ('You can not create lines on accounts'
'of different companies in move "%s".'),
'date_outside_period': ('You can not create move "%(move)s" '
@@ -101,6 +98,7 @@ class Move(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -157,7 +155,7 @@ class Move(ModelSQL, ModelView):
@classmethod
def _get_origin(cls):
'Return list of Model names for origin Reference'
- return []
+ return ['account.fiscalyear']
@classmethod
def get_origin(cls):
@@ -172,23 +170,9 @@ class Move(ModelSQL, ModelView):
def validate(cls, moves):
super(Move, cls).validate(moves)
for move in moves:
- move.check_centralisation()
move.check_company()
move.check_date()
- def check_centralisation(self):
- if self.journal.centralised:
- moves = self.search([
- ('period', '=', self.period.id),
- ('journal', '=', self.journal.id),
- ('state', '!=', 'posted'),
- ], limit=2)
- if len(moves) > 1:
- self.raise_user_error('period_centralized_journal', {
- 'move': self.rec_name,
- 'journal': self.journal.rec_name,
- })
-
def check_company(self):
company_id = -1
for line in self.lines:
@@ -231,7 +215,6 @@ class Move(ModelSQL, ModelView):
@classmethod
def create(cls, vlist):
pool = Pool()
- MoveLine = pool.get('account.move.line')
Sequence = pool.get('ir.sequence')
Journal = pool.get('account.journal')
@@ -245,15 +228,6 @@ class Move(ModelSQL, ModelView):
vals['number'] = Sequence.get_id(journal.sequence.id)
moves = super(Move, cls).create(vlist)
- for move in moves:
- if move.journal.centralised:
- line, = MoveLine.create([{
- 'account': move.journal.credit_account.id,
- 'move': move.id,
- }])
- cls.write([move], {
- 'centralised_line': line.id,
- })
cls.validate_move(moves)
return moves
@@ -289,11 +263,12 @@ class Move(ModelSQL, ModelView):
@classmethod
def validate_move(cls, moves):
'''
- Validate balanced move and centralise it if in centralised journal
+ Validate balanced move
'''
pool = Pool()
MoveLine = pool.get('account.move.line')
User = pool.get('res.user')
+ line = MoveLine.__table__()
cursor = Transaction().cursor
@@ -308,18 +283,17 @@ class Move(ModelSQL, ModelView):
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]
- red_sql, red_ids = reduce_ids('move', sub_move_ids)
+ red_sql = reduce_ids(line.move, sub_move_ids)
- cursor.execute('SELECT move, SUM(debit - credit) '
- 'FROM "' + MoveLine._table + '" '
- 'WHERE ' + red_sql + ' '
- 'GROUP BY move', red_ids)
+ cursor.execute(*line.select(line.move,
+ Sum(line.debit - line.credit),
+ where=red_sql,
+ group_by=line.move))
amounts.update(dict(cursor.fetchall()))
- cursor.execute('SELECT move, id '
- 'FROM "' + MoveLine._table + '" '
- 'WHERE ' + red_sql + ' AND state = %s '
- 'ORDER BY move', red_ids + ['draft'])
+ cursor.execute(*line.select(line.move, line.id,
+ where=red_sql & (line.state == 'draft'),
+ order_by=line.move))
move2draft_lines.update(dict((k, (j[1] for j in g))
for k, g in groupby(cursor.fetchall(), itemgetter(0))))
@@ -335,39 +309,7 @@ class Move(ModelSQL, ModelView):
draft_lines = MoveLine.browse(
list(move2draft_lines.get(move.id, [])))
if not company.currency.is_zero(amount):
- if not move.journal.centralised:
- draft_moves.append(move.id)
- else:
- if not move.centralised_line:
- centralised_amount = - amount
- else:
- centralised_amount = move.centralised_line.debit \
- - move.centralised_line.credit \
- - amount
- if centralised_amount >= Decimal('0.0'):
- debit = centralised_amount
- credit = Decimal('0.0')
- account_id = move.journal.debit_account.id
- else:
- debit = Decimal('0.0')
- credit = - centralised_amount
- account_id = move.journal.credit_account.id
- if not move.centralised_line:
- centralised_line, = MoveLine.create([{
- 'debit': debit,
- 'credit': credit,
- 'account': account_id,
- 'move': move.id,
- }])
- cls.write([move], {
- 'centralised_line': centralised_line.id,
- })
- else:
- MoveLine.write([move.centralised_line], {
- 'debit': debit,
- 'credit': credit,
- 'account': account_id,
- })
+ draft_moves.append(move.id)
continue
if not draft_lines:
continue
@@ -379,11 +321,12 @@ class Move(ModelSQL, ModelView):
if move_ids:
for i in range(0, len(move_ids), cursor.IN_MAX):
sub_ids = move_ids[i:i + cursor.IN_MAX]
- red_sql, red_ids = reduce_ids('move', sub_ids)
+ red_sql = reduce_ids(line.move, sub_ids)
# Use SQL to prevent double validate loop
- cursor.execute('UPDATE "' + MoveLine._table + '" '
- 'SET state = %s '
- 'WHERE ' + red_sql, [state] + red_ids)
+ cursor.execute(*line.update(
+ columns=[line.state],
+ values=[state],
+ where=red_sql))
@classmethod
@ModelView.button
@@ -391,6 +334,7 @@ class Move(ModelSQL, ModelView):
pool = Pool()
Sequence = pool.get('ir.sequence')
Date = pool.get('ir.date')
+ Line = pool.get('account.move.line')
for move in moves:
amount = Decimal('0.0')
@@ -413,6 +357,12 @@ class Move(ModelSQL, ModelView):
move.period.post_move_sequence_used.id)
cls.write([move], values)
+ to_reconcile = [l for l in move.lines
+ if ((line.debit == line.credit == Decimal('0'))
+ and line.account.reconcile)]
+ if to_reconcile:
+ Line.reconcile(to_reconcile)
+
@classmethod
@ModelView.button
def draft(cls, moves):
@@ -449,7 +399,8 @@ class Reconciliation(ModelSQL, ModelView):
'reconciliation_different_accounts': ('You can not reconcile '
'line "%(line)s" because it\'s account "%(account1)s" is '
'different from "%(account2)s".'),
- 'reconciliation_account_no_reconcile': ('You can not reconcile '
+ 'reconciliation_account_no_reconcile': (
+ 'You can not reconcile '
'line "%(line)s" because it\'s account "%(account)s" is '
'configured as not reconcilable.'),
'reconciliation_different_parties': ('You can not reconcile '
@@ -601,6 +552,7 @@ class Line(ModelSQL, ModelView):
@classmethod
def __setup__(cls):
super(Line, cls).__setup__()
+ cls._check_modify_exclude = ['reconciliation']
cls._sql_constraints += [
('credit_debit',
'CHECK(credit * debit = 0.0)',
@@ -616,19 +568,20 @@ class Line(ModelSQL, ModelView):
'add/modify lines in closed journal period "%s".'),
'modify_posted_move': ('You can not modify lines of move "%s" '
'because it is already posted.'),
- 'modify_reconciled': ('You can not modify line "%s" because it '
- 'is reconciled.'),
+ 'modify_reconciled': ('You can not modify line "%s" because '
+ 'it is reconciled.'),
'no_journal': ('Move line cannot be created because there is '
'no journal defined.'),
'move_view_account': ('You can not create a move line with '
'account "%s" because it is a view account.'),
- 'move_inactive_account': ('You can not create a move line with '
- 'account "%s" because it is inactive.'),
+ 'move_inactive_account': ('You can not create a move line '
+ 'with account "%s" because it is inactive.'),
'already_reconciled': 'Line "%s" (%d) already reconciled.',
})
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -989,18 +942,15 @@ class Line(ModelSQL, ModelView):
return res
if self.party and (not self.debit) and (not self.credit):
- type_name = FIELDS[self.__class__.debit._type].sql_type(
- self.__class__.debit)[0]
- query = ('SELECT '
- 'CAST(COALESCE(SUM('
- '(COALESCE(debit, 0) - COALESCE(credit, 0))'
- '), 0) AS ' + type_name + ') '
- 'FROM account_move_line '
- 'WHERE reconciliation IS NULL '
- 'AND party = %s '
- 'AND account = %s')
- cursor.execute(query,
- (self.party.id, self.party.account_receivable.id))
+ type_name = self.__class__.debit.sql_type().base
+ table = self.__table__()
+ column = Coalesce(Sum(Coalesce(table.debit, 0)
+ - Coalesce(table.credit, 0)), 0).cast(type_name)
+ where = ((table.reconciliation == None)
+ & (table.party == self.party.id))
+ cursor.execute(*table.select(column,
+ where=where
+ & (table.account == self.party.account_receivable.id)))
amount = cursor.fetchone()[0]
# SQLite uses float for SUM
if not isinstance(amount, Decimal):
@@ -1018,8 +968,9 @@ class Line(ModelSQL, ModelView):
res['account.rec_name'] = \
self.party.account_receivable.rec_name
else:
- cursor.execute(query,
- (self.party.id, self.party.account_payable.id))
+ cursor.execute(*table.select(column,
+ where=where
+ & (table.account == self.party.account_payable.id)))
amount = cursor.fetchone()[0]
if not self.party.account_payable.currency.is_zero(amount):
if amount > Decimal('0.0'):
@@ -1106,17 +1057,42 @@ class Line(ModelSQL, ModelView):
name = 'state'
return [('move.' + name,) + tuple(clause[1:])]
+ def _order_move_field(name):
+ def order_field(tables):
+ pool = Pool()
+ Move = pool.get('account.move')
+ field = Move._fields[name]
+ table, _ = tables[None]
+ move_tables = tables.get('move')
+ if move_tables is None:
+ move = Move.__table__()
+ move_tables = {
+ None: (move, move.id == table.move),
+ }
+ tables['move'] = move_tables
+ return field.convert_order(name, move_tables, Move)
+ return staticmethod(order_field)
+ order_journal = _order_move_field('journal')
+ order_period = _order_move_field('period')
+ order_date = _order_move_field('date')
+ order_origin = _order_move_field('origin')
+ order_move_state = _order_move_field('state')
+
@classmethod
- def query_get(cls, obj='l'):
+ def query_get(cls, table):
'''
Return SQL clause and fiscal years for account move line
depending of the context.
- obj is the SQL alias of account_move_line in the query
+ table is the SQL instance of account.move.line table
'''
- FiscalYear = Pool().get('account.fiscalyear')
+ pool = Pool()
+ FiscalYear = pool.get('account.fiscalyear')
+ Move = pool.get('account.move')
+ Period = pool.get('account.period')
+ move = Move.__table__()
+ period = Period.__table__()
if Transaction().context.get('date'):
- time.strptime(str(Transaction().context['date']), '%Y-%m-%d')
fiscalyears = FiscalYear.search([
('start_date', '<=', Transaction().context['date']),
('end_date', '>=', Transaction().context['date']),
@@ -1125,83 +1101,71 @@ class Line(ModelSQL, ModelView):
fiscalyear_id = fiscalyears and fiscalyears[0].id or 0
if Transaction().context.get('posted'):
- return (obj + '.state != \'draft\' '
- 'AND ' + obj + '.move IN ('
- 'SELECT m.id FROM account_move AS m, '
- 'account_period AS p '
- 'WHERE m.period = p.id '
- 'AND p.fiscalyear = ' +
- str(fiscalyear_id) + ' '
- 'AND m.date <= date(\'' +
- str(Transaction().context['date']) +
- '\') '
- 'AND m.state = \'posted\' '
- ')', [f.id for f in fiscalyears])
+ return ((table.state != 'draft')
+ & table.move.in_(move.join(period,
+ condition=move.period == period.id
+ ).select(move.id,
+ where=(move.fiscalyear == fiscalyear_id)
+ & (move.date <= Transaction().context['date'])
+ & (move.state == 'posted'))),
+ [f.id for f in fiscalyears])
else:
- return (obj + '.state != \'draft\' '
- 'AND ' + obj + '.move IN ('
- 'SELECT m.id FROM account_move AS m, '
- 'account_period AS p '
- 'WHERE m.period = p.id '
- 'AND p.fiscalyear = ' +
- str(fiscalyear_id) + ' '
- 'AND m.date <= date(\'' +
- str(Transaction().context['date']) +
- '\')'
- ')', [f.id for f in fiscalyears])
+ return ((table.state != 'draft')
+ & table.move.in_(move.join(period,
+ condition=move.period == period.id
+ ).select(move.id,
+ where=(period.fiscalyear == fiscalyear_id)
+ & (move.date <= Transaction().context['date']))),
+ [f.id for f in fiscalyears])
if Transaction().context.get('periods'):
if Transaction().context.get('fiscalyear'):
- fiscalyear_ids = [int(Transaction().context['fiscalyear'])]
+ fiscalyear_ids = [Transaction().context['fiscalyear']]
else:
fiscalyear_ids = []
- ids = ','.join(
- str(int(x)) for x in Transaction().context['periods'])
if Transaction().context.get('posted'):
- return (obj + '.state != \'draft\' '
- 'AND ' + obj + '.move IN ('
- 'SELECT id FROM account_move '
- 'WHERE period IN (' + ids + ') '
- 'AND state = \'posted\' '
- ')', fiscalyear_ids)
+ return ((table.state != 'draft')
+ & table.move.in_(
+ move.select(move.id,
+ where=period.in_(
+ Transaction().context['periods'])
+ & move.state == 'posted')),
+ fiscalyear_ids)
else:
- return (obj + '.state != \'draft\' '
- 'AND ' + obj + '.move IN ('
- 'SELECT id FROM account_move '
- 'WHERE period IN (' + ids + ')'
- ')', fiscalyear_ids)
+ return ((table.state != 'draft')
+ & table.move.in_(
+ move.select(move.id,
+ where=move.period.in_(
+ Transaction().context['periods']))),
+ fiscalyear_ids)
else:
if not Transaction().context.get('fiscalyear'):
fiscalyears = FiscalYear.search([
('state', '=', 'open'),
])
- fiscalyear_ids = [f.id for f in fiscalyears]
- fiscalyear_clause = (','.join(
- str(f.id) for f in fiscalyears)) or '0'
+ fiscalyear_ids = [f.id for f in fiscalyears] or [0]
else:
- fiscalyear_ids = [int(Transaction().context.get('fiscalyear'))]
- fiscalyear_clause = '%s' % int(
- Transaction().context.get('fiscalyear'))
+ fiscalyear_ids = [Transaction().context.get('fiscalyear')]
if Transaction().context.get('posted'):
- return (obj + '.state != \'draft\' '
- 'AND ' + obj + '.move IN ('
- 'SELECT id FROM account_move '
- 'WHERE period IN ('
- 'SELECT id FROM account_period '
- 'WHERE fiscalyear IN (' + fiscalyear_clause + ')'
- ') '
- 'AND state = \'posted\' '
- ')', fiscalyear_ids)
+ return ((table.state != 'draft')
+ & table.move.in_(
+ move.select(move.id,
+ where=move.period.in_(
+ period.select(period.id,
+ where=period.fiscalyear.in_(
+ fiscalyear_ids)))
+ & move.state == 'posted')),
+ fiscalyear_ids)
else:
- return (obj + '.state != \'draft\' '
- 'AND ' + obj + '.move IN ('
- 'SELECT id FROM account_move '
- 'WHERE period IN ('
- 'SELECT id FROM account_period '
- 'WHERE fiscalyear IN (' + fiscalyear_clause + ')'
- ')'
- ')', fiscalyear_ids)
+ return ((table.state != 'draft')
+ & table.move.in_(
+ move.select(move.id,
+ where=move.period.in_(
+ period.select(period.id,
+ where=period.fiscalyear.in_(
+ fiscalyear_ids))))),
+ fiscalyear_ids)
@classmethod
def on_write(cls, lines):
@@ -1275,7 +1239,7 @@ class Line(ModelSQL, ModelView):
def write(cls, lines, vals):
Move = Pool().get('account.move')
- if len(vals) > 1 or 'reconciliation' not in vals:
+ if any(k not in cls._check_modify_exclude for k in vals):
cls.check_modify(lines)
moves = [x.move for x in lines]
super(Line, cls).write(lines, vals)
@@ -1297,15 +1261,6 @@ class Line(ModelSQL, ModelView):
if not journal_id:
cls.raise_user_error('no_journal')
journal = Journal(journal_id)
- if journal.centralised:
- moves = Move.search([
- ('period', '=', vals.get('period')
- or Transaction().context.get('period')),
- ('journal', '=', journal_id),
- ('state', '!=', 'posted'),
- ], limit=1)
- if moves:
- vals['move'] = moves[0].id
if not vals.get('move'):
vals['move'] = Move.create([{
'period': (vals.get('period')
@@ -1446,12 +1401,6 @@ class Line(ModelSQL, ModelView):
}])[0]
-class Move2:
- __name__ = 'account.move'
- centralised_line = fields.Many2One('account.move.line', 'Centralised Line',
- readonly=True)
-
-
class OpenJournalAsk(ModelView):
'Open Journal Ask'
__name__ = 'account.move.open_journal.ask'
@@ -1581,6 +1530,9 @@ class ReconcileLinesWriteOff(ModelView):
date = fields.Date('Date', required=True)
account = fields.Many2One('account.account', 'Account', required=True,
domain=[('kind', '!=', 'view')])
+ amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
+ readonly=True, depends=['currency_digits'])
+ currency_digits = fields.Integer('Currency Digits', readonly=True)
@staticmethod
def default_date():
@@ -1599,7 +1551,8 @@ class ReconcileLines(Wizard):
])
reconcile = StateTransition()
- def transition_start(self):
+ def get_writeoff(self):
+ "Return writeoff amount and company"
Line = Pool().get('account.move.line')
company = None
@@ -1608,12 +1561,23 @@ class ReconcileLines(Wizard):
amount += line.debit - line.credit
if not company:
company = line.account.company
+ return amount, company
+
+ def transition_start(self):
+ amount, company = self.get_writeoff()
if not company:
return 'end'
if company.currency.is_zero(amount):
return 'reconcile'
return 'writeoff'
+ def default_writeoff(self, fields):
+ amount, company = self.get_writeoff()
+ return {
+ 'amount': amount,
+ 'currency_digits': company.currency.digits,
+ }
+
def transition_reconcile(self):
Line = Pool().get('account.move.line')
@@ -1666,10 +1630,18 @@ class OpenReconcileLines(Wizard):
open_ = StateAction('account.act_move_line_form')
def do_open_(self, action):
- action['pyson_domain'] = PYSONEncoder().encode([
+ encoder = PYSONEncoder()
+ action['pyson_domain'] = encoder.encode([
('account', '=', self.start.account.id),
('reconciliation', '=', None),
])
+ 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, {}
diff --git a/move.xml b/move.xml
index 9f0daa0..3c603fc 100644
--- a/move.xml
+++ b/move.xml
@@ -16,7 +16,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_move_form">
<field name="name">Account Moves</field>
<field name="res_model">account.move</field>
- <field name="domain">[('period.fiscalyear.company.id', '=', Get(Eval('context', {}), 'company', False))]</field>
+ <field name="domain">[('period.fiscalyear.company.id', '=', Eval('context', {}).get('company', -1))]</field>
<field name="search_value">[('create_date', '>=', DateTime(hour=0, minute=0, second=0, microsecond=0, delta_years=-1))]</field>
</record>
<record model="ir.action.act_window.view" id="act_move_form_view1">
diff --git a/party.py b/party.py
index 0d298ea..de9579f 100644
--- a/party.py
+++ b/party.py
@@ -1,6 +1,10 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
+from sql import Literal
+from sql.aggregate import Sum
+from sql.conditionals import Coalesce
+
from trytond.model import fields
from trytond.pyson import Eval, Bool
from trytond.transaction import Transaction
@@ -15,7 +19,7 @@ class Party:
account_payable = fields.Property(fields.Many2One('account.account',
'Account Payable', domain=[
('kind', '=', 'payable'),
- ('company', '=', Eval('context', {}).get('company')),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'required': Bool(Eval('context', {}).get('company')),
@@ -24,7 +28,7 @@ class Party:
account_receivable = fields.Property(fields.Many2One('account.account',
'Account Receivable', domain=[
('kind', '=', 'receivable'),
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
],
states={
'required': Bool(Eval('context', {}).get('company')),
@@ -33,7 +37,7 @@ class Party:
customer_tax_rule = fields.Property(fields.Many2One('account.tax.rule',
'Customer Tax Rule',
domain=[
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
('kind', 'in', ['sale', 'both']),
],
states={
@@ -42,7 +46,7 @@ class Party:
supplier_tax_rule = fields.Property(fields.Many2One('account.tax.rule',
'Supplier Tax Rule',
domain=[
- ('company', '=', Eval('context', {}).get('company', 0)),
+ ('company', '=', Eval('context', {}).get('company', -1)),
('kind', 'in', ['purchase', 'both']),
],
states={
@@ -65,10 +69,14 @@ class Party:
res = {}
pool = Pool()
MoveLine = pool.get('account.move.line')
+ Account = pool.get('account.account')
User = pool.get('res.user')
Date = pool.get('ir.date')
cursor = Transaction().cursor
+ line = MoveLine.__table__()
+ account = Account.__table__()
+
for name in names:
if name not in ('receivable', 'payable',
'receivable_today', 'payable_today'):
@@ -83,32 +91,27 @@ class Party:
return res
company_id = user.company.id
- line_query, _ = MoveLine.query_get()
+ line_query, _ = MoveLine.query_get(line)
for name in names:
code = name
- today_query = ''
- today_value = []
+ today_query = Literal(True)
if name in ('receivable_today', 'payable_today'):
code = name[:-6]
- today_query = 'AND (l.maturity_date <= %s ' \
- 'OR l.maturity_date IS NULL) '
- today_value = [Date.today()]
-
- cursor.execute('SELECT l.party, '
- 'SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))) '
- 'FROM account_move_line AS l, account_account AS a '
- 'WHERE a.id = l.account '
- 'AND a.active '
- 'AND a.kind = %s '
- 'AND l.party IN '
- '(' + ','.join(('%s',) * len(parties)) + ') '
- 'AND l.reconciliation IS NULL '
- 'AND ' + line_query + ' '
- + today_query +
- 'AND a.company = %s '
- 'GROUP BY l.party',
- [code] + [p.id for p in parties] + today_value + [company_id])
+ today_query = ((line.maturity_date <= Date.today())
+ | (line.maturity_date == None))
+
+ cursor.execute(*line.join(account,
+ condition=account.id == line.account
+ ).select(line.party,
+ Sum(Coalesce(line.debit, 0) - Coalesce(line.credit, 0)),
+ where=account.active
+ & (account.kind == code)
+ & line.party.in_([p.id for p in parties])
+ & (line.reconciliation == None)
+ & (account.company == company_id)
+ & line_query & today_query,
+ group_by=line.party))
for party_id, sum in cursor.fetchall():
# SQLite uses float for SUM
if not isinstance(sum, Decimal):
@@ -120,10 +123,13 @@ class Party:
def search_receivable_payable(cls, name, clause):
pool = Pool()
MoveLine = pool.get('account.move.line')
+ Account = pool.get('account.account')
Company = pool.get('company.company')
User = pool.get('res.user')
Date = pool.get('ir.date')
- cursor = Transaction().cursor
+
+ line = MoveLine.__table__()
+ account = Account.__table__()
if name not in ('receivable', 'payable',
'receivable_today', 'payable_today'):
@@ -151,28 +157,25 @@ class Party:
return []
code = name
- today_query = ''
- today_value = []
+ today_query = Literal(True)
if name in ('receivable_today', 'payable_today'):
code = name[:-6]
- today_query = 'AND (l.maturity_date <= %s ' \
- 'OR l.maturity_date IS NULL) '
- today_value = [Date.today()]
-
- line_query, _ = MoveLine.query_get()
-
- cursor.execute('SELECT l.party '
- 'FROM account_move_line AS l, account_account AS a '
- 'WHERE a.id = l.account '
- 'AND a.active '
- 'AND a.kind = %s '
- 'AND l.party IS NOT NULL '
- 'AND l.reconciliation IS NULL '
- 'AND ' + line_query + ' '
- + today_query +
- 'AND a.company = %s '
- 'GROUP BY l.party '
- 'HAVING (SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))) '
- + clause[1] + ' %s)',
- [code] + today_value + [company_id] + [Decimal(clause[2] or 0)])
- return [('id', 'in', [x[0] for x in cursor.fetchall()])]
+ today_query = ((line.maturity_date <= Date.today())
+ | (line.maturity_date == None))
+
+ line_query, _ = MoveLine.query_get(line)
+ Operator = fields.SQL_OPERATORS[clause[1]]
+
+ query = line.join(account, condition=account.id == line.account
+ ).select(line.party,
+ where=account.active
+ & (account.kind == code)
+ & (line.party != None)
+ & (line.reconciliation == None)
+ & (account.company == company_id)
+ & today_query,
+ group_by=line.party,
+ having=Operator(Sum(Coalesce(line.debit, 0)
+ - Coalesce(line.credit, 0)),
+ Decimal(clause[2] or 0)))
+ return [('id', 'in', query)]
diff --git a/period.py b/period.py
index e043f11..7b651f3 100644
--- a/period.py
+++ b/period.py
@@ -6,7 +6,7 @@ from trytond.pyson import Eval
from trytond.transaction import Transaction
from trytond.pool import Pool
from trytond.const import OPERATORS
-from trytond.backend import TableHandler
+from trytond import backend
__all__ = ['Period', 'ClosePeriod', 'ReOpenPeriod']
@@ -44,6 +44,7 @@ class Period(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
super(Period, cls).__register__(module_name)
@@ -108,18 +109,17 @@ class Period(ModelSQL, ModelView):
cursor = Transaction().cursor
if self.type != 'standard':
return True
- cursor.execute('SELECT id '
- 'FROM "' + self._table + '" '
- 'WHERE ((start_date <= %s AND end_date >= %s) '
- 'OR (start_date <= %s AND end_date >= %s) '
- 'OR (start_date >= %s AND end_date <= %s)) '
- 'AND fiscalyear = %s '
- 'AND type = \'standard\' '
- 'AND id != %s',
- (self.start_date, self.start_date,
- self.end_date, self.end_date,
- self.start_date, self.end_date,
- self.fiscalyear.id, self.id))
+ table = self.__table__()
+ cursor.execute(*table.select(table.id,
+ where=(((table.start_date <= self.start_date)
+ & (table.end_date >= self.start_date))
+ | ((table.start_date <= self.end_date)
+ & (table.end_date >= self.end_date))
+ | ((table.start_date >= self.start_date)
+ & (table.end_date <= self.end_date)))
+ & (table.fiscalyear == self.fiscalyear.id)
+ & (table.type == 'standard')
+ & (table.id != self.id)))
period_id = cursor.fetchone()
if period_id:
overlapping_period = self.__class__(period_id[0])
@@ -146,7 +146,7 @@ class Period(ModelSQL, ModelView):
'second': periods[0].rec_name,
})
if (self.post_move_sequence.company and
- self.post_move_sequence.company != self.fiscalyear.company):
+ self.post_move_sequence.company != self.fiscalyear.company):
self.raise_user_error('check_move_sequence_company', {
'sequence': self.post_move_sequence.rec_name,
'period': self.rec_name,
@@ -202,7 +202,7 @@ class Period(ModelSQL, ModelView):
@classmethod
def search(cls, args, offset=0, limit=None, order=None, count=False,
- query_string=False):
+ query=False):
args = args[:]
def process_args(args):
@@ -225,7 +225,7 @@ class Period(ModelSQL, ModelView):
i += 1
process_args(args)
return super(Period, cls).search(args, offset=offset, limit=limit,
- order=order, count=count, query_string=query_string)
+ order=order, count=count, query=query)
@classmethod
def create(cls, vlist):
diff --git a/period.xml b/period.xml
index c5866d0..5b93f8f 100644
--- a/period.xml
+++ b/period.xml
@@ -16,7 +16,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_period_form">
<field name="name">Periods</field>
<field name="res_model">account.period</field>
- <field name="domain">[('fiscalyear.company.id', '=', Get(Eval('context', {}), 'company', False))]</field>
+ <field name="domain">[('fiscalyear.company.id', '=', Eval('context', {}).get('company', -1))]</field>
</record>
<record model="ir.action.act_window.view" id="act_period_form_view1">
<field name="sequence" eval="10"/>
@@ -71,7 +71,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_period_form2">
<field name="name">Periods</field>
<field name="res_model">account.period</field>
- <field name="domain">[('state', 'in', ['open']), ('fiscalyear.company.id', '=', Get(Eval('context', {}), 'company', False))]</field>
+ <field name="domain">[('state', 'in', ['open']), ('fiscalyear.company.id', '=', Eval('context', {}).get('company', -1))]</field>
</record>
<record model="ir.action.act_window.view" id="act_period_form2_view1">
<field name="sequence" eval="10"/>
diff --git a/setup.py b/setup.py
index 8998a07..2800cc2 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = ['python-dateutil']
+requires = ['python-dateutil', 'python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -64,6 +64,7 @@ setup(name='trytond_account',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tax.py b/tax.py
index edc830d..05d9d0f 100644
--- a/tax.py
+++ b/tax.py
@@ -1,9 +1,11 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
+from sql.aggregate import Sum
+
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateView, StateAction, Button
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.pyson import Eval, If, Bool, PYSONEncoder
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
@@ -32,6 +34,7 @@ class TaxGroup(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
super(TaxGroup, cls).__register__(module_name)
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -183,23 +186,23 @@ class TaxCode(ModelSQL, ModelView):
res = {}
pool = Pool()
MoveLine = pool.get('account.move.line')
+ TaxLine = pool.get('account.tax.line')
+
+ code = cls.__table__()
+ tax_line = TaxLine.__table__()
+ move_line = MoveLine.__table__()
childs = cls.search([
('parent', 'child_of', [c.id for c in codes]),
])
all_codes = list(set(codes) | set(childs))
- line_query, _ = MoveLine.query_get()
- cursor.execute('SELECT c.id, SUM(tl.amount) '
- 'FROM account_tax_code c, '
- 'account_tax_line tl, '
- 'account_move_line l '
- 'WHERE c.id = tl.code '
- 'AND tl.move_line = l.id '
- 'AND c.id IN (' +
- ','.join(('%s',) * len(all_codes)) + ') '
- 'AND ' + line_query + ' '
- 'AND c.active '
- 'GROUP BY c.id', [c.id for c in all_codes])
+ line_query, _ = MoveLine.query_get(move_line)
+ cursor.execute(*code.join(tax_line, condition=tax_line.code == code.id
+ ).join(move_line, condition=tax_line.move_line == move_line.id
+ ).select(code.id, Sum(tax_line.amount),
+ where=code.id.in_([c.id for c in all_codes])
+ & code.active & line_query,
+ group_by=code.id))
code_sum = {}
for code_id, sum in cursor.fetchall():
# SQLite uses float for SUM
@@ -342,11 +345,18 @@ class TaxTemplate(ModelSQL, ModelView):
name = fields.Char('Name', required=True, translate=True)
description = fields.Char('Description', required=True, translate=True)
group = fields.Many2One('account.tax.group', 'Group')
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
- amount = fields.Numeric('Amount', digits=(16, 8))
- percentage = fields.Numeric('Percentage', digits=(16, 8))
+ sequence = fields.Integer('Sequence')
+ amount = fields.Numeric('Amount', digits=(16, 8),
+ states={
+ 'required': Eval('type') == 'fixed',
+ 'invisible': Eval('type') != 'fixed',
+ },
+ depends=['type'])
+ rate = fields.Numeric('Rate', digits=(14, 10),
+ states={
+ 'required': Eval('type') == 'percentage',
+ 'invisible': Eval('type') != 'percentage',
+ }, depends=['type'])
type = fields.Selection([
('percentage', 'Percentage'),
('fixed', 'Fixed'),
@@ -383,6 +393,7 @@ class TaxTemplate(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
super(TaxTemplate, cls).__register__(module_name)
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -393,6 +404,19 @@ class TaxTemplate(ModelSQL, ModelView):
#Migration from 2.4: drop required on sequence
table.not_null_action('sequence', action='remove')
+ # Migration from 2.8: rename percentage into rate
+ if table.column_exist('percentage'):
+ sql_table = cls.__table__()
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.rate],
+ values=[sql_table.percentage / 100]))
+ table.drop_column('percentage')
+
+ @staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
@staticmethod
def default_type():
return 'percentage'
@@ -423,7 +447,7 @@ class TaxTemplate(ModelSQL, ModelView):
'''
res = {}
for field in ('name', 'description', 'sequence', 'amount',
- 'percentage', 'type', 'invoice_base_sign', 'invoice_tax_sign',
+ 'rate', 'type', 'invoice_base_sign', 'invoice_tax_sign',
'credit_note_base_sign', 'credit_note_tax_sign'):
if not tax or getattr(tax, field) != getattr(self, field):
res[field] = getattr(self, field)
@@ -532,7 +556,7 @@ class Tax(ModelSQL, ModelView):
Account Tax
Type:
- percentage: tax = price * amount
+ percentage: tax = price * rate
fixed: tax = amount
none: tax = none
'''
@@ -545,10 +569,7 @@ class Tax(ModelSQL, ModelView):
'invisible': Bool(Eval('parent')),
}, depends=['parent'])
active = fields.Boolean('Active')
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s',
- help='Use to order the taxes')
+ sequence = fields.Integer('Sequence', help='Use to order the taxes')
currency_digits = fields.Function(fields.Integer('Currency Digits',
on_change_with=['company']), 'on_change_with_currency_digits')
amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
@@ -557,11 +578,11 @@ class Tax(ModelSQL, ModelView):
'invisible': Eval('type') != 'fixed',
}, help='In company\'s currency',
depends=['type', 'currency_digits'])
- percentage = fields.Numeric('Percentage', digits=(16, 8),
+ rate = fields.Numeric('Rate', digits=(14, 10),
states={
'required': Eval('type') == 'percentage',
'invisible': Eval('type') != 'percentage',
- }, help='In %', depends=['type'])
+ }, depends=['type'])
type = fields.Selection([
('percentage', 'Percentage'),
('fixed', 'Fixed'),
@@ -572,7 +593,7 @@ class Tax(ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', 0)),
+ Eval('context', {}).get('company', -1)),
], select=True)
invoice_account = fields.Many2One('account.account', 'Invoice Account',
domain=[
@@ -648,6 +669,7 @@ class Tax(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
super(Tax, cls).__register__(module_name)
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -658,6 +680,19 @@ class Tax(ModelSQL, ModelView):
# Migration from 2.4: drop required on sequence
table.not_null_action('sequence', action='remove')
+ # Migration from 2.8: rename percentage into rate
+ if table.column_exist('percentage'):
+ sql_table = cls.__table__()
+ cursor.execute(*sql_table.update(
+ columns=[sql_table.rate],
+ values=[sql_table.percentage / 100]))
+ table.drop_column('percentage')
+
+ @staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
@staticmethod
def default_active():
return True
@@ -697,7 +732,7 @@ class Tax(ModelSQL, ModelView):
def _process_tax(self, price_unit):
if self.type == 'percentage':
- amount = price_unit * self.percentage / Decimal('100')
+ amount = price_unit * self.rate
return {
'base': price_unit,
'amount': amount,
@@ -948,7 +983,7 @@ class TaxRule(ModelSQL, ModelView):
company = fields.Many2One('company.company', 'Company', required=True,
select=True, domain=[
('id', If(Eval('context', {}).contains('company'), '=', '!='),
- Eval('context', {}).get('company', 0)),
+ Eval('context', {}).get('company', -1)),
])
lines = fields.One2Many('account.tax.rule.line', 'rule', 'Lines')
template = fields.Many2One('account.tax.rule.template', 'Template')
@@ -1052,9 +1087,7 @@ class TaxRuleLineTemplate(ModelSQL, ModelView):
],
],
depends=['group'])
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence')
@classmethod
def __setup__(cls):
@@ -1064,6 +1097,7 @@ class TaxRuleLineTemplate(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -1072,6 +1106,11 @@ class TaxRuleLineTemplate(ModelSQL, ModelView):
# Migration from 2.4: drop required on sequence
table.not_null_action('sequence', action='remove')
+ @staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
def _get_tax_rule_line_value(self, rule_line=None):
'''
Set values for tax rule line creation.
@@ -1160,9 +1199,7 @@ class TaxRuleLine(ModelSQL, ModelView):
],
],
depends=['group'])
- sequence = fields.Integer('Sequence',
- order_field='(%(table)s.sequence IS NULL) %(order)s, '
- '%(table)s.sequence %(order)s')
+ sequence = fields.Integer('Sequence')
template = fields.Many2One('account.tax.rule.line.template', 'Template')
@classmethod
@@ -1173,6 +1210,7 @@ class TaxRuleLine(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -1181,6 +1219,11 @@ class TaxRuleLine(ModelSQL, ModelView):
# Migration from 2.4: drop required on sequence
table.not_null_action('sequence', action='remove')
+ @staticmethod
+ def order_sequence(tables):
+ table, _ = tables[None]
+ return [table.sequence == None, table.sequence]
+
def match(self, pattern):
'''
Match line on pattern
diff --git a/tax.xml b/tax.xml
index 3a2d1a0..1cb87f9 100644
--- a/tax.xml
+++ b/tax.xml
@@ -63,7 +63,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_tax_code_template_tree">
<field name="name">Tax Codes Templates</field>
<field name="res_model">account.tax.code.template</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_tax_code_template_tree_view1">
<field name="sequence" eval="10"/>
@@ -101,7 +101,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_tax_code_tree">
<field name="name">Tax Codes</field>
<field name="res_model">account.tax.code</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_tax_code_tree_view1">
<field name="sequence" eval="10"/>
@@ -143,7 +143,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_tax_code_tree2">
<field name="name">Tax Codes</field>
<field name="res_model">account.tax.code</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_tax_code_tree2_view1">
<field name="sequence" eval="10"/>
@@ -202,7 +202,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_tax_template_tree">
<field name="name">Taxes Templates</field>
<field name="res_model">account.tax.template</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_tax_template_tree_view1">
<field name="sequence" eval="10"/>
@@ -247,7 +247,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_tax_tree">
<field name="name">Taxes</field>
<field name="res_model">account.tax</field>
- <field name="domain">[('company', '=', Eval('company')), ('parent', '=', False)]</field>
+ <field name="domain">[('company', '=', Eval('company')), ('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_tax_tree_view1">
<field name="sequence" eval="10"/>
@@ -265,7 +265,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_tax_list">
<field name="name">Taxes</field>
<field name="res_model">account.tax</field>
- <field name="domain">[('company', '=', Eval('company')), ('parent', '=', False)]</field>
+ <field name="domain">[('company', '=', Eval('company')), ('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_tax_list_view1">
<field name="sequence" eval="10"/>
diff --git a/tests/__init__.py b/tests/__init__.py
index e88190a..24b6dac 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_account import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_account_reconciliation.rst b/tests/scenario_account_reconciliation.rst
index 4bfda37..a8b1400 100644
--- a/tests/scenario_account_reconciliation.rst
+++ b/tests/scenario_account_reconciliation.rst
@@ -80,7 +80,7 @@ Create chart of accounts::
>>> AccountTemplate = Model.get('account.account.template')
>>> Account = Model.get('account.account')
- >>> account_template, = AccountTemplate.find([('parent', '=', False)])
+ >>> account_template, = AccountTemplate.find([('parent', '=', None)])
>>> create_chart = Wizard('account.create_chart')
>>> create_chart.execute('account')
>>> create_chart.form.account_template = account_template
diff --git a/tests/test_account.py b/tests/test_account.py
index 43d96f3..46d5bdc 100644
--- a/tests/test_account.py
+++ b/tests/test_account.py
@@ -40,6 +40,9 @@ class AccountTestCase(unittest.TestCase):
self.move = POOL.get('account.move')
self.journal = POOL.get('account.journal')
self.account_type = POOL.get('account.account.type')
+ self.period = POOL.get('account.period')
+ self.balance_non_deferral = POOL.get(
+ 'account.fiscalyear.balance_non_deferral', type='wizard')
def test0005views(self):
'''
@@ -75,7 +78,7 @@ class AccountTestCase(unittest.TestCase):
tax = self.tax_template()
tax.name = tax.description = '20% VAT'
tax.type = 'percentage'
- tax.percentage = Decimal(20)
+ tax.rate = Decimal('0.2')
tax.account = account_template
tax.invoice_account = tax_account
tax.credit_note_account = tax_account
@@ -233,7 +236,7 @@ class AccountTestCase(unittest.TestCase):
(Decimal(0), Decimal(100)))
self.assertEqual(revenue.balance, Decimal(-100))
- # Close fiscalyear
+ # Balance non-deferral
journal_sequence, = self.sequence.search([
('code', '=', 'account.journal'),
])
@@ -243,6 +246,13 @@ class AccountTestCase(unittest.TestCase):
'type': 'situation',
'sequence': journal_sequence.id,
}])
+ period_closing, = self.period.create([{
+ 'name': 'Closing',
+ 'start_date': fiscalyear.end_date,
+ 'end_date': fiscalyear.end_date,
+ 'fiscalyear': fiscalyear.id,
+ 'type': 'adjustment',
+ }])
type_equity, = self.account_type.search([
('name', '=', 'Equity'),
])
@@ -253,28 +263,25 @@ class AccountTestCase(unittest.TestCase):
'parent': revenue.parent.id,
'kind': 'other',
}])
- self.move.create([{
- 'period': fiscalyear.periods[-1].id,
- 'journal': journal_closing.id,
- 'date': fiscalyear.periods[-1].end_date,
- 'lines': [
- ('create', [{
- 'account': revenue.id,
- 'debit': Decimal(100),
- }, {
- 'account': expense.id,
- 'credit': Decimal(30),
- }, {
- 'account': account_pl.id,
- 'credit': Decimal('70'),
- }]),
- ],
- }])
+
+ session_id = self.balance_non_deferral.create()[0]
+ balance_non_deferral = self.balance_non_deferral(session_id)
+
+ balance_non_deferral.start.fiscalyear = fiscalyear
+ balance_non_deferral.start.journal = journal_closing
+ balance_non_deferral.start.period = period_closing
+ balance_non_deferral.start.credit_account = account_pl
+ balance_non_deferral.start.debit_account = account_pl
+
+ balance_non_deferral._execute('balance')
+
moves = self.move.search([
('state', '=', 'draft'),
('period.fiscalyear', '=', fiscalyear.id),
])
self.move.post(moves)
+
+ # Close fiscalyear
self.fiscalyear.close([fiscalyear])
# Check deferral
diff --git a/third_party_balance.odt b/third_party_balance.odt
index 9e3cbe0..26328c1 100644
Binary files a/third_party_balance.odt and b/third_party_balance.odt differ
diff --git a/trial_balance.odt b/trial_balance.odt
index b0155ef..018cb14 100644
Binary files a/trial_balance.odt and b/trial_balance.odt differ
diff --git a/tryton.cfg b/tryton.cfg
index e47ec54..c6c0583 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.2
+version=3.0.0
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 352160c..f72b399 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: 2.8.2
+Version: 3.0.0
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_account
===============
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_account.egg-info/SOURCES.txt b/trytond_account.egg-info/SOURCES.txt
index a956633..fc423fc 100644
--- a/trytond_account.egg-info/SOURCES.txt
+++ b/trytond_account.egg-info/SOURCES.txt
@@ -43,6 +43,7 @@ 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
trytond_account.egg-info/PKG-INFO
trytond_account.egg-info/SOURCES.txt
@@ -73,6 +74,7 @@ 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
diff --git a/trytond_account.egg-info/requires.txt b/trytond_account.egg-info/requires.txt
index 0c667e0..166cb5c 100644
--- a/trytond_account.egg-info/requires.txt
+++ b/trytond_account.egg-info/requires.txt
@@ -1,5 +1,6 @@
python-dateutil
-trytond_company >= 2.8, < 2.9
-trytond_currency >= 2.8, < 2.9
-trytond_party >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond_company >= 3.0, < 3.1
+trytond_currency >= 3.0, < 3.1
+trytond_party >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/fiscalyear_balance_non_deferral_start_form.xml b/view/fiscalyear_balance_non_deferral_start_form.xml
new file mode 100644
index 0000000..63346bc
--- /dev/null
+++ b/view/fiscalyear_balance_non_deferral_start_form.xml
@@ -0,0 +1,16 @@
+<?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="Balance Non-Deferral">
+ <label name="fiscalyear"/>
+ <field name="fiscalyear"/>
+ <newline/>
+ <label name="journal"/>
+ <field name="journal"/>
+ <label name="period"/>
+ <field name="period"/>
+ <label name="credit_account"/>
+ <field name="credit_account"/>
+ <label name="debit_account"/>
+ <field name="debit_account"/>
+</form>
diff --git a/view/journal_form.xml b/view/journal_form.xml
index 86a3404..6834a60 100644
--- a/view/journal_form.xml
+++ b/view/journal_form.xml
@@ -21,8 +21,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="debit_account"/>
<label name="credit_account"/>
<field name="credit_account"/>
- <label name="centralised"/>
- <field name="centralised"/>
<newline/>
<label name="update_posted"/>
<field name="update_posted"/>
diff --git a/view/move_tree.xml b/view/move_tree.xml
index 17e074e..c93de2b 100644
--- a/view/move_tree.xml
+++ b/view/move_tree.xml
@@ -10,5 +10,4 @@ this repository contains the full copyright notices and license terms. -->
<field name="post_date"/>
<field name="origin"/>
<field name="state"/>
- <field name="create_date" tree_invisible="1"/>
</tree>
diff --git a/view/reconcile_lines_writeoff_form.xml b/view/reconcile_lines_writeoff_form.xml
index 1f1dbe1..632efce 100644
--- a/view/reconcile_lines_writeoff_form.xml
+++ b/view/reconcile_lines_writeoff_form.xml
@@ -1,11 +1,13 @@
<?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="Write-Off">
- <label name="journal"/>
- <field name="journal"/>
+<form string="Write-Off" cursor="journal">
+ <label name="amount"/>
+ <field name="amount"/>
<label name="date"/>
<field name="date"/>
+ <label name="journal"/>
+ <field name="journal"/>
<label name="account"/>
<field name="account"/>
</form>
diff --git a/view/tax_form.xml b/view/tax_form.xml
index a4ccaa9..6c49854 100644
--- a/view/tax_form.xml
+++ b/view/tax_form.xml
@@ -16,13 +16,16 @@ this repository contains the full copyright notices and license terms. -->
<field name="sequence"/>
<label name="type"/>
<field name="type"/>
- <group col="1" id="label_amount_percentage">
+ <group col="1" id="label_amount_rate">
<label name="amount" yfill="1" xexpand="1" yexpand="1"/>
- <label name="percentage" yfill="1" xexpand="1" yexpand="1"/>
+ <label name="rate" yfill="1" xexpand="1" yexpand="1"/>
</group>
- <group col="1" id="amount_percentage">
+ <group col="1" id="amount_rate">
<field name="amount"/>
- <field name="percentage"/>
+ <group col="2" id="rate">
+ <field name="rate" factor="100" xexpand="0"/>
+ <label name="rate" string="%" xalign="0.0" xexpand="1"/>
+ </group>
</group>
<label name="company"/>
<field name="company"/>
diff --git a/view/tax_template_form.xml b/view/tax_template_form.xml
index 2d1464a..28acd4d 100644
--- a/view/tax_template_form.xml
+++ b/view/tax_template_form.xml
@@ -16,13 +16,16 @@ this repository contains the full copyright notices and license terms. -->
<field name="sequence"/>
<label name="type"/>
<field name="type"/>
- <group col="1" id="label_amount_percentage">
+ <group col="1" id="label_amount_rate">
<label name="amount" yfill="1" xexpand="1" yexpand="1"/>
- <label name="percentage" yfill="1" xexpand="1" yexpand="1"/>
+ <label name="rate" yfill="1" xexpand="1" yexpand="1"/>
</group>
- <group col="1" id="amount_percentage">
+ <group col="1" id="amount_rate">
<field name="amount"/>
- <field name="percentage"/>
+ <group col="2" id="rate">
+ <field name="rate" factor="100" xexpand="0"/>
+ <label name="rate" string="%" xalign="0.0" xexpand="1"/>
+ </group>
</group>
<newline/>
<label name="invoice_account"/>
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list