[tryton-debian-vcs] tryton-modules-analytic-account branch upstream updated. upstream/3.4.1-1-gc0a1e63
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:02:32 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-account.git;a=commitdiff;h=upstream/3.4.1-1-gc0a1e63
commit c0a1e63afe761368cfdbf5e2d16e046b864a5a5c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 16:59:52 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index f459c37..d7c1100 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
-Version 3.4.1 - 2015-03-01
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
+* Add support for PyPy
+* Use One2Many for analytic accounts
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 8041232..884154e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_account
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for analytic accounting
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_analytic_account
========================
@@ -64,5 +64,7 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__init__.py b/__init__.py
index b42ec04..45c6ce4 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 trytond.pool import Pool
from .account import *
@@ -10,9 +10,9 @@ def register():
Pool.register(
Account,
OpenChartAccountStart,
- AccountSelection,
- AccountAccountSelection,
+ AnalyticAccountEntry,
Line,
+ Move,
MoveLine,
module='analytic_account', type_='model')
Pool.register(
diff --git a/account.py b/account.py
index 359e326..295a168 100644
--- a/account.py
+++ b/account.py
@@ -1,11 +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.
+# 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
-import copy
from sql import Column
from sql.aggregate import Sum
from sql.conditionals import Coalesce
+from trytond import backend
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateView, StateAction, Button
from trytond.pyson import Eval, PYSONEncoder
@@ -13,7 +13,7 @@ from trytond.transaction import Transaction
from trytond.pool import Pool
__all__ = ['Account', 'OpenChartAccountStart', 'OpenChartAccount',
- 'AccountSelection', 'AccountAccountSelection']
+ 'AnalyticAccountEntry', 'AnalyticMixin']
class Account(ModelSQL, ModelView):
@@ -32,7 +32,10 @@ class Account(ModelSQL, ModelView):
('normal', 'Normal'),
], 'Type', required=True)
root = fields.Many2One('analytic_account.account', 'Root', select=True,
- domain=[('parent', '=', None)],
+ domain=[
+ ('parent', '=', None),
+ ('type', '=', 'root'),
+ ],
states={
'invisible': Eval('type') == 'root',
'required': Eval('type') != 'root',
@@ -274,63 +277,6 @@ class Account(ModelSQL, ModelView):
else:
return [(cls._rec_name,) + tuple(clause[1:])]
- @classmethod
- def convert_view(cls, tree):
- res = tree.xpath('//field[@name=\'analytic_accounts\']')
- if not res:
- return
- element_accounts = res[0]
-
- root_accounts = cls.search([
- ('parent', '=', None),
- ])
- if not root_accounts:
- element_accounts.getparent().getparent().remove(
- element_accounts.getparent())
- return
- for account in root_accounts:
- newelement = copy.copy(element_accounts)
- newelement.tag = 'label'
- newelement.set('name', 'analytic_account_' + str(account.id))
- element_accounts.addprevious(newelement)
- newelement = copy.copy(element_accounts)
- newelement.set('name', 'analytic_account_' + str(account.id))
- element_accounts.addprevious(newelement)
- parent = element_accounts.getparent()
- parent.remove(element_accounts)
-
- @classmethod
- def analytic_accounts_fields_get(cls, field, fields_names=None,
- states=None, required_states=None):
- res = {}
- if fields_names is None:
- fields_names = []
- if states is None:
- states = {}
-
- encoder = PYSONEncoder()
-
- root_accounts = cls.search([
- ('parent', '=', None),
- ])
- for account in root_accounts:
- name = 'analytic_account_' + str(account.id)
- if name in fields_names or not fields_names:
- res[name] = field.copy()
- field_states = states.copy()
- if account.mandatory:
- if required_states:
- field_states['required'] = required_states
- else:
- field_states['required'] = True
- res[name]['states'] = encoder.encode(field_states)
- res[name]['string'] = account.name
- res[name]['relation'] = cls.__name__
- res[name]['domain'] = PYSONEncoder().encode([
- ('root', '=', account.id),
- ('type', '=', 'normal')])
- return res
-
class OpenChartAccountStart(ModelView):
'Open Chart of Accounts'
@@ -360,55 +306,170 @@ class OpenChartAccount(Wizard):
return 'end'
-class AccountSelection(ModelSQL, ModelView):
- 'Analytic Account Selection'
- __name__ = 'analytic_account.account.selection'
+class AnalyticAccountEntry(ModelView, ModelSQL):
+ 'Analytic Account Entry'
+ __name__ = 'analytic.account.entry'
+ origin = fields.Reference('Origin', selection='get_origin', select=True)
+ root = fields.Many2One('analytic_account.account', 'Root Analytic',
+ domain=[('type', '=', 'root')])
+ account = fields.Many2One('analytic_account.account', 'Account',
+ ondelete='RESTRICT',
+ states={
+ 'required': Eval('required', False),
+ },
+ domain=[
+ ('root', '=', Eval('root')),
+ ('type', '=', 'normal'),
+ ],
+ depends=['root', 'required'])
+ required = fields.Function(fields.Boolean('Required'),
+ 'on_change_with_required')
+
+ @classmethod
+ def __register__(cls, module_name):
+ pool = Pool()
+ Account = pool.get('analytic_account.account')
+ TableHandler = backend.get('TableHandler')
+ cursor = Transaction().cursor
+
+ # Migration from 3.4: use origin as the key for One2Many
+ migration_3_4 = False
+ old_table = 'analytic_account_account_selection_rel'
+ if TableHandler.table_exist(cursor, old_table):
+ TableHandler.table_rename(cursor, old_table, cls._table)
+ migration_3_4 = True
+
+ # Don't create table before renaming
+ table = TableHandler(cursor, cls, module_name)
+
+ super(AnalyticAccountEntry, cls).__register__(module_name)
+
+ # Migration from 3.4: set root value and remove required
+ if migration_3_4:
+ account = Account.__table__()
+ cursor.execute(*account.select(account.id, account.root,
+ where=account.type != 'root'))
+ entry = cls.__table__()
+ for account_id, root_id in cursor.fetchall():
+ cursor.execute(*entry.update(
+ columns=[entry.root],
+ values=[root_id],
+ where=entry.account == account_id))
+ table.not_null_action('selection', action='remove')
+ table.not_null_action('account', action='remove')
+
+ @classmethod
+ def __setup__(cls):
+ super(AnalyticAccountEntry, cls).__setup__()
+ cls._sql_constraints += [
+ ('root_origin_uniq', 'UNIQUE(origin, root)',
+ 'Only one account is allowed per analytic root and origin.'),
+ ]
+
+ @classmethod
+ def _get_origin(cls):
+ return []
+
+ @classmethod
+ def get_origin(cls):
+ Model = Pool().get('ir.model')
+ models = cls._get_origin()
+ models = Model.search([
+ ('model', 'in', models),
+ ])
+ return [(None, '')] + [(m.model, m.name) for m in models]
+
+ @fields.depends('root')
+ def on_change_with_required(self, name=None):
+ if self.root:
+ return self.root.mandatory
+ return False
+
+
+class AnalyticMixin(ModelSQL):
- accounts = fields.Many2Many(
- 'analytic_account.account-analytic_account.account.selection',
- 'selection', 'account', 'Accounts')
+ analytic_accounts = fields.One2Many('analytic.account.entry', 'origin',
+ 'Analytic Accounts',
+ size=Eval('analytic_accounts_size', 0),
+ depends=['analytic_accounts_size'])
+ analytic_accounts_size = fields.Function(fields.Integer(
+ 'Analytic Accounts Size'), 'get_analytic_accounts_size')
@classmethod
def __setup__(cls):
- super(AccountSelection, cls).__setup__()
+ super(AnalyticMixin, cls).__setup__()
cls._error_messages.update({
- 'root_account': ('Can not have many accounts with the same '
- 'root or a missing mandatory root account on "%s".'),
+ 'root_account': ('Some mandatory root account are missing '
+ 'on "%(name)s"'),
})
@classmethod
- def validate(cls, selections):
- super(AccountSelection, cls).validate(selections)
- cls.check_root(selections)
+ def __register__(cls, module_name):
+ pool = Pool()
+ AccountEntry = pool.get('analytic.account.entry')
+ TableHandler = backend.get('TableHandler')
+ cursor = Transaction().cursor
+
+ super(AnalyticMixin, cls).__register__(module_name)
+
+ handler = TableHandler(cursor, cls, module_name)
+ # Migration from 3.4: analytic accounting changed to reference field
+ if handler.column_exist('analytic_accounts'):
+ entry = AccountEntry.__table__()
+ table = cls.__table__()
+ cursor.execute(*table.select(table.id, table.analytic_accounts,
+ where=table.analytic_accounts != None))
+ for line_id, selection_id in cursor.fetchall():
+ cursor.execute(*entry.update(
+ columns=[entry.origin],
+ values=['%s,%s' % (cls.__name__, line_id)],
+ where=entry.selection == selection_id))
+ handler.drop_column('analytic_accounts')
+
+ @staticmethod
+ def default_analytic_accounts():
+ pool = Pool()
+ AnalyticAccount = pool.get('analytic_account.account')
+
+ accounts = []
+ root_accounts = AnalyticAccount.search([
+ ('parent', '=', None),
+ ])
+ for account in root_accounts:
+ accounts.append({
+ 'required': account.mandatory,
+ 'root': account.id,
+ })
+ return accounts
+
+ @staticmethod
+ def default_analytic_accounts_size():
+ pool = Pool()
+ AnalyticAccount = pool.get('analytic_account.account')
+ return len(AnalyticAccount.search([('type', '=', 'root')]))
@classmethod
- def check_root(cls, selections):
- "Check Root"
- Account = Pool().get('analytic_account.account')
+ def get_analytic_accounts_size(cls, records, name):
+ roots = cls.default_analytic_accounts_size()
+ return {r.id: roots for r in records}
- root_accounts = Account.search([
- ('parent', '=', None),
- ])
+ @classmethod
+ def validate(cls, analytics):
+ super(AnalyticMixin, cls).validate(analytics)
+ cls.check_roots(analytics)
- for selection in selections:
- roots = []
- for account in selection.accounts:
- if account.root.id in roots:
- cls.raise_user_error('root_account', (account.rec_name,))
- roots.append(account.root.id)
- if Transaction().user: # Root can by pass
- for account in root_accounts:
- if account.mandatory:
- if not account.id in roots:
- cls.raise_user_error('root_account',
- (account.rec_name,))
-
-
-class AccountAccountSelection(ModelSQL):
- 'Analytic Account - Analytic Account Selection'
- __name__ = 'analytic_account.account-analytic_account.account.selection'
- _table = 'analytic_account_account_selection_rel'
- selection = fields.Many2One('analytic_account.account.selection',
- 'Selection', ondelete='CASCADE', required=True, select=True)
- account = fields.Many2One('analytic_account.account', 'Account',
- ondelete='RESTRICT', required=True, select=True)
+ @classmethod
+ def check_roots(cls, analytics):
+ "Check that all mandatory root entries are defined in entries"
+ pool = Pool()
+ Account = pool.get('analytic_account.account')
+ mandatory_roots = {a for a in Account.search([
+ ('type', '=', 'root'),
+ ('mandatory', '=', True),
+ ])}
+ for analytic in analytics:
+ analytic_roots = {e.root for e in analytic.analytic_accounts}
+ if not mandatory_roots <= analytic_roots:
+ cls.raise_user_error('root_account', {
+ 'name': analytic.rec_name,
+ })
diff --git a/account.xml b/account.xml
index 0264b3b..85c7ea3 100644
--- a/account.xml
+++ b/account.xml
@@ -14,19 +14,23 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="account_view_tree">
<field name="model">analytic_account.account</field>
<field name="type">tree</field>
+ <field name="priority" eval="20"/>
<field name="field_childs">childs</field>
<field name="name">account_tree</field>
</record>
<record model="ir.ui.view" id="account_view_list">
<field name="model">analytic_account.account</field>
<field name="type">tree</field>
+ <field name="priority" eval="10"/>
<field name="name">account_list</field>
</record>
<record model="ir.action.act_window" id="act_account_tree">
<field name="name">Analytic Accounts</field>
<field name="res_model">analytic_account.account</field>
- <field name="domain">[('parent', '=', None), ('type', '=', 'root')]</field>
+ <field name="domain"
+ eval="[('parent', '=', None), ('type', '=', 'root')]"
+ pyson="1"/>
</record>
<record model="ir.action.act_window.view" id="act_account_tree_view1">
<field name="sequence" eval="10"/>
@@ -69,7 +73,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_tree2">
<field name="name">Analytic Accounts</field>
<field name="res_model">analytic_account.account</field>
- <field name="domain">[('parent', '=', None)]</field>
+ <field name="domain" eval="[('parent', '=', None)]" pyson="1"/>
</record>
<record model="ir.action.act_window.view" id="act_account_tree2_view1">
<field name="sequence" eval="10"/>
@@ -109,5 +113,16 @@ this repository contains the full copyright notices and license terms. -->
<field name="type">form</field>
<field name="name">open_chart_start_form</field>
</record>
+
+ <record model="ir.ui.view" id="analytic_account_entry_view_form">
+ <field name="model">analytic.account.entry</field>
+ <field name="type">form</field>
+ <field name="name">analytic_account_entry_form</field>
+ </record>
+ <record model="ir.ui.view" id="analytic_account_entry_view_list">
+ <field name="model">analytic.account.entry</field>
+ <field name="type">tree</field>
+ <field name="name">analytic_account_entry_tree</field>
+ </record>
</data>
</tryton>
diff --git a/line.py b/line.py
index c3458c3..18bc02f 100644
--- a/line.py
+++ b/line.py
@@ -1,14 +1,15 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateAction
from trytond import backend
from trytond.pyson import Eval, PYSONEncoder
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
-__all__ = ['Line', 'MoveLine', 'OpenAccount']
+__all__ = ['Line', 'Move', 'MoveLine', 'OpenAccount']
+__metaclass__ = PoolMeta
class Line(ModelSQL, ModelView):
@@ -26,7 +27,7 @@ class Line(ModelSQL, ModelView):
company = fields.Function(fields.Many2One('company.company', 'Company'),
'on_change_with_company')
account = fields.Many2One('analytic_account.account', 'Account',
- required=True, select=True, domain=[
+ required=True, select=True, domain=[
('type', '!=', 'view'),
['OR',
('company', '=', None),
@@ -131,6 +132,24 @@ class Line(ModelSQL, ModelView):
(self.account.rec_name,))
+class Move:
+ __name__ = 'account.move'
+
+ def cancel(self, default=None):
+ 'Reverse credit/debit of analytic lines'
+ pool = Pool()
+ AnalyticLine = pool.get('analytic_account.line')
+ cancel_move = super(Move, self).cancel(default)
+ analytic_lines = []
+ for line in cancel_move.lines:
+ for analytic_line in line.analytic_lines:
+ analytic_line.debit, analytic_line.credit = (
+ analytic_line.credit, analytic_line.debit)
+ analytic_lines.append(analytic_line)
+ AnalyticLine.save(analytic_lines)
+ return cancel_move
+
+
class MoveLine(ModelSQL, ModelView):
__name__ = 'account.move.line'
analytic_lines = fields.One2Many('analytic_account.line', 'move_line',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 9f969a2..f838c18 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,10 +2,8 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
msgstr ""
msgctxt "error:analytic_account.line:"
@@ -28,6 +26,55 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr "Редове от аналитична сметка"
+#, fuzzy
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Фактури"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Източник"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Условие за плащане"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Задължителен"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Активен"
@@ -120,77 +167,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Променено от"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Фактури"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Създадено на"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Създадено от"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Име"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Избор"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Променено на"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Променено от"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Сметки"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Създадено на"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Създадено от"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Име"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Променено на"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Променено от"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Фактури"
@@ -280,19 +256,14 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr "Начална дата"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr ""
+
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Аналитична сметка"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Аналитична сметка - Избор на аналитична сметка "
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Избор на аналитична сметка"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Ред от аналитична сметка"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 1d52814..f12e48f 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,13 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
-msgstr ""
-"No es poden tenir molts comptes amb la mateixa arrel o sense un compte arrel"
-" obligatori a \"%s\"."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
+msgstr "Només es pot seleccionar un compte per cada origen i arrel analítica."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -26,6 +22,46 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr "Línies analítiques"
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Compte"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Data creació"
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Usuari creació"
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Origen"
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Requerit"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr "Compte arrel analític"
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Data modificació"
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Usuari modificació"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Actiu"
@@ -118,77 +154,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Compte"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Data creació"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Usuari creació"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Selecció"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Data modificació"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Usuari modificació"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Comptes"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Data creació"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Usuari creació"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Data modificació"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Usuari modificació"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Compte"
@@ -277,19 +242,14 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr "Data inicial"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr "Assentament compte analític"
+
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Compte analític"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Compte analític - Selecció de compte analític"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Selecció compte analític"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Línia analítica"
@@ -378,6 +338,10 @@ msgctxt "view:account.move.line:"
msgid "Analytic"
msgstr "Analítica"
+msgctxt "view:analytic.account.entry:"
+msgid "Analytic Entry"
+msgstr "Assentament analític"
+
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
msgstr "Compte analític"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index aab0650..8f886e6 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,10 +2,8 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
msgstr ""
msgctxt "error:analytic_account.line:"
@@ -24,6 +22,46 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr ""
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr ""
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr ""
@@ -116,77 +154,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr ""
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr ""
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr ""
@@ -275,17 +242,12 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr ""
-msgctxt "model:analytic_account.account,name:"
-msgid "Analytic Account"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
msgstr ""
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr ""
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
+msgctxt "model:analytic_account.account,name:"
+msgid "Analytic Account"
msgstr ""
msgctxt "model:analytic_account.line,name:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 95701c4..b5174b6 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,13 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
-msgstr ""
-"Es kann nicht mehrere Konten mit demselben Wurzelkonto geben oder es fehlt "
-"ein erforderliches Wurzelkonto für \"%s\"."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
+msgstr "Es ist nur ein Konto möglich per Kostenstelle und Ursprung"
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -114,6 +110,46 @@ msgctxt "field:account.statement.line,statement:"
msgid "Statement"
msgstr "Zahlung"
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Konto"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Herkunft"
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Erforderlich"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr "Wurzelkonto Kostenstelle"
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Aktiv"
@@ -206,77 +242,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Konto"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Erstellungsdatum"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Erstellt durch"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Name"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Auswahl"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Zuletzt geändert"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Letzte Änderung durch"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Konten"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Erstellungsdatum"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Erstellt durch"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Name"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Zuletzt geändert"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Letzte Änderung durch"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Konto"
@@ -377,19 +342,14 @@ msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
msgstr "Bankauszugsposition"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr "Kostenstelleneintrag"
+
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Kostenstelle"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Kostenstelle - Kostenstelle Auswahl"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Kostenstelle Auswahl"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Kostenstelle Zeile"
@@ -512,11 +472,11 @@ msgstr "Posten Bankauszüge"
msgctxt "view:account.statement.line:"
msgid "Statement Line"
-msgstr "Zahlungsposten"
+msgstr "Bankauszugszeile"
msgctxt "view:account.statement.line:"
msgid "Statement Lines"
-msgstr "Zahlungsposten"
+msgstr "Bankauszugszeilen"
msgctxt "view:account.statement:"
msgid "Bank Statement"
@@ -536,7 +496,7 @@ msgstr "Annullieren"
msgctxt "view:account.statement:"
msgid "Move Lines"
-msgstr "Buchungsposten"
+msgstr "Buchungszeilen"
msgctxt "view:account.statement:"
msgid "Post"
@@ -552,7 +512,7 @@ msgstr "Zahlung"
msgctxt "view:account.statement:"
msgid "Statement Lines"
-msgstr "Zahlungsposten"
+msgstr "Bankauszugszeilen"
msgctxt "view:account.statement:"
msgid "Statements"
@@ -562,6 +522,10 @@ msgctxt "view:account.statement:"
msgid "Validate"
msgstr "Prüfen"
+msgctxt "view:analytic.account.entry:"
+msgid "Analytic Entry"
+msgstr "Kostenstelleneintrag"
+
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
msgstr "Kostenstelle"
@@ -600,4 +564,4 @@ msgstr "Abbrechen"
msgctxt "wizard_button:analytic_account.open_chart,start,open_:"
msgid "Open"
-msgstr "Offen"
+msgstr "Öffnen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 76a46d1..6f5a797 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -2,13 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
-msgstr ""
-"No se puede tener muchos cuentas con la misma raíz o sin una cuenta raíz "
-"obligatoria en «%s»."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
+msgstr "Sólo se permite una cuenta por analítica raíz y origen."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -27,13 +23,53 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr "Líneas analíticas"
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Origen"
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Requerido"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr "Cuenta analítica raíz"
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Activa"
msgctxt "field:analytic_account.account,balance:"
msgid "Balance"
-msgstr "Balance"
+msgstr "Saldo"
msgctxt "field:analytic_account.account,childs:"
msgid "Children"
@@ -65,7 +101,7 @@ msgstr "Moneda"
msgctxt "field:analytic_account.account,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de moneda"
+msgstr "Decimales de moneda"
msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
@@ -119,77 +155,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Selección"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Cuentas"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Cuenta"
@@ -220,7 +185,7 @@ msgstr "Moneda"
msgctxt "field:analytic_account.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de moneda"
+msgstr "Decimales de moneda"
msgctxt "field:analytic_account.line,date:"
msgid "Date"
@@ -276,21 +241,16 @@ msgstr "ID"
msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha inicial"
+
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr "Asiento de cuenta analítica"
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Cuenta analítica"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Cuenta analítica - Selección de cuenta analítica"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Selección de cuenta analítica"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Línea analítica"
@@ -383,6 +343,10 @@ msgctxt "view:account.move:"
msgid "Analytic"
msgstr "Analítica"
+msgctxt "view:analytic.account.entry:"
+msgid "Analytic Entry"
+msgstr "Asiento analítico"
+
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
msgstr "Cuenta analítica"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index d6fa4b0..b351a92 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,13 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
-msgstr ""
-"No puede tener varias cuentas con la misma cuenta padre o que les falte la "
-"cuenta padre!"
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
+msgstr "Solo euna cuenta es permitida por centro de costos raíz y origen."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -27,6 +23,46 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr "Líneas Analíticas"
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Fecha de Creación"
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Creado por Usuario"
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Origen"
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Requerido"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr "Centro de Costo Raíz"
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Fecha de Modificación"
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Modificado por Usuario"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Activo"
@@ -119,77 +155,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Selección"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Cuentas"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Cuenta"
@@ -248,7 +213,7 @@ msgstr "Nombre"
msgctxt "field:analytic_account.line,party:"
msgid "Party"
-msgstr "Terceros"
+msgstr "Tercero"
msgctxt "field:analytic_account.line,rec_name:"
msgid "Name"
@@ -278,19 +243,14 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr "Fecha Inicio"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr "Entrada de Cuenta Analítica"
+
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Cuenta Analítica"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Cuenta Analítica - Selección de Cuenta Analítica"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Selección de Cuenta Analítica"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Línea Analítica"
@@ -383,6 +343,10 @@ msgctxt "view:account.move:"
msgid "Analytic"
msgstr "Analítica"
+msgctxt "view:analytic.account.entry:"
+msgid "Analytic Entry"
+msgstr "Entrada Analítica"
+
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
msgstr "Cuenta Analítica"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index c3815a1..8f15772 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -2,13 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
msgstr ""
-"No se puede tener muchas cuentas con la misma raíz o falta una cuenta raíz "
-"obligatoria en \"%s\"."
+"Sólo se puede seleccionar una cuenta por cada origen y raíz analítica."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -26,11 +23,51 @@ msgstr ""
msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
-msgstr "Líneas Analíticas"
+msgstr "Líneas analíticas"
+
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Origen"
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Requerido"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr "Cuenta analítica raíz"
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
msgctxt "field:analytic_account.account,active:"
msgid "Active"
-msgstr "Activo"
+msgstr "Activa"
msgctxt "field:analytic_account.account,balance:"
msgid "Balance"
@@ -50,11 +87,11 @@ msgstr "Empresa"
msgctxt "field:analytic_account.account,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:analytic_account.account,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:analytic_account.account,credit:"
msgid "Credit"
@@ -66,7 +103,7 @@ msgstr "Moneda"
msgctxt "field:analytic_account.account,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de Moneda"
+msgstr "Decimales de moneda"
msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
@@ -74,7 +111,7 @@ msgstr "Débito"
msgctxt "field:analytic_account.account,display_balance:"
msgid "Display Balance"
-msgstr "Mostrar Balance"
+msgstr "Mostrar balance"
msgctxt "field:analytic_account.account,id:"
msgid "ID"
@@ -114,82 +151,11 @@ msgstr "Tipo"
msgctxt "field:analytic_account.account,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Selección"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Cuentas"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:analytic_account.line,account:"
msgid "Account"
@@ -197,7 +163,7 @@ msgstr "Cuenta"
msgctxt "field:analytic_account.line,active:"
msgid "Active"
-msgstr "Activo"
+msgstr "Activa"
msgctxt "field:analytic_account.line,company:"
msgid "Company"
@@ -205,11 +171,11 @@ msgstr "Empresa"
msgctxt "field:analytic_account.line,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:analytic_account.line,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:analytic_account.line,credit:"
msgid "Credit"
@@ -221,7 +187,7 @@ msgstr "Moneda"
msgctxt "field:analytic_account.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de Moneda"
+msgstr "Decimales de moneda"
msgctxt "field:analytic_account.line,date:"
msgid "Date"
@@ -237,11 +203,11 @@ msgstr "ID"
msgctxt "field:analytic_account.line,journal:"
msgid "Journal"
-msgstr "Libro Diario"
+msgstr "Libro diario"
msgctxt "field:analytic_account.line,move_line:"
msgid "Account Move Line"
-msgstr "Línea de Asiento Contable"
+msgstr "Línea de asiento contable"
msgctxt "field:analytic_account.line,name:"
msgid "Name"
@@ -261,15 +227,15 @@ msgstr "Referencia"
msgctxt "field:analytic_account.line,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:analytic_account.line,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:analytic_account.open_chart.start,end_date:"
msgid "End Date"
-msgstr "Fecha Final"
+msgstr "Fecha final"
msgctxt "field:analytic_account.open_chart.start,id:"
msgid "ID"
@@ -277,60 +243,55 @@ msgstr "ID"
msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
-msgstr "Fecha Inicio"
+msgstr "Fecha inicial"
+
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr "Asiento de cuenta analítica"
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Cuenta Analítica - Selección de Cuenta Analítica"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Selección de Cuenta Analítica"
+msgstr "Cuenta analítica"
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
-msgstr "Línea Analítica"
+msgstr "Línea analítica"
msgctxt "model:analytic_account.open_chart.start,name:"
msgid "Open Chart of Accounts"
-msgstr "Abrir Plan de Cuentas"
+msgstr "Abrir plan de cuentas"
msgctxt "model:ir.action,name:act_account_list"
msgid "Analytic Accounts"
-msgstr "Cuentas Analíticas"
+msgstr "Cuentas analíticas"
msgctxt "model:ir.action,name:act_account_tree"
msgid "Analytic Accounts"
-msgstr "Cuentas Analíticas"
+msgstr "Cuentas analíticas"
msgctxt "model:ir.action,name:act_account_tree2"
msgid "Analytic Accounts"
-msgstr "Cuentas Analíticas"
+msgstr "Cuentas analíticas"
msgctxt "model:ir.action,name:act_line_form"
msgid "Analytic Lines"
-msgstr "Líneas Analíticas"
+msgstr "Líneas analíticas"
msgctxt "model:ir.action,name:act_open_account"
msgid "Open Account"
-msgstr "Abrir Cuenta"
+msgstr "Abrir cuenta"
msgctxt "model:ir.action,name:act_open_chart"
msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir Plan de Cuentas Analíticas"
+msgstr "Abrir plan de cuentas analíticas"
msgctxt "model:ir.ui.menu,name:menu_account_list"
msgid "Analytic Accounts"
-msgstr "Cuentas Analíticas"
+msgstr "Cuentas analíticas"
msgctxt "model:ir.ui.menu,name:menu_account_tree"
msgid "Analytic Accounts"
-msgstr "Cuentas Analíticas"
+msgstr "Cuentas analíticas"
msgctxt "model:ir.ui.menu,name:menu_analytic_account_configuration"
msgid "Analytic Account"
@@ -342,7 +303,7 @@ msgstr "Abrir Plan de Cuentas Analíticas"
msgctxt "model:res.group,name:group_analytic_admin"
msgid "Analytic Administration"
-msgstr "Administración Analítica"
+msgstr "Administración de Analítica"
msgctxt "selection:analytic_account.account,display_balance:"
msgid "Credit - Debit"
@@ -384,17 +345,21 @@ msgctxt "view:account.move:"
msgid "Analytic"
msgstr "Analítica"
+msgctxt "view:analytic.account.entry:"
+msgid "Analytic Entry"
+msgstr "Asiento analítico"
+
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
-msgstr "Cuenta Analítica"
+msgstr "Cuenta analítica"
msgctxt "view:analytic_account.account:"
msgid "Analytic Accounts"
-msgstr "Cuentas Analíticas"
+msgstr "Cuentas analíticas"
msgctxt "view:analytic_account.account:"
msgid "General Information"
-msgstr "Información General"
+msgstr "Información general"
msgctxt "view:analytic_account.account:"
msgid "Notes"
@@ -402,19 +367,19 @@ msgstr "Notas"
msgctxt "view:analytic_account.line:"
msgid "Analytic Line"
-msgstr "Línea Analítica"
+msgstr "Línea analítica"
msgctxt "view:analytic_account.line:"
msgid "Analytic Lines"
-msgstr "Líneas Analíticas"
+msgstr "Líneas analíticas"
msgctxt "view:analytic_account.line:"
msgid "General Information"
-msgstr "Información General"
+msgstr "Información general"
msgctxt "view:analytic_account.open_chart.start:"
msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir Plan de Cuentas Analíticas"
+msgstr "Abrir plan de cuentas analíticas"
msgctxt "wizard_button:analytic_account.open_chart,start,end:"
msgid "Cancel"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 5971ada..cdb0cae 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,13 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
msgstr ""
-"No se puede tener muchas cuentas con la misma raíz o falta una cuenta raíz "
-"obligatoria en \"%s\"."
+"Sólo se puede seleccionar una cuenta por cada origen y raíz analítica."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -26,6 +23,46 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr "Líneas analíticas"
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Cuenta"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Origen"
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Requerido"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr "Cuenta raíz analítica"
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Activa"
@@ -118,77 +155,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Cuenta"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Selección"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Cuentas"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Cuenta"
@@ -277,19 +243,14 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr "Fecha inicial"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr "Asiento cuenta analítica"
+
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Cuenta analítica"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Cuenta analítica - Selección de cuenta analítica"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Selección de cuenta analítica"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Línea analítica"
@@ -382,6 +343,10 @@ msgctxt "view:account.move:"
msgid "Analytic"
msgstr "Analítica"
+msgctxt "view:analytic.account.entry:"
+msgid "Analytic Entry"
+msgstr "Asiento analítico"
+
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
msgstr "Cuenta analítica"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 06dbd1d..8039eed 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,13 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
-msgstr ""
-"Plusieurs comptes ont la même racine ou il manque une racine obligatoire sur"
-" « %s »."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
+msgstr "Seulement un compte est permit par racine analytique et origine."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -30,6 +26,46 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr "Lignes analytiques"
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Compte"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Origine"
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Requis"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr "Racine analytique"
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Actif"
@@ -122,77 +158,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Compte"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Date de création"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Créé par"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Sélection"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Date de mise à jour"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Mis à jour par"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Comptes"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Date de création"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Créé par"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Date de mise à jour"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Mis à jour par"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Compte"
@@ -281,19 +246,14 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr "Date de début"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr "Entrée de compte analytique"
+
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Compte analytique"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Compte analytique - Sélection compte analytique"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Sélection compte analytique"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Ligne analytique"
@@ -386,6 +346,10 @@ msgctxt "view:account.move:"
msgid "Analytic"
msgstr "Analytique"
+msgctxt "view:analytic.account.entry:"
+msgid "Analytic Entry"
+msgstr "Entrée analytique"
+
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
msgstr "Compte analytique"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 9c713e5..3efbdfa 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,10 +2,8 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
msgstr ""
msgctxt "error:analytic_account.line:"
@@ -25,6 +23,49 @@ msgid "Analytic Lines"
msgstr ""
#, fuzzy
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Rekeningen"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Vereist"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Actief"
@@ -133,82 +174,6 @@ msgid "Write User"
msgstr ""
#, fuzzy
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Rekeningen"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr ""
-
-#, fuzzy
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
-
-#, fuzzy
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Selectie"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Rekeningen"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr ""
-
-#, fuzzy
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Rekeningen"
@@ -312,17 +277,12 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr "Start datum"
-msgctxt "model:analytic_account.account,name:"
-msgid "Analytic Account"
-msgstr ""
-
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
msgstr ""
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
+msgctxt "model:analytic_account.account,name:"
+msgid "Analytic Account"
msgstr ""
msgctxt "model:analytic_account.line,name:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 4a236ec..b64bb15 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,13 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
msgstr ""
-"Нельзя использовать множество счетов с одинаковым корнем. Либо отсутствует "
-"обязательный корневой счет на \"%s\"."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -26,6 +22,55 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr "Строки аналитики"
+#, fuzzy
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Счет"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Дата создания"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Создано пользователем"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Первоисточник"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Правило оплаты"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Обязательный"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Дата изменения"
+
+#, fuzzy
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Изменено пользователем"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Действующий"
@@ -118,77 +163,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Изменено пользователем"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Счет"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Дата создания"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Создано пользователем"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Наименование"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Выбор"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Дата изменения"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Изменено пользователем"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Счета в виде дерева"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Дата создания"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Создано пользователем"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Наименование"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Дата изменения"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Изменено пользователем"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Счет"
@@ -278,19 +252,14 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr "Дата начала"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr ""
+
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Счет аналитики"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Счет аналитики - Выбор счета аналитики"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Выбор счета аналитики"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Строка аналитики"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 8578c80..0e929f0 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -2,13 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account.selection:"
-msgid ""
-"Can not have many accounts with the same root or a missing mandatory root "
-"account on \"%s\"."
-msgstr ""
-"Pri \"%s\" ni možno imeti več kontov z istim korenskim kontom ali z "
-"manjkajočim obveznim korenskim kontom."
+msgctxt "error:analytic.account.entry:"
+msgid "Only one account is allowed per analytic root and origin."
+msgstr "Dovoljen je samo en konto na analitični koren in poreklo."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
@@ -26,6 +22,46 @@ msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
msgstr "Analitične postavke"
+msgctxt "field:analytic.account.entry,account:"
+msgid "Account"
+msgstr "Konto"
+
+msgctxt "field:analytic.account.entry,create_date:"
+msgid "Create Date"
+msgstr "Izdelano"
+
+msgctxt "field:analytic.account.entry,create_uid:"
+msgid "Create User"
+msgstr "Izdelal"
+
+msgctxt "field:analytic.account.entry,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:analytic.account.entry,origin:"
+msgid "Origin"
+msgstr "Poreklo"
+
+msgctxt "field:analytic.account.entry,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:analytic.account.entry,required:"
+msgid "Required"
+msgstr "Obvezno"
+
+msgctxt "field:analytic.account.entry,root:"
+msgid "Root Analytic"
+msgstr "Koren"
+
+msgctxt "field:analytic.account.entry,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:analytic.account.entry,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Aktivno"
@@ -118,77 +154,6 @@ msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
msgstr "Zapisal"
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,account:"
-msgid "Account"
-msgstr "Konto"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Izdelano"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Izdelal"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Ime"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,selection:"
-msgid "Selection"
-msgstr "Izbor"
-
-msgctxt ""
-"field:analytic_account.account-"
-"analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Zapisano"
-
-msgctxt ""
-"field:analytic_account.account-analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Zapisal"
-
-msgctxt "field:analytic_account.account.selection,accounts:"
-msgid "Accounts"
-msgstr "Konti"
-
-msgctxt "field:analytic_account.account.selection,create_date:"
-msgid "Create Date"
-msgstr "Izdelano"
-
-msgctxt "field:analytic_account.account.selection,create_uid:"
-msgid "Create User"
-msgstr "Izdelal"
-
-msgctxt "field:analytic_account.account.selection,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:analytic_account.account.selection,rec_name:"
-msgid "Name"
-msgstr "Ime"
-
-msgctxt "field:analytic_account.account.selection,write_date:"
-msgid "Write Date"
-msgstr "Zapisano"
-
-msgctxt "field:analytic_account.account.selection,write_uid:"
-msgid "Write User"
-msgstr "Zapisal"
-
msgctxt "field:analytic_account.line,account:"
msgid "Account"
msgstr "Konto"
@@ -277,19 +242,14 @@ msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
msgstr "Začetni datum"
+msgctxt "model:analytic.account.entry,name:"
+msgid "Analytic Account Entry"
+msgstr "Vnos analitičnega konta"
+
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Analitični konto"
-msgctxt ""
-"model:analytic_account.account-analytic_account.account.selection,name:"
-msgid "Analytic Account - Analytic Account Selection"
-msgstr "Analitični konto - Izbor analitičnega konta"
-
-msgctxt "model:analytic_account.account.selection,name:"
-msgid "Analytic Account Selection"
-msgstr "Izbor analitičnega konta"
-
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
msgstr "Analitična postavka"
@@ -378,6 +338,10 @@ msgctxt "view:account.move.line:"
msgid "Analytic"
msgstr "Analitično"
+msgctxt "view:analytic.account.entry:"
+msgid "Analytic Entry"
+msgstr "Vnos analitičnih kontov"
+
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
msgstr "Analitični konto"
diff --git a/setup.py b/setup.py
index de94b06..9247167 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 setuptools import setup
import re
@@ -47,6 +47,12 @@ for dep in info.get('depends', []):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
+tests_require = [get_require_version('proteus')]
+dependency_links = []
+if minor_version % 2:
+ # Add development index for testing with proteus
+ dependency_links.append('https://trydevpi.tryton.org/')
+
setup(name=name,
version=version,
description='Tryton module for analytic accounting',
@@ -63,7 +69,7 @@ setup(name=name,
],
package_data={
'trytond.modules.analytic_account': (info.get('xml', [])
- + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -85,11 +91,14 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
],
license='GPL-3',
install_requires=requires,
+ dependency_links=dependency_links,
zip_safe=False,
entry_points="""
[trytond.modules]
@@ -97,4 +106,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ tests_require=tests_require,
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 9ed41c1..0a5d66b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# 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 .test_analytic_account import suite
diff --git a/tests/scenario_analytic_account.rst b/tests/scenario_analytic_account.rst
new file mode 100644
index 0000000..becdbc7
--- /dev/null
+++ b/tests/scenario_analytic_account.rst
@@ -0,0 +1,115 @@
+=========================
+Analytic Account Scenario
+=========================
+
+Imports::
+
+ >>> import datetime
+ >>> from dateutil.relativedelta import relativedelta
+ >>> from decimal import Decimal
+ >>> from proteus import config, Model, Wizard
+ >>> from trytond.modules.company.tests.tools import create_company, \
+ ... get_company
+ >>> from trytond.modules.account.tests.tools import create_fiscalyear, \
+ ... create_chart, get_accounts
+ >>> today = datetime.date.today()
+
+Create database::
+
+ >>> config = config.set_trytond()
+ >>> config.pool.test = True
+
+Install analytic_account::
+
+ >>> Module = Model.get('ir.module.module')
+ >>> analytic_account_module, = Module.find([
+ ... ('name', '=', 'analytic_account'),
+ ... ])
+ >>> analytic_account_module.click('install')
+ >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+
+Create company::
+
+ >>> _ = create_company()
+ >>> company = get_company()
+
+Create fiscal year::
+
+ >>> fiscalyear = create_fiscalyear(company)
+ >>> fiscalyear.click('create_period')
+ >>> period = fiscalyear.periods[0]
+
+Create chart of accounts::
+
+ >>> _ = create_chart(company)
+ >>> accounts = get_accounts(company)
+ >>> receivable = accounts['receivable']
+ >>> revenue = accounts['revenue']
+ >>> expense = accounts['expense']
+
+Create analytic accounts::
+
+ >>> AnalyticAccount = Model.get('analytic_account.account')
+ >>> root = AnalyticAccount(type='root', name='Root')
+ >>> root.save()
+ >>> analytic_account = AnalyticAccount(root=root, parent=root,
+ ... name='Analytic')
+ >>> analytic_account.save()
+
+Create parties::
+
+ >>> Party = Model.get('party.party')
+ >>> customer = Party(name='Customer')
+ >>> customer.save()
+
+Create Move analytic accounts::
+
+ >>> Journal = Model.get('account.journal')
+ >>> Move = Model.get('account.move')
+ >>> journal_revenue, = Journal.find([
+ ... ('code', '=', 'REV'),
+ ... ])
+ >>> journal_cash, = Journal.find([
+ ... ('code', '=', 'CASH'),
+ ... ])
+ >>> move = Move()
+ >>> move.period = period
+ >>> move.journal = journal_revenue
+ >>> move.date = period.start_date
+ >>> line = move.lines.new()
+ >>> line.account = revenue
+ >>> line.credit = Decimal(42)
+ >>> analytic_line = line.analytic_lines.new()
+ >>> analytic_line.journal = journal_revenue
+ >>> analytic_line.name = 'Analytic Line'
+ >>> analytic_line.credit = line.credit
+ >>> analytic_line.account = analytic_account
+ >>> line = move.lines.new()
+ >>> line.account = receivable
+ >>> line.debit = Decimal(42)
+ >>> line.party = customer
+ >>> move.click('post')
+ >>> analytic_account.reload()
+ >>> analytic_account.credit
+ Decimal('42.00')
+ >>> analytic_account.debit
+ Decimal('0.00')
+
+Cancel Move::
+
+ >>> cancel_move = Wizard('account.move.cancel', [move])
+ >>> cancel_move.form.description = 'Cancel'
+ >>> cancel_move.execute('cancel')
+ >>> move.reload()
+ >>> line, = [l for l in move.lines if l.account == receivable]
+ >>> bool(line.reconciliation)
+ True
+ >>> cancel_move, = [l.move for l in line.reconciliation.lines
+ ... if l.move != move]
+ >>> cancel_move.origin == move
+ True
+ >>> analytic_account.reload()
+ >>> analytic_account.credit
+ Decimal('42.00')
+ >>> analytic_account.debit
+ Decimal('42.00')
diff --git a/tests/test_analytic_account.py b/tests/test_analytic_account.py
index 061ea1e..7806b4f 100644
--- a/tests/test_analytic_account.py
+++ b/tests/test_analytic_account.py
@@ -1,19 +1,21 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
import unittest
import doctest
from decimal import Decimal
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
from trytond.transaction import Transaction
-class AnalyticAccountTestCase(unittest.TestCase):
+class AnalyticAccountTestCase(ModuleTestCase):
'Test AnalyticAccount module'
+ module = 'analytic_account'
def setUp(self):
- trytond.tests.test_tryton.install_module('analytic_account')
+ super(AnalyticAccountTestCase, self).setUp()
self.fiscalyear = POOL.get('account.fiscalyear')
self.journal = POOL.get('account.journal')
self.move = POOL.get('account.move')
@@ -21,14 +23,6 @@ class AnalyticAccountTestCase(unittest.TestCase):
self.analytic_account = POOL.get('analytic_account.account')
self.party = POOL.get('party.party')
- def test0005views(self):
- 'Test views'
- test_view('analytic_account')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
-
def test0010account_debit_credit(self):
'Test account debit/credit'
with Transaction().start(DB_NAME, USER,
@@ -146,4 +140,7 @@ def suite():
suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AnalyticAccountTestCase))
+ suite.addTests(doctest.DocFileSuite('scenario_analytic_account.rst',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 9d7161d..5760f68 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
account
company
diff --git a/trytond_analytic_account.egg-info/PKG-INFO b/trytond_analytic_account.egg-info/PKG-INFO
index e476e9d..6d5be70 100644
--- a/trytond_analytic_account.egg-info/PKG-INFO
+++ b/trytond_analytic_account.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-analytic-account
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for analytic accounting
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_analytic_account
========================
@@ -64,5 +64,7 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_analytic_account.egg-info/SOURCES.txt b/trytond_analytic_account.egg-info/SOURCES.txt
index 75de253..97b441f 100644
--- a/trytond_analytic_account.egg-info/SOURCES.txt
+++ b/trytond_analytic_account.egg-info/SOURCES.txt
@@ -29,11 +29,14 @@ tryton.cfg
./locale/ru_RU.po
./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_analytic_account.rst
./tests/test_analytic_account.py
./view/account_form.xml
./view/account_list.xml
./view/account_tree.xml
./view/account_tree2.xml
+./view/analytic_account_entry_form.xml
+./view/analytic_account_entry_tree.xml
./view/line_form.xml
./view/line_tree.xml
./view/move_line_form.xml
@@ -61,6 +64,8 @@ view/account_form.xml
view/account_list.xml
view/account_tree.xml
view/account_tree2.xml
+view/analytic_account_entry_form.xml
+view/analytic_account_entry_tree.xml
view/line_form.xml
view/line_tree.xml
view/move_line_form.xml
diff --git a/trytond_analytic_account.egg-info/requires.txt b/trytond_analytic_account.egg-info/requires.txt
index 908f66e..5b6ae7b 100644
--- a/trytond_analytic_account.egg-info/requires.txt
+++ b/trytond_analytic_account.egg-info/requires.txt
@@ -1,6 +1,6 @@
python-sql
-trytond_account >= 3.4, < 3.5
-trytond_company >= 3.4, < 3.5
-trytond_currency >= 3.4, < 3.5
-trytond_party >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_account >= 3.6, < 3.7
+trytond_company >= 3.6, < 3.7
+trytond_currency >= 3.6, < 3.7
+trytond_party >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
diff --git a/view/analytic_account_entry_form.xml b/view/analytic_account_entry_form.xml
new file mode 100644
index 0000000..63bdaa9
--- /dev/null
+++ b/view/analytic_account_entry_form.xml
@@ -0,0 +1,11 @@
+<?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="Analytic Entry">
+ <label name="root"/>
+ <field name="root"/>
+ <label name="account"/>
+ <field name="account"/>
+ <label name="origin"/>
+ <field name="origin"/>
+</form>
diff --git a/view/analytic_account_entry_tree.xml b/view/analytic_account_entry_tree.xml
new file mode 100644
index 0000000..e593082
--- /dev/null
+++ b/view/analytic_account_entry_tree.xml
@@ -0,0 +1,8 @@
+<?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. -->
+<tree string="Analytic Entry" editable="bottom">
+ <field name="root"/>
+ <field name="account"/>
+ <field name="origin"/>
+</tree>
--
tryton-modules-analytic-account
More information about the tryton-debian-vcs
mailing list