From 9a7462a199b5aa0704f2b809566dd1148456eec0 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Fri, 21 Nov 2014 15:15:38 +0100 Subject: [PATCH 01/27] Move account_move_template from __unported__ to root folder --- .../account_move_template => account_move_template}/AUTHORS.txt | 0 .../account_move_template => account_move_template}/__init__.py | 0 .../__openerp__.py | 0 .../account_document_template.py | 0 .../account_move_template.py | 0 .../i18n/account_move_template.pot | 0 .../account_move_template => account_move_template}/i18n/it.po | 0 .../account_move_template => account_move_template}/i18n/pt_BR.po | 0 .../move_template.xml | 0 .../security/ir.model.access.csv | 0 .../test/generate_move.yml | 0 .../wizard/__init__.py | 0 .../wizard/select_template.py | 0 .../wizard/select_template.xml | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename {__unported__/account_move_template => account_move_template}/AUTHORS.txt (100%) rename {__unported__/account_move_template => account_move_template}/__init__.py (100%) rename {__unported__/account_move_template => account_move_template}/__openerp__.py (100%) rename {__unported__/account_move_template => account_move_template}/account_document_template.py (100%) rename {__unported__/account_move_template => account_move_template}/account_move_template.py (100%) rename {__unported__/account_move_template => account_move_template}/i18n/account_move_template.pot (100%) rename {__unported__/account_move_template => account_move_template}/i18n/it.po (100%) rename {__unported__/account_move_template => account_move_template}/i18n/pt_BR.po (100%) rename {__unported__/account_move_template => account_move_template}/move_template.xml (100%) rename {__unported__/account_move_template => account_move_template}/security/ir.model.access.csv (100%) rename {__unported__/account_move_template => account_move_template}/test/generate_move.yml (100%) rename {__unported__/account_move_template => account_move_template}/wizard/__init__.py (100%) rename {__unported__/account_move_template => account_move_template}/wizard/select_template.py (100%) rename {__unported__/account_move_template => account_move_template}/wizard/select_template.xml (100%) diff --git a/__unported__/account_move_template/AUTHORS.txt b/account_move_template/AUTHORS.txt similarity index 100% rename from __unported__/account_move_template/AUTHORS.txt rename to account_move_template/AUTHORS.txt diff --git a/__unported__/account_move_template/__init__.py b/account_move_template/__init__.py similarity index 100% rename from __unported__/account_move_template/__init__.py rename to account_move_template/__init__.py diff --git a/__unported__/account_move_template/__openerp__.py b/account_move_template/__openerp__.py similarity index 100% rename from __unported__/account_move_template/__openerp__.py rename to account_move_template/__openerp__.py diff --git a/__unported__/account_move_template/account_document_template.py b/account_move_template/account_document_template.py similarity index 100% rename from __unported__/account_move_template/account_document_template.py rename to account_move_template/account_document_template.py diff --git a/__unported__/account_move_template/account_move_template.py b/account_move_template/account_move_template.py similarity index 100% rename from __unported__/account_move_template/account_move_template.py rename to account_move_template/account_move_template.py diff --git a/__unported__/account_move_template/i18n/account_move_template.pot b/account_move_template/i18n/account_move_template.pot similarity index 100% rename from __unported__/account_move_template/i18n/account_move_template.pot rename to account_move_template/i18n/account_move_template.pot diff --git a/__unported__/account_move_template/i18n/it.po b/account_move_template/i18n/it.po similarity index 100% rename from __unported__/account_move_template/i18n/it.po rename to account_move_template/i18n/it.po diff --git a/__unported__/account_move_template/i18n/pt_BR.po b/account_move_template/i18n/pt_BR.po similarity index 100% rename from __unported__/account_move_template/i18n/pt_BR.po rename to account_move_template/i18n/pt_BR.po diff --git a/__unported__/account_move_template/move_template.xml b/account_move_template/move_template.xml similarity index 100% rename from __unported__/account_move_template/move_template.xml rename to account_move_template/move_template.xml diff --git a/__unported__/account_move_template/security/ir.model.access.csv b/account_move_template/security/ir.model.access.csv similarity index 100% rename from __unported__/account_move_template/security/ir.model.access.csv rename to account_move_template/security/ir.model.access.csv diff --git a/__unported__/account_move_template/test/generate_move.yml b/account_move_template/test/generate_move.yml similarity index 100% rename from __unported__/account_move_template/test/generate_move.yml rename to account_move_template/test/generate_move.yml diff --git a/__unported__/account_move_template/wizard/__init__.py b/account_move_template/wizard/__init__.py similarity index 100% rename from __unported__/account_move_template/wizard/__init__.py rename to account_move_template/wizard/__init__.py diff --git a/__unported__/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py similarity index 100% rename from __unported__/account_move_template/wizard/select_template.py rename to account_move_template/wizard/select_template.py diff --git a/__unported__/account_move_template/wizard/select_template.xml b/account_move_template/wizard/select_template.xml similarity index 100% rename from __unported__/account_move_template/wizard/select_template.xml rename to account_move_template/wizard/select_template.xml From c90f280224ea6ce231ed8dd5e01f61a67e1f1796 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Fri, 21 Nov 2014 15:23:55 +0100 Subject: [PATCH 02/27] Move the description to README.rst --- account_move_template/README.rst | 16 ++++++++++++++++ account_move_template/__openerp__.py | 15 --------------- 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 account_move_template/README.rst diff --git a/account_move_template/README.rst b/account_move_template/README.rst new file mode 100644 index 000000000..18d0dcf0f --- /dev/null +++ b/account_move_template/README.rst @@ -0,0 +1,16 @@ +Account Move Template +===================== + +Templates for Journal Entries + +User can configure journal entries templates, useful for recurring entries. + +The amount of each template line can be computed (through python code) +or kept as user input. + +If user input, when using the template, user has to fill +the amount of every input lines. + +The journal entry form allows lo load, through a wizard, +the template to use and the amounts to fill. + diff --git a/account_move_template/__openerp__.py b/account_move_template/__openerp__.py index b60e00ab5..207a6f609 100644 --- a/account_move_template/__openerp__.py +++ b/account_move_template/__openerp__.py @@ -23,21 +23,6 @@ 'version': '0.1', 'category': 'Generic Modules/Accounting', 'summary': "Templates for recurring Journal Entries", - 'description': """ -Templates for Journal Entries - -User can configure journal entries templates, useful for recurring entries. - -The amount of each template line can be computed (through python code) -or kept as user input. - -If user input, when using the template, user has to fill -the amount of every input lines. - -The journal entry form allows lo load, through a wizard, -the template to use and the amounts to fill. - -""", 'author': 'Agile Business Group', 'website': 'http://www.agilebg.com', 'license': 'AGPL-3', From bb905acb161ece25c4b40b24130477d50e853c92 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Fri, 21 Nov 2014 15:24:58 +0100 Subject: [PATCH 03/27] Set the module installable --- account_move_template/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_move_template/__openerp__.py b/account_move_template/__openerp__.py index 207a6f609..631087eeb 100644 --- a/account_move_template/__openerp__.py +++ b/account_move_template/__openerp__.py @@ -36,5 +36,5 @@ 'test/generate_move.yml', ], 'active': False, - 'installable': False, + 'installable': True, } From bd31c7e084d68918f98ba7f2b617c7f3035b8758 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Fri, 21 Nov 2014 16:22:53 +0100 Subject: [PATCH 04/27] Adopt CamelCase for naming classes --- account_move_template/account_document_template.py | 4 ++-- account_move_template/account_move_template.py | 4 ++-- account_move_template/wizard/select_template.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py index f3eae93be..34d4ac67b 100644 --- a/account_move_template/account_document_template.py +++ b/account_move_template/account_document_template.py @@ -24,7 +24,7 @@ from openerp.tools.translate import _ import re -class account_document_template(orm.Model): +class AccountDocumentTemplate(orm.Model): _computed_lines = {} _current_template_id = 0 @@ -107,7 +107,7 @@ class account_document_template(orm.Model): return False -class account_document_template_line(orm.Model): +class AccountDocumentTemplateLine(orm.Model): _name = 'account.document.template.line' diff --git a/account_move_template/account_move_template.py b/account_move_template/account_move_template.py index e39864fff..1ac318b3a 100644 --- a/account_move_template/account_move_template.py +++ b/account_move_template/account_move_template.py @@ -22,7 +22,7 @@ from openerp.osv import fields, orm -class account_move_template(orm.Model): +class AccountMoveTemplate(orm.Model): _inherit = 'account.document.template' _name = 'account.move.template' @@ -82,7 +82,7 @@ class account_move_template(orm.Model): ] -class account_move_template_line(orm.Model): +class AccountMoveTemplateLine(orm.Model): _name = 'account.move.template.line' _inherit = 'account.document.template.line' diff --git a/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py index a074c6bfa..a311597e8 100644 --- a/account_move_template/wizard/select_template.py +++ b/account_move_template/wizard/select_template.py @@ -24,7 +24,7 @@ import time from openerp.tools.translate import _ -class wizard_select_template(orm.TransientModel): +class WizardSelectMoveTemplate(orm.TransientModel): _name = "wizard.select.move.template" _columns = { @@ -245,7 +245,7 @@ class wizard_select_template(orm.TransientModel): return id_line -class wizard_select_template_line(orm.TransientModel): +class WizardSelectMoveTemplateLine(orm.TransientModel): _description = 'Template Lines' _name = "wizard.select.move.template.line" _columns = { From 410b746aaecb009ace7f31b6d5c4d8fc3edbb338 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 3 Dec 2014 17:57:52 +0100 Subject: [PATCH 05/27] Update copyright in the header files --- account_move_template/__init__.py | 3 ++- account_move_template/__openerp__.py | 3 ++- account_move_template/account_document_template.py | 3 ++- account_move_template/account_move_template.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/account_move_template/__init__.py b/account_move_template/__init__.py index 0b6dc776b..3fd8413d7 100644 --- a/account_move_template/__init__.py +++ b/account_move_template/__init__.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (C) 2011 Agile Business Group sagl () +# Copyright (C) 2011 - 2014 Agile Business Group sagl +# () # Copyright (C) 2011 Domsense srl () # # This program is free software: you can redistribute it and/or modify diff --git a/account_move_template/__openerp__.py b/account_move_template/__openerp__.py index 631087eeb..a508ba85f 100644 --- a/account_move_template/__openerp__.py +++ b/account_move_template/__openerp__.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (C) 2011 Agile Business Group sagl () +# Copyright (C) 2011 - 2014 Agile Business Group sagl +# () # Copyright (C) 2011 Domsense srl () # # This program is free software: you can redistribute it and/or modify diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py index 34d4ac67b..4da1ec658 100644 --- a/account_move_template/account_document_template.py +++ b/account_move_template/account_document_template.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (C) 2011 Agile Business Group sagl () +# Copyright (C) 2011 - 2014 Agile Business Group sagl +# () # Copyright (C) 2011 Domsense srl () # # This program is free software: you can redistribute it and/or modify diff --git a/account_move_template/account_move_template.py b/account_move_template/account_move_template.py index 1ac318b3a..5d7a938d5 100644 --- a/account_move_template/account_move_template.py +++ b/account_move_template/account_move_template.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (C) 2011 Agile Business Group sagl () +# Copyright (C) 2011 - 2014 Agile Business Group sagl +# () # Copyright (C) 2011 Domsense srl () # # This program is free software: you can redistribute it and/or modify From b7f14ccacfc6303542960ec3b6c7ac1bac1811c8 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 3 Dec 2014 17:59:16 +0100 Subject: [PATCH 06/27] Change version --- account_move_template/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_move_template/__openerp__.py b/account_move_template/__openerp__.py index a508ba85f..4d8d681c0 100644 --- a/account_move_template/__openerp__.py +++ b/account_move_template/__openerp__.py @@ -21,7 +21,7 @@ ############################################################################## { 'name': "Account Move Template", - 'version': '0.1', + 'version': '1.0', 'category': 'Generic Modules/Accounting', 'summary': "Templates for recurring Journal Entries", 'author': 'Agile Business Group', From b1f023727e5798b7ffdc5251629cf638a8fe1465 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 3 Dec 2014 18:14:15 +0100 Subject: [PATCH 07/27] Improve README.rst --- account_move_template/AUTHORS.txt | 4 ---- account_move_template/README.rst | 24 ++++++++++++++++++------ 2 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 account_move_template/AUTHORS.txt diff --git a/account_move_template/AUTHORS.txt b/account_move_template/AUTHORS.txt deleted file mode 100644 index f12751491..000000000 --- a/account_move_template/AUTHORS.txt +++ /dev/null @@ -1,4 +0,0 @@ -Davide Corio -Lorenzo Battistini -Paolo Chiara -Franco Tampieri diff --git a/account_move_template/README.rst b/account_move_template/README.rst index 18d0dcf0f..94c9a09a5 100644 --- a/account_move_template/README.rst +++ b/account_move_template/README.rst @@ -1,10 +1,7 @@ -Account Move Template -===================== - -Templates for Journal Entries - -User can configure journal entries templates, useful for recurring entries. +Account Move Template - Templates for Journal Entries +===================================================== +The user can configure journal entries templates, useful for recurring entries. The amount of each template line can be computed (through python code) or kept as user input. @@ -14,3 +11,18 @@ the amount of every input lines. The journal entry form allows lo load, through a wizard, the template to use and the amounts to fill. +Credits +------- + +Authors: +~~~~~~~ + +* Davide Corio +* Lorenzo Battistini +* Paolo Chiara +* Franco Tampieri + +Contributors: +~~~~~~~~~~~~~ + +* Alex Comba (Port to V8) From c554160c4595d18a195e3394455f6825c1435f18 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Thu, 4 Dec 2014 09:47:50 +0100 Subject: [PATCH 08/27] Port move template to the new API --- .../account_move_template.py | 149 +++++++++--------- 1 file changed, 73 insertions(+), 76 deletions(-) diff --git a/account_move_template/account_move_template.py b/account_move_template/account_move_template.py index 5d7a938d5..803622994 100644 --- a/account_move_template/account_move_template.py +++ b/account_move_template/account_move_template.py @@ -20,99 +20,96 @@ # ############################################################################## -from openerp.osv import fields, orm +from openerp.osv import fields, orm, api +from openerp.exceptions import ValidationError class AccountMoveTemplate(orm.Model): - - _inherit = 'account.document.template' _name = 'account.move.template' + _inherit = 'account.document.template' - _columns = { - 'company_id': fields.many2one( - 'res.company', - 'Company', - required=True, - change_default=True - ), - 'template_line_ids': fields.one2many( - 'account.move.template.line', - 'template_id', - 'Template Lines' - ), - 'cross_journals': fields.boolean('Cross-Journals'), - 'transitory_acc_id': fields.many2one( - 'account.account', - 'Transitory account', - required=False - ), - } - - def _get_default(self, cr, uid, context=None): - self.pool.get('res.company')._company_default_get( - cr, uid, 'account.move.template', context=context + @api.model + def _company_get(self): + return self.env['res.company']._company_default_get( + object='account.move.template' ) - _defaults = { - 'company_id': _get_default - } - def _check_different_journal(self, cr, uid, ids, context=None): + company_id = fields.Many2one( + comodel_name='res.company', + string='Company', + required=True, + change_default=True, + default=_company_get, + ) + template_line_ids = fields.One2many( + comodel_name='account.move.template.line', + inverse_name='template_id', + string='Template Lines' + ) + cross_journals = fields.Boolean(string='Cross-Journals') + transitory_acc_id = fields.Many2one( + comodel_name='account.account', + string='Transitory account', + required=False + ) + + @api.constrains('journal_id') + def _check_different_journal(self): # Check that the journal on these lines are different/same in the case # of cross journals/single journal journal_ids = [] all_journal_ids = [] - move_template = self.pool.get('account.move.template').browse( - cr, uid, ids)[0] - if not move_template.template_line_ids: - return True - for template_line in move_template.template_line_ids: - all_journal_ids.append(template_line.journal_id.id) - if template_line.journal_id.id not in journal_ids: - journal_ids.append(template_line.journal_id.id) - if move_template.cross_journals: - return len(all_journal_ids) == len(journal_ids) - else: - return len(journal_ids) == 1 - - _constraints = [ - (_check_different_journal, - 'If the template is "cross-journals", the Journals must be different,' - 'if the template does not "cross-journals" ' - 'the Journals must be the same!', - ['journal_id']) - ] + error_message = ( + u'If the template is "cross-journals", the Journals must be ' + u'different, if the template does not "cross-journals" the ' + u'Journals must be the same!', + ) + for move_template in self: + if move_template.template_line_ids: + for template_line in move_template.template_line_ids: + all_journal_ids.append(template_line.journal_id.id) + if template_line.journal_id.id not in journal_ids: + journal_ids.append(template_line.journal_id.id) + if move_template.cross_journals: + if len(all_journal_ids) != len(journal_ids): + raise ValidationError(error_message) + elif len(journal_ids) != 1: + raise ValidationError(error_message) class AccountMoveTemplateLine(orm.Model): _name = 'account.move.template.line' _inherit = 'account.document.template.line' - _columns = { - 'journal_id': fields.many2one( - 'account.journal', - 'Journal', - required=True - ), - 'account_id': fields.many2one( - 'account.account', - 'Account', - required=True, - ondelete="cascade" - ), - 'move_line_type': fields.selection( - [('cr', 'Credit'), - ('dr', 'Debit')], - 'Move Line Type', - required=True - ), - 'analytic_account_id': fields.many2one( - 'account.analytic.account', - 'Analytic Account', - ondelete="cascade" - ), - 'template_id': fields.many2one('account.move.template', 'Template'), - 'account_tax_id': fields.many2one('account.tax', 'Tax'), - } + journal_id = fields.Many2one( + comodel_name='account.journal', + string='Journal', + required=True + ) + account_id = fields.Many2one( + comodel_name='account.account', + string='Account', + required=True, + ondelete="cascade" + ), + move_line_type = fields.Selection( + [('cr', 'Credit'), ('dr', 'Debit')], + string='Move Line Type', + required=True + ) + analytic_account_id = fields.Many2one( + comodel_name='account.analytic.account', + string='Analytic Account', + ondelete="cascade" + ) + template_id = fields.Many2one( + comodel_name='account.move.template', + string='Template' + ) + account_tax_id = fields.Many2one( + comodel_name='account.tax', + string='Tax' + ) _sql_constraints = [ ('sequence_template_uniq', 'unique (template_id,sequence)', From 60f75ea26ef6d922f52a8f257968bff1f1e7537a Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Thu, 4 Dec 2014 15:01:38 +0100 Subject: [PATCH 09/27] Port document template to the new API --- .../account_document_template.py | 79 +++++++++---------- 1 file changed, 36 insertions(+), 43 deletions(-) diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py index 4da1ec658..04cb218b4 100644 --- a/account_move_template/account_document_template.py +++ b/account_move_template/account_document_template.py @@ -20,52 +20,48 @@ # ############################################################################## -from openerp.osv import fields, orm +from openerp import models, fields, api from openerp.tools.translate import _ +from openerp import exceptions import re -class AccountDocumentTemplate(orm.Model): - - _computed_lines = {} - _current_template_id = 0 - _cr = None - _uid = None +class AccountDocumentTemplate(models.Model): _name = 'account.document.template' - _columns = { - 'name': fields.char('Name', size=64, required=True), - } + name = fields.Char(required=True) - def _input_lines(self, cr, uid, template): + @api.model + def _input_lines(self, template): count = 0 for line in template.template_line_ids: if line.type == 'input': count += 1 return count - def _get_template_line(self, cr, uid, template_id, line_number): - for line in self.browse(cr, uid, template_id).template_line_ids: + @api.model + def _get_template_line(self, template_id, line_number): + template = self.browse(template_id) + for line in template.template_line_ids: if line.sequence == line_number: return line return False - def _generate_empty_lines(self, cr, uid, template_id): + @api.model + def _generate_empty_lines(self, template_id): lines = {} - t_lines = self.browse(cr, uid, template_id).template_line_ids - for template_line in t_lines: - lines[template_line.sequence] = None + template = self.browse(template_id) + for line in template.template_line_ids: + lines[line.sequence] = None return lines + @api.model def lines(self, line_number): if self._computed_lines[line_number] is not None: return self._computed_lines[line_number] - line = self._get_template_line(self._cr, - self._uid, - self._current_template_id, - line_number) + line = self._get_template_line(self._current_template_id, line_number) if re.match(r'L\( *' + str(line_number) + r' *\)', line.python_code): - raise orm.except_orm( + raise exceptions.Warning( _('Error'), _('Line %s can\'t refer to itself') % str(line_number) ) @@ -74,32 +70,32 @@ class AccountDocumentTemplate(orm.Model): line.python_code.replace('L', 'self.lines') ) except KeyError: - raise orm.except_orm( + raise exceptions.Warning( _('Error'), _('Code "%s" refers to non existing line') % line.python_code) return self._computed_lines[line_number] - def compute_lines(self, cr, uid, template_id, input_lines): + @api.model + def compute_lines(self, template_id, input_lines): # input_lines: dictionary in the form {line_number: line_amount} # returns all the lines (included input lines) # in the form {line_number: line_amount} - template = self.browse(cr, uid, template_id) - if len(input_lines) != self._input_lines(cr, uid, template): - raise orm.except_orm( + template = self.browse(template_id) + if len(input_lines) != self._input_lines(template): + raise exceptions.Warning( _('Error'), _('Inconsistency between input lines and ' 'filled lines for template %s') % template.name ) self._current_template_id = template.id - self._cr = cr - self._uid = uid - self._computed_lines = self._generate_empty_lines(cr, uid, template_id) + self._computed_lines = self._generate_empty_lines(template_id) self._computed_lines.update(input_lines) for line_number in self._computed_lines: self.lines(line_number) return self._computed_lines - def check_zero_lines(self, cr, uid, wizard): + @api.model + def check_zero_lines(self, wizard): if not wizard.line_ids: return True for template_line in wizard.line_ids: @@ -108,17 +104,14 @@ class AccountDocumentTemplate(orm.Model): return False -class AccountDocumentTemplateLine(orm.Model): - +class AccountDocumentTemplateLine(models.Model): _name = 'account.document.template.line' - _columns = { - 'name': fields.char('Name', size=64, required=True), - 'sequence': fields.integer('Sequence', required=True), - 'type': fields.selection( - [('computed', 'Computed'), ('input', 'User input')], - 'Type', - required=True - ), - 'python_code': fields.text('Python Code'), - } + name = fields.Char(required=True) + sequence = fields.Integer(string='Sequence', required=True) + type = fields.Selection( + [('computed', 'Computed'), ('input', 'User input')], + string='Type', + required=True + ) + python_code = fields.Text(string='Python Code') From 4f5ae13e3354d9bacac497512ab9fae3c289dc89 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Thu, 4 Dec 2014 15:04:41 +0100 Subject: [PATCH 10/27] Port select template to the new API --- .../wizard/select_template.py | 297 +++++++++--------- 1 file changed, 143 insertions(+), 154 deletions(-) diff --git a/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py index a311597e8..b9c20474f 100644 --- a/account_move_template/wizard/select_template.py +++ b/account_move_template/wizard/select_template.py @@ -19,35 +19,32 @@ # ############################################################################## -from openerp.osv import fields, orm +from openerp import models, fields, api, _ +from openerp import exceptions import time -from openerp.tools.translate import _ -class WizardSelectMoveTemplate(orm.TransientModel): - +class WizardSelectMoveTemplate(models.TransientModel): _name = "wizard.select.move.template" - _columns = { - 'template_id': fields.many2one( - 'account.move.template', - 'Move Template', - required=True - ), - 'partner_id': fields.many2one('res.partner', 'Partner'), - 'line_ids': fields.one2many( - 'wizard.select.move.template.line', - 'template_id', - 'Lines' - ), - - 'state': fields.selection( - [ - ('template_selected', 'Template selected'), - ], - 'State' - ), - } + template_id = fields.Many2one( + comodel_name='account.move.template', + string='Move Template', + required=True + ) + partner_id = fields.Many2one( + comodel_name='res.partner', + string='Partner' + ) + line_ids = fields.One2many( + comodel_name='wizard.select.move.template.line', + inverse_name='template_id', + string='Lines' + ) + state = fields.Selection( + [('template_selected', 'Template selected')], + string='State' + ) def on_change_template_id(self, cr, uid, ids, template_id): res = {} @@ -65,127 +62,119 @@ class WizardSelectMoveTemplate(orm.TransientModel): }) return res - def load_lines(self, cr, uid, ids, context=None): - wizard = self.browse(cr, uid, ids, context=context)[0] - template_pool = self.pool.get('account.move.template') - wizard_line_pool = self.pool.get('wizard.select.move.template.line') - model_data_obj = self.pool.get('ir.model.data') + @api.multi + def load_lines(self): + for wizard in self: + template = self.env['account.move.template'].browse( + wizard.template_id.id) + for line in template.template_line_ids: + if line.type == 'input': + self.env['wizard.select.move.template.line'].create({ + 'template_id': wizard.id, + 'sequence': line.sequence, + 'name': line.name, + 'amount': 0.0, + 'account_id': line.account_id.id, + 'move_line_type': line.move_line_type, + }) + if not wizard.line_ids: + return self.load_template() + wizard.write({'state': 'template_selected'}) - template = template_pool.browse(cr, uid, wizard.template_id.id) - for line in template.template_line_ids: - if line.type == 'input': - wizard_line_pool.create(cr, uid, { - 'template_id': wizard.id, - 'sequence': line.sequence, - 'name': line.name, - 'amount': 0.0, - 'account_id': line.account_id.id, - 'move_line_type': line.move_line_type, - }) - if not wizard.line_ids: - return self.load_template(cr, uid, ids) - wizard.write({'state': 'template_selected'}) + view_rec = self.env['ir.model.data'].get_object_reference( + 'account_move_template', 'wizard_select_template') + view_id = view_rec and view_rec[1] or False - view_rec = model_data_obj.get_object_reference( - cr, uid, 'account_move_template', 'wizard_select_template') - view_id = view_rec and view_rec[1] or False + return { + 'view_type': 'form', + 'view_id': [view_id], + 'view_mode': 'form', + 'res_model': 'wizard.select.move.template', + 'res_id': wizard.id, + 'type': 'ir.actions.act_window', + 'target': 'new', + 'context': self.env.context, + } - return { - 'view_type': 'form', - 'view_id': [view_id], - 'view_mode': 'form', - 'res_model': 'wizard.select.move.template', - 'res_id': wizard.id, - 'type': 'ir.actions.act_window', - 'target': 'new', - 'context': context, - } - - def load_template(self, cr, uid, ids, context=None): - template_obj = self.pool.get('account.move.template') - account_period_obj = self.pool.get('account.period') - - wizard = self.browse(cr, uid, ids, context=context)[0] - if not template_obj.check_zero_lines(cr, uid, wizard): - raise orm.except_orm( - _('Error !'), - _('At least one amount has to be non-zero!') - ) - input_lines = {} - - for template_line in wizard.line_ids: - input_lines[template_line.sequence] = template_line.amount - - period_id = account_period_obj.find(cr, uid, context=context) - if not period_id: - raise orm.except_orm( - _('No period found !'), - _('Unable to find a valid period !') - ) - period_id = period_id[0] - - computed_lines = template_obj.compute_lines( - cr, uid, wizard.template_id.id, input_lines) - - moves = {} - for line in wizard.template_id.template_line_ids: - if line.journal_id.id not in moves: - moves[line.journal_id.id] = self._make_move( - cr, uid, - wizard.template_id.name, - period_id, - line.journal_id.id, - wizard.partner_id.id + @api.multi + def load_template(self): + for wizard in self: + template_model = self.env['account.move.template'] + account_period_model = self.env['account.period'] + if not template_model.check_zero_lines(wizard): + raise exceptions.Warning( + _('Error !'), + _('At least one amount has to be non-zero!') ) + input_lines = {} + for template_line in wizard.line_ids: + input_lines[template_line.sequence] = template_line.amount - self._make_move_line( - cr, uid, - line, - computed_lines, - moves[line.journal_id.id], - period_id, - wizard.partner_id.id - ) - if wizard.template_id.cross_journals: - trans_account_id = wizard.template_id.transitory_acc_id.id - self._make_transitory_move_line( - cr, - uid, + period_id = account_period_model.find() + if not period_id: + raise exceptions.Warning( + _('No period found !'), + _('Unable to find a valid period !') + ) + period_id = period_id[0] + + computed_lines = template_model.compute_lines( + wizard.template_id.id, input_lines) + + moves = {} + for line in wizard.template_id.template_line_ids: + if line.journal_id.id not in moves: + moves[line.journal_id.id] = self._make_move( + wizard.template_id.name, + period_id, + line.journal_id.id, + wizard.partner_id.id + ) + + self._make_move_line( line, computed_lines, moves[line.journal_id.id], period_id, - trans_account_id, wizard.partner_id.id ) + if wizard.template_id.cross_journals: + trans_account_id = wizard.template_id.transitory_acc_id.id + self._make_transitory_move_line( + line, + computed_lines, + moves[line.journal_id.id], + period_id, + trans_account_id, + wizard.partner_id.id + ) - return { - 'domain': "[('id','in', " + str(moves.values()) + ")]", - 'name': 'Entries', - 'view_type': 'form', - 'view_mode': 'tree,form', - 'res_model': 'account.move', - 'type': 'ir.actions.act_window', - 'target': 'current', - } + return { + 'domain': "[('id','in', " + str(moves.values()) + ")]", + 'name': 'Entries', + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'account.move', + 'type': 'ir.actions.act_window', + 'target': 'current', + } - def _make_move(self, cr, uid, ref, period_id, journal_id, partner_id): - account_move_obj = self.pool.get('account.move') - move_id = account_move_obj.create(cr, uid, { + @api.model + def _make_move(self, ref, period_id, journal_id, partner_id): + return self.env['account.move'].create({ 'ref': ref, 'period_id': period_id, 'journal_id': journal_id, 'partner_id': partner_id, }) - return move_id - def _make_move_line(self, cr, uid, line, computed_lines, + def _make_move_line(self, line, computed_lines, move_id, period_id, partner_id): - account_move_line_obj = self.pool.get('account.move.line') + account_move_line_model = self.env['account.move.line'] analytic_account_id = False if line.analytic_account_id: if not line.journal_id.analytic_journal_id: - raise orm.except_orm( + raise exceptions.Warning( _('No Analytic Journal !'), _("You have to define an analytic " "journal on the '%s' journal!") @@ -193,7 +182,7 @@ class WizardSelectMoveTemplate(orm.TransientModel): ) analytic_account_id = line.analytic_account_id.id - val = { + vals = { 'name': line.name, 'move_id': move_id, 'journal_id': line.journal_id.id, @@ -207,27 +196,27 @@ class WizardSelectMoveTemplate(orm.TransientModel): 'partner_id': partner_id, } if line.move_line_type == 'cr': - val['credit'] = computed_lines[line.sequence] + vals['credit'] = computed_lines[line.sequence] if line.move_line_type == 'dr': - val['debit'] = computed_lines[line.sequence] - id_line = account_move_line_obj.create(cr, uid, val) + vals['debit'] = computed_lines[line.sequence] + id_line = account_move_line_model.create(vals) return id_line - def _make_transitory_move_line(self, cr, uid, line, + def _make_transitory_move_line(self, line, computed_lines, move_id, period_id, trans_account_id, partner_id): - account_move_line_obj = self.pool.get('account.move.line') + account_move_line_model = self.env['account.move.line'] analytic_account_id = False if line.analytic_account_id: if not line.journal_id.analytic_journal_id: - raise orm.except_orm( + raise exceptions.Warning( _('No Analytic Journal !'), _("You have to define an analytic journal " "on the '%s' journal!") % (line.template_id.journal_id.name,) ) analytic_account_id = line.analytic_account_id.id - val = { + vals = { 'name': 'transitory', 'move_id': move_id, 'journal_id': line.journal_id.id, @@ -238,33 +227,33 @@ class WizardSelectMoveTemplate(orm.TransientModel): 'partner_id': partner_id, } if line.move_line_type != 'cr': - val['credit'] = computed_lines[line.sequence] + vals['credit'] = computed_lines[line.sequence] if line.move_line_type != 'dr': - val['debit'] = computed_lines[line.sequence] - id_line = account_move_line_obj.create(cr, uid, val) + vals['debit'] = computed_lines[line.sequence] + id_line = account_move_line_model.create(vals) return id_line -class WizardSelectMoveTemplateLine(orm.TransientModel): +class WizardSelectMoveTemplateLine(models.TransientModel): _description = 'Template Lines' _name = "wizard.select.move.template.line" - _columns = { - 'template_id': fields.many2one('wizard.select.move.template', - 'Template'), - 'sequence': fields.integer('Number', required=True), - 'name': fields.char('Name', size=64, required=True, readonly=True), - 'account_id': fields.many2one( - 'account.account', - 'Account', - required=True, - readonly=True - ), - 'move_line_type': fields.selection( - [('cr', 'Credit'), - ('dr', 'Debit')], - 'Move Line Type', - required=True, - readonly=True - ), - 'amount': fields.float('Amount', required=True), - } + + template_id = fields.Many2one( + comodel_name='wizard.select.move.template', + string='Template' + ) + sequence = fields.Integer(string='Number', required=True) + name = fields.Char(required=True, readonly=True), + account_id = fields.Many2one( + comodel_name='account.account', + string='Account', + required=True, + readonly=True + ) + move_line_type = fields.Selection( + [('cr', 'Credit'), ('dr', 'Debit')], + string='Move Line Type', + required=True, + readonly=True + ) + amount = fields.Float(required=True) From ccb11f7c945967bf2bdb034b0f74e00e64962c59 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Thu, 4 Dec 2014 15:06:50 +0100 Subject: [PATCH 11/27] Remove on_change_template_id method since it never used --- account_move_template/account_move_template.py | 8 ++++---- .../wizard/select_template.py | 18 +----------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/account_move_template/account_move_template.py b/account_move_template/account_move_template.py index 803622994..fadede710 100644 --- a/account_move_template/account_move_template.py +++ b/account_move_template/account_move_template.py @@ -20,11 +20,11 @@ # ############################################################################## -from openerp.osv import fields, orm, api +from openerp import models, fields, api from openerp.exceptions import ValidationError -class AccountMoveTemplate(orm.Model): +class AccountMoveTemplate(models.Model): _name = 'account.move.template' _inherit = 'account.document.template' @@ -77,7 +77,7 @@ class AccountMoveTemplate(orm.Model): raise ValidationError(error_message) -class AccountMoveTemplateLine(orm.Model): +class AccountMoveTemplateLine(models.Model): _name = 'account.move.template.line' _inherit = 'account.document.template.line' @@ -91,7 +91,7 @@ class AccountMoveTemplateLine(orm.Model): string='Account', required=True, ondelete="cascade" - ), + ) move_line_type = fields.Selection( [('cr', 'Credit'), ('dr', 'Debit')], string='Move Line Type', diff --git a/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py index b9c20474f..c0120f317 100644 --- a/account_move_template/wizard/select_template.py +++ b/account_move_template/wizard/select_template.py @@ -46,22 +46,6 @@ class WizardSelectMoveTemplate(models.TransientModel): string='State' ) - def on_change_template_id(self, cr, uid, ids, template_id): - res = {} - if template_id: - res['value'] = {'line_ids': []} - template_pool = self.pool.get('account.move.template') - template = template_pool.browse(cr, uid, template_id) - for line in template.template_line_ids: - if line.type == 'input': - res['value']['line_ids'].append({ - 'sequence': line.sequence, - 'name': line.name, - 'account_id': line.account_id.id, - 'move_line_type': line.move_line_type, - }) - return res - @api.multi def load_lines(self): for wizard in self: @@ -243,7 +227,7 @@ class WizardSelectMoveTemplateLine(models.TransientModel): string='Template' ) sequence = fields.Integer(string='Number', required=True) - name = fields.Char(required=True, readonly=True), + name = fields.Char(required=True, readonly=True) account_id = fields.Many2one( comodel_name='account.account', string='Account', From 2c92113ae8f643d97b9fdaa3ba3dfb99261c6bc6 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Sat, 6 Dec 2014 23:20:35 +0100 Subject: [PATCH 12/27] Add decorator api.model and get some return values aware of the new API --- account_move_template/wizard/select_template.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py index c0120f317..3d6de1cce 100644 --- a/account_move_template/wizard/select_template.py +++ b/account_move_template/wizard/select_template.py @@ -94,13 +94,12 @@ class WizardSelectMoveTemplate(models.TransientModel): for template_line in wizard.line_ids: input_lines[template_line.sequence] = template_line.amount - period_id = account_period_model.find() - if not period_id: + period = account_period_model.find() + if not period: raise exceptions.Warning( _('No period found !'), _('Unable to find a valid period !') ) - period_id = period_id[0] computed_lines = template_model.compute_lines( wizard.template_id.id, input_lines) @@ -110,7 +109,7 @@ class WizardSelectMoveTemplate(models.TransientModel): if line.journal_id.id not in moves: moves[line.journal_id.id] = self._make_move( wizard.template_id.name, - period_id, + period.id, line.journal_id.id, wizard.partner_id.id ) @@ -119,7 +118,7 @@ class WizardSelectMoveTemplate(models.TransientModel): line, computed_lines, moves[line.journal_id.id], - period_id, + period.id, wizard.partner_id.id ) if wizard.template_id.cross_journals: @@ -128,7 +127,7 @@ class WizardSelectMoveTemplate(models.TransientModel): line, computed_lines, moves[line.journal_id.id], - period_id, + period.id, trans_account_id, wizard.partner_id.id ) @@ -145,13 +144,15 @@ class WizardSelectMoveTemplate(models.TransientModel): @api.model def _make_move(self, ref, period_id, journal_id, partner_id): - return self.env['account.move'].create({ + move = self.env['account.move'].create({ 'ref': ref, 'period_id': period_id, 'journal_id': journal_id, 'partner_id': partner_id, }) + return move.id + @api.model def _make_move_line(self, line, computed_lines, move_id, period_id, partner_id): account_move_line_model = self.env['account.move.line'] @@ -186,6 +187,7 @@ class WizardSelectMoveTemplate(models.TransientModel): id_line = account_move_line_model.create(vals) return id_line + @api.model def _make_transitory_move_line(self, line, computed_lines, move_id, period_id, trans_account_id, partner_id): From 88617a2ff06745a6ce0ee31e32f43d295b1d7d3b Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Tue, 9 Dec 2014 11:43:50 +0100 Subject: [PATCH 13/27] Reduce number of import lines --- account_move_template/account_document_template.py | 4 +--- account_move_template/wizard/select_template.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py index 04cb218b4..d6424c3f3 100644 --- a/account_move_template/account_document_template.py +++ b/account_move_template/account_document_template.py @@ -20,9 +20,7 @@ # ############################################################################## -from openerp import models, fields, api -from openerp.tools.translate import _ -from openerp import exceptions +from openerp import models, fields, api, exceptions, _ import re diff --git a/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py index 3d6de1cce..c5a5df53a 100644 --- a/account_move_template/wizard/select_template.py +++ b/account_move_template/wizard/select_template.py @@ -19,8 +19,7 @@ # ############################################################################## -from openerp import models, fields, api, _ -from openerp import exceptions +from openerp import models, fields, api, exceptions, _ import time From 807d8769b7a79d3a8c4b2db3f9098aee523cf9ba Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Tue, 9 Dec 2014 14:24:43 +0100 Subject: [PATCH 14/27] Replace api.model by api.multi and avoid title from warning in document template --- account_move_template/account_document_template.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py index d6424c3f3..52e5c1480 100644 --- a/account_move_template/account_document_template.py +++ b/account_move_template/account_document_template.py @@ -37,7 +37,7 @@ class AccountDocumentTemplate(models.Model): count += 1 return count - @api.model + @api.multi def _get_template_line(self, template_id, line_number): template = self.browse(template_id) for line in template.template_line_ids: @@ -45,7 +45,7 @@ class AccountDocumentTemplate(models.Model): return line return False - @api.model + @api.multi def _generate_empty_lines(self, template_id): lines = {} template = self.browse(template_id) @@ -60,7 +60,6 @@ class AccountDocumentTemplate(models.Model): line = self._get_template_line(self._current_template_id, line_number) if re.match(r'L\( *' + str(line_number) + r' *\)', line.python_code): raise exceptions.Warning( - _('Error'), _('Line %s can\'t refer to itself') % str(line_number) ) try: From 4f827af1a1d8a792fcc4801162b6b5baeb6f6ecd Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Tue, 9 Dec 2014 14:33:50 +0100 Subject: [PATCH 15/27] Use ensure_one to avoid loop on recordset --- .../wizard/select_template.py | 158 +++++++++--------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py index c5a5df53a..11d919bd9 100644 --- a/account_move_template/wizard/select_template.py +++ b/account_move_template/wizard/select_template.py @@ -47,99 +47,99 @@ class WizardSelectMoveTemplate(models.TransientModel): @api.multi def load_lines(self): - for wizard in self: - template = self.env['account.move.template'].browse( - wizard.template_id.id) - for line in template.template_line_ids: - if line.type == 'input': - self.env['wizard.select.move.template.line'].create({ - 'template_id': wizard.id, - 'sequence': line.sequence, - 'name': line.name, - 'amount': 0.0, - 'account_id': line.account_id.id, - 'move_line_type': line.move_line_type, - }) - if not wizard.line_ids: - return self.load_template() - wizard.write({'state': 'template_selected'}) + self.ensure_one() + template = self.env['account.move.template'].browse( + self.template_id.id) + for line in template.template_line_ids: + if line.type == 'input': + self.env['wizard.select.move.template.line'].create({ + 'template_id': self.id, + 'sequence': line.sequence, + 'name': line.name, + 'amount': 0.0, + 'account_id': line.account_id.id, + 'move_line_type': line.move_line_type, + }) + if not self.line_ids: + return self.load_template() + self.write({'state': 'template_selected'}) - view_rec = self.env['ir.model.data'].get_object_reference( - 'account_move_template', 'wizard_select_template') - view_id = view_rec and view_rec[1] or False + view_rec = self.env['ir.model.data'].get_object_reference( + 'account_move_template', 'wizard_select_template') + view_id = view_rec and view_rec[1] or False - return { - 'view_type': 'form', - 'view_id': [view_id], - 'view_mode': 'form', - 'res_model': 'wizard.select.move.template', - 'res_id': wizard.id, - 'type': 'ir.actions.act_window', - 'target': 'new', - 'context': self.env.context, - } + return { + 'view_type': 'form', + 'view_id': [view_id], + 'view_mode': 'form', + 'res_model': 'wizard.select.move.template', + 'res_id': self.id, + 'type': 'ir.actions.act_window', + 'target': 'new', + 'context': self.env.context, + } @api.multi def load_template(self): - for wizard in self: - template_model = self.env['account.move.template'] - account_period_model = self.env['account.period'] - if not template_model.check_zero_lines(wizard): - raise exceptions.Warning( - _('Error !'), - _('At least one amount has to be non-zero!') - ) - input_lines = {} - for template_line in wizard.line_ids: - input_lines[template_line.sequence] = template_line.amount + self.ensure_one() + template_model = self.env['account.move.template'] + account_period_model = self.env['account.period'] + if not template_model.check_zero_lines(self): + raise exceptions.Warning( + _('Error !'), + _('At least one amount has to be non-zero!') + ) + input_lines = {} + for template_line in self.line_ids: + input_lines[template_line.sequence] = template_line.amount - period = account_period_model.find() - if not period: - raise exceptions.Warning( - _('No period found !'), - _('Unable to find a valid period !') + period = account_period_model.find() + if not period: + raise exceptions.Warning( + _('No period found !'), + _('Unable to find a valid period !') + ) + + computed_lines = template_model.compute_lines( + self.template_id.id, input_lines) + + moves = {} + for line in self.template_id.template_line_ids: + if line.journal_id.id not in moves: + moves[line.journal_id.id] = self._make_move( + self.template_id.name, + period.id, + line.journal_id.id, + self.partner_id.id ) - computed_lines = template_model.compute_lines( - wizard.template_id.id, input_lines) - - moves = {} - for line in wizard.template_id.template_line_ids: - if line.journal_id.id not in moves: - moves[line.journal_id.id] = self._make_move( - wizard.template_id.name, - period.id, - line.journal_id.id, - wizard.partner_id.id - ) - - self._make_move_line( + self._make_move_line( + line, + computed_lines, + moves[line.journal_id.id], + period.id, + self.partner_id.id + ) + if self.template_id.cross_journals: + trans_account_id = self.template_id.transitory_acc_id.id + self._make_transitory_move_line( line, computed_lines, moves[line.journal_id.id], period.id, - wizard.partner_id.id + trans_account_id, + self.partner_id.id ) - if wizard.template_id.cross_journals: - trans_account_id = wizard.template_id.transitory_acc_id.id - self._make_transitory_move_line( - line, - computed_lines, - moves[line.journal_id.id], - period.id, - trans_account_id, - wizard.partner_id.id - ) - return { - 'domain': "[('id','in', " + str(moves.values()) + ")]", - 'name': 'Entries', - 'view_type': 'form', - 'view_mode': 'tree,form', - 'res_model': 'account.move', - 'type': 'ir.actions.act_window', - 'target': 'current', - } + return { + 'domain': "[('id','in', " + str(moves.values()) + ")]", + 'name': 'Entries', + 'view_type': 'form', + 'view_mode': 'tree,form', + 'res_model': 'account.move', + 'type': 'ir.actions.act_window', + 'target': 'current', + } @api.model def _make_move(self, ref, period_id, journal_id, partner_id): From 65c765100a6ae6f52d2c260eaebd1f0b994bb2d9 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Tue, 9 Dec 2014 14:56:10 +0100 Subject: [PATCH 16/27] Avoid comma at the end of error_message --- account_move_template/account_move_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_move_template/account_move_template.py b/account_move_template/account_move_template.py index fadede710..0f26b8851 100644 --- a/account_move_template/account_move_template.py +++ b/account_move_template/account_move_template.py @@ -62,7 +62,7 @@ class AccountMoveTemplate(models.Model): error_message = ( u'If the template is "cross-journals", the Journals must be ' u'different, if the template does not "cross-journals" the ' - u'Journals must be the same!', + u'Journals must be the same!' ) for move_template in self: if move_template.template_line_ids: From c250b3071556fe45b314dc484d0105df02ca3664 Mon Sep 17 00:00:00 2001 From: Davide Corio Date: Tue, 9 Dec 2014 16:52:37 +0100 Subject: [PATCH 17/27] [FIX] fields labels --- account_move_template/__openerp__.py | 4 +- .../{ => views}/move_template.xml | 43 +++++++++++-------- 2 files changed, 28 insertions(+), 19 deletions(-) rename account_move_template/{ => views}/move_template.xml (66%) diff --git a/account_move_template/__openerp__.py b/account_move_template/__openerp__.py index 4d8d681c0..a2ad8ca31 100644 --- a/account_move_template/__openerp__.py +++ b/account_move_template/__openerp__.py @@ -29,9 +29,9 @@ 'license': 'AGPL-3', 'depends': ['account_accountant', 'analytic'], 'data': [ - 'move_template.xml', - 'wizard/select_template.xml', 'security/ir.model.access.csv', + 'views/move_template.xml', + 'wizard/select_template.xml', ], 'test': [ 'test/generate_move.yml', diff --git a/account_move_template/move_template.xml b/account_move_template/views/move_template.xml similarity index 66% rename from account_move_template/move_template.xml rename to account_move_template/views/move_template.xml index 860c81b3f..7aaf2f15f 100644 --- a/account_move_template/move_template.xml +++ b/account_move_template/views/move_template.xml @@ -20,23 +20,28 @@ - account.move.template.line.form account.move.template.line
- - - - - - - - - - -
@@ -46,11 +51,13 @@ account.move.template
- - - - - + + + + + + + @@ -87,8 +94,10 @@ tree,form + + From 3d52818bfa3fabd2568a4e88ef6ff8b20ba6c0f3 Mon Sep 17 00:00:00 2001 From: Davide Corio Date: Tue, 9 Dec 2014 17:14:07 +0100 Subject: [PATCH 18/27] [IMP] updated italian translation --- account_move_template/i18n/it.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/account_move_template/i18n/it.po b/account_move_template/i18n/it.po index 7a62261ee..90a7c4ec9 100644 --- a/account_move_template/i18n/it.po +++ b/account_move_template/i18n/it.po @@ -21,7 +21,7 @@ msgstr "" #: code:addons/account_move_template/account_document_template.py:68 #, python-format msgid "Code \"%s\" refers to non existing line" -msgstr "" +msgstr "Il codice \"%s\" fa riferimento ad una riga inesistente" #. module: account_move_template #: field:account.move.template.line,move_line_type:0 @@ -141,6 +141,8 @@ msgid "" "If the template is \"cross-journals\", the Journals must be different,if the " "template does not \"cross-journals\" the Journals must be the same!" msgstr "" +"Se il template è \"multi-sezionale\", i sezionali devono essere diversi, se " +"il template non è \"multi-sezionale\" i sezionali devono essere gli stessi!" #. module: account_move_template #: selection:account.document.template.line,type:0 @@ -166,7 +168,7 @@ msgstr "Nome" #. module: account_move_template #: field:account.move.template,cross_journals:0 msgid "Cross-Journals" -msgstr "Cross-Journals" +msgstr "Multi-sezionale" #. module: account_move_template #: field:wizard.select.move.template,line_ids:0 @@ -317,4 +319,4 @@ msgstr "Sezionale" #: code:addons/account_move_template/account_document_template.py:63 #, python-format msgid "Line %s can't refer to itself" -msgstr "" +msgstr "La riga %s non può fare riferimento a se stessa" From d39f5da247f8d9c7da269f8c9944c424bcc000b7 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Tue, 9 Dec 2014 17:50:23 +0100 Subject: [PATCH 19/27] Apply changes according to the new API and remove all title from Warning --- .../account_document_template.py | 41 ++++++------------- .../wizard/select_template.py | 27 ++++++------ 2 files changed, 27 insertions(+), 41 deletions(-) diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py index 52e5c1480..a4061b28d 100644 --- a/account_move_template/account_document_template.py +++ b/account_move_template/account_document_template.py @@ -29,27 +29,25 @@ class AccountDocumentTemplate(models.Model): name = fields.Char(required=True) - @api.model - def _input_lines(self, template): + @api.multi + def _input_lines(self): count = 0 - for line in template.template_line_ids: + for line in self.template_line_ids: if line.type == 'input': count += 1 return count @api.multi - def _get_template_line(self, template_id, line_number): - template = self.browse(template_id) - for line in template.template_line_ids: + def _get_template_line(self, line_number): + for line in self.template_line_ids: if line.sequence == line_number: return line return False @api.multi - def _generate_empty_lines(self, template_id): + def _generate_empty_lines(self): lines = {} - template = self.browse(template_id) - for line in template.template_line_ids: + for line in self.template_line_ids: lines[line.sequence] = None return lines @@ -57,7 +55,7 @@ class AccountDocumentTemplate(models.Model): def lines(self, line_number): if self._computed_lines[line_number] is not None: return self._computed_lines[line_number] - line = self._get_template_line(self._current_template_id, line_number) + line = self._get_template_line(line_number) if re.match(r'L\( *' + str(line_number) + r' *\)', line.python_code): raise exceptions.Warning( _('Line %s can\'t refer to itself') % str(line_number) @@ -68,38 +66,25 @@ class AccountDocumentTemplate(models.Model): ) except KeyError: raise exceptions.Warning( - _('Error'), _('Code "%s" refers to non existing line') % line.python_code) return self._computed_lines[line_number] - @api.model - def compute_lines(self, template_id, input_lines): + @api.multi + def compute_lines(self, input_lines): # input_lines: dictionary in the form {line_number: line_amount} # returns all the lines (included input lines) # in the form {line_number: line_amount} - template = self.browse(template_id) - if len(input_lines) != self._input_lines(template): + if len(input_lines) != self._input_lines(): raise exceptions.Warning( - _('Error'), _('Inconsistency between input lines and ' - 'filled lines for template %s') % template.name + 'filled lines for template %s') % self.name ) - self._current_template_id = template.id - self._computed_lines = self._generate_empty_lines(template_id) + self._computed_lines = self._generate_empty_lines() self._computed_lines.update(input_lines) for line_number in self._computed_lines: self.lines(line_number) return self._computed_lines - @api.model - def check_zero_lines(self, wizard): - if not wizard.line_ids: - return True - for template_line in wizard.line_ids: - if template_line.amount: - return True - return False - class AccountDocumentTemplateLine(models.Model): _name = 'account.document.template.line' diff --git a/account_move_template/wizard/select_template.py b/account_move_template/wizard/select_template.py index 11d919bd9..695d205dd 100644 --- a/account_move_template/wizard/select_template.py +++ b/account_move_template/wizard/select_template.py @@ -45,11 +45,19 @@ class WizardSelectMoveTemplate(models.TransientModel): string='State' ) + @api.multi + def check_zero_lines(self): + if not self.line_ids: + return True + for template_line in self.line_ids: + if template_line.amount: + return True + return False + @api.multi def load_lines(self): self.ensure_one() - template = self.env['account.move.template'].browse( - self.template_id.id) + template = self.template_id for line in template.template_line_ids: if line.type == 'input': self.env['wizard.select.move.template.line'].create({ @@ -62,7 +70,7 @@ class WizardSelectMoveTemplate(models.TransientModel): }) if not self.line_ids: return self.load_template() - self.write({'state': 'template_selected'}) + self.state = 'template_selected' view_rec = self.env['ir.model.data'].get_object_reference( 'account_move_template', 'wizard_select_template') @@ -82,11 +90,9 @@ class WizardSelectMoveTemplate(models.TransientModel): @api.multi def load_template(self): self.ensure_one() - template_model = self.env['account.move.template'] account_period_model = self.env['account.period'] - if not template_model.check_zero_lines(self): + if not self.check_zero_lines(): raise exceptions.Warning( - _('Error !'), _('At least one amount has to be non-zero!') ) input_lines = {} @@ -95,13 +101,9 @@ class WizardSelectMoveTemplate(models.TransientModel): period = account_period_model.find() if not period: - raise exceptions.Warning( - _('No period found !'), - _('Unable to find a valid period !') - ) + raise exceptions.Warning(_('Unable to find a valid period !')) - computed_lines = template_model.compute_lines( - self.template_id.id, input_lines) + computed_lines = self.template_id.compute_lines(input_lines) moves = {} for line in self.template_id.template_line_ids: @@ -159,7 +161,6 @@ class WizardSelectMoveTemplate(models.TransientModel): if line.analytic_account_id: if not line.journal_id.analytic_journal_id: raise exceptions.Warning( - _('No Analytic Journal !'), _("You have to define an analytic " "journal on the '%s' journal!") % (line.journal_id.name,) From 46e17b8fdd51c0a5ca0b0edecf66ef8d5f39c107 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 10 Dec 2014 09:38:17 +0100 Subject: [PATCH 20/27] Add missing ~ to README.rst --- account_move_template/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_move_template/README.rst b/account_move_template/README.rst index 94c9a09a5..e4e78c20e 100644 --- a/account_move_template/README.rst +++ b/account_move_template/README.rst @@ -15,7 +15,7 @@ Credits ------- Authors: -~~~~~~~ +~~~~~~~~ * Davide Corio * Lorenzo Battistini From c04dcf4fdaa388b587b4339cfcc7a30bd23ea5f1 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 17 Dec 2014 11:56:21 +0100 Subject: [PATCH 21/27] Avoid not safe assignment on self passing computed_lines as argument --- .../account_document_template.py | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py index a4061b28d..48c3cb04c 100644 --- a/account_move_template/account_document_template.py +++ b/account_move_template/account_document_template.py @@ -21,6 +21,7 @@ ############################################################################## from openerp import models, fields, api, exceptions, _ +from functools import partial import re @@ -51,23 +52,26 @@ class AccountDocumentTemplate(models.Model): lines[line.sequence] = None return lines - @api.model - def lines(self, line_number): - if self._computed_lines[line_number] is not None: - return self._computed_lines[line_number] + @api.multi + def lines(self, line_number, computed_lines=None): + if computed_lines is None: + computed_lines = {} + if computed_lines[line_number] is not None: + return computed_lines[line_number] line = self._get_template_line(line_number) if re.match(r'L\( *' + str(line_number) + r' *\)', line.python_code): raise exceptions.Warning( _('Line %s can\'t refer to itself') % str(line_number) ) try: - self._computed_lines[line_number] = eval( - line.python_code.replace('L', 'self.lines') + recurse_lines = partial(self.lines, computed_lines=computed_lines) + computed_lines[line_number] = eval( + line.python_code.replace('L', 'recurse_lines') ) except KeyError: raise exceptions.Warning( _('Code "%s" refers to non existing line') % line.python_code) - return self._computed_lines[line_number] + return computed_lines[line_number] @api.multi def compute_lines(self, input_lines): @@ -79,11 +83,12 @@ class AccountDocumentTemplate(models.Model): _('Inconsistency between input lines and ' 'filled lines for template %s') % self.name ) - self._computed_lines = self._generate_empty_lines() - self._computed_lines.update(input_lines) - for line_number in self._computed_lines: - self.lines(line_number) - return self._computed_lines + computed_lines = self._generate_empty_lines() + computed_lines.update(input_lines) + for line_number in computed_lines: + computed_lines[line_number] = self.lines( + line_number, computed_lines) + return computed_lines class AccountDocumentTemplateLine(models.Model): From dbe8aefe96209984620db8b7f70abf584869b82c Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 17 Dec 2014 14:14:35 +0100 Subject: [PATCH 22/27] Replace eval by safe_eval --- account_move_template/account_document_template.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/account_move_template/account_document_template.py b/account_move_template/account_document_template.py index 48c3cb04c..3b69ce090 100644 --- a/account_move_template/account_document_template.py +++ b/account_move_template/account_document_template.py @@ -21,6 +21,7 @@ ############################################################################## from openerp import models, fields, api, exceptions, _ +from openerp.tools.safe_eval import safe_eval as eval from functools import partial import re @@ -66,7 +67,8 @@ class AccountDocumentTemplate(models.Model): try: recurse_lines = partial(self.lines, computed_lines=computed_lines) computed_lines[line_number] = eval( - line.python_code.replace('L', 'recurse_lines') + line.python_code.replace('L', 'recurse_lines'), + locals_dict={'recurse_lines': recurse_lines} ) except KeyError: raise exceptions.Warning( From 085aed0ae971675899d6669b2d0915ee9abe4338 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Wed, 17 Dec 2014 14:27:15 +0100 Subject: [PATCH 23/27] Add Guewen Baconnier as contributor --- account_move_template/README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/account_move_template/README.rst b/account_move_template/README.rst index e4e78c20e..530434b70 100644 --- a/account_move_template/README.rst +++ b/account_move_template/README.rst @@ -26,3 +26,4 @@ Contributors: ~~~~~~~~~~~~~ * Alex Comba (Port to V8) +* Guewen Baconnier From 911433a3800c6a4e0c80af561051858419af4d17 Mon Sep 17 00:00:00 2001 From: Davide Corio Date: Thu, 18 Dec 2014 15:48:59 +0100 Subject: [PATCH 24/27] [IMP] translations --- .../i18n/account_move_template.pot | 431 ++++++++-------- account_move_template/i18n/it.po | 473 +++++++++--------- 2 files changed, 449 insertions(+), 455 deletions(-) diff --git a/account_move_template/i18n/account_move_template.pot b/account_move_template/i18n/account_move_template.pot index 470cf7727..2a76c0187 100644 --- a/account_move_template/i18n/account_move_template.pot +++ b/account_move_template/i18n/account_move_template.pot @@ -1,13 +1,13 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_template # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-18 17:49+0000\n" -"PO-Revision-Date: 2013-10-18 17:49+0000\n" +"POT-Creation-Date: 2014-12-18 14:44+0000\n" +"PO-Revision-Date: 2014-12-18 14:44+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,77 +16,47 @@ msgstr "" "Plural-Forms: \n" #. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:68 +#: field:account.move.template.line,account_id:0 +#: field:wizard.select.move.template.line,account_id:0 +msgid "Account" +msgstr "" + +#. module: account_move_template +#: field:wizard.select.move.template.line,amount:0 +msgid "Amount" +msgstr "" + +#. module: account_move_template +#: field:account.move.template.line,analytic_account_id:0 +msgid "Analytic Account" +msgstr "" + +#. module: account_move_template +#: code:addons/account_move_template/wizard/select_template.py:96 +#, python-format +msgid "At least one amount has to be non-zero!" +msgstr "" + +#. module: account_move_template +#: view:wizard.select.move.template:account_move_template.wizard_select_template +msgid "Cancel" +msgstr "" + +#. module: account_move_template +#: code:addons/account_move_template/account_document_template.py:75 #, python-format msgid "Code \"%s\" refers to non existing line" msgstr "" #. module: account_move_template -#: field:account.move.template.line,move_line_type:0 -#: field:wizard.select.move.template.line,move_line_type:0 -msgid "Move Line Type" +#: field:account.move.template,company_id:0 +msgid "Company" msgstr "" #. module: account_move_template -#: selection:wizard.select.move.template,state:0 -msgid "Template selected" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -#: field:wizard.select.move.template,template_id:0 -msgid "Move Template" -msgstr "" - -#. module: account_move_template -#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template -msgid "Select Move Template" -msgstr "" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_wizard_select_move_template -msgid "wizard.select.move.template" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Next" -msgstr "" - -#. module: account_move_template -#: field:wizard.select.move.template,state:0 -msgid "State" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:150 -#: code:addons/account_move_template/wizard/select_template.py:180 -#, python-format -msgid "You have to define an analytic journal on the '%s' journal!" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,template_id:0 -#: field:wizard.select.move.template.line,template_id:0 -msgid "Template" -msgstr "" - -#. module: account_move_template -#: selection:account.move.template.line,move_line_type:0 -#: selection:wizard.select.move.template.line,move_line_type:0 -msgid "Debit" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:106 -#, python-format -msgid "No period found !" -msgstr "" - -#. module: account_move_template -#: field:account.document.template.line,type:0 -#: field:account.move.template.line,type:0 -msgid "Type" +#: selection:account.document.template.line,type:0 +#: selection:account.move.template.line,type:0 +msgid "Computed" msgstr "" #. module: account_move_template @@ -96,15 +66,128 @@ msgid "Create Move from Template" msgstr "" #. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:98 -#, python-format -msgid "Error !" +#: field:account.document.template,create_uid:0 +#: field:account.document.template.line,create_uid:0 +#: field:account.move.template,create_uid:0 +#: field:account.move.template.line,create_uid:0 +#: field:wizard.select.move.template,create_uid:0 +#: field:wizard.select.move.template.line,create_uid:0 +msgid "Created by" msgstr "" #. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:106 +#: field:account.document.template,create_date:0 +#: field:account.document.template.line,create_date:0 +#: field:account.move.template,create_date:0 +#: field:account.move.template.line,create_date:0 +#: field:wizard.select.move.template,create_date:0 +#: field:wizard.select.move.template.line,create_date:0 +msgid "Created on" +msgstr "" + +#. module: account_move_template +#: selection:account.move.template.line,move_line_type:0 +#: selection:wizard.select.move.template.line,move_line_type:0 +msgid "Credit" +msgstr "" + +#. module: account_move_template +#: field:account.move.template,cross_journals:0 +msgid "Cross-Journals" +msgstr "" + +#. module: account_move_template +#: selection:account.move.template.line,move_line_type:0 +#: selection:wizard.select.move.template.line,move_line_type:0 +msgid "Debit" +msgstr "" + +#. module: account_move_template +#: field:account.document.template,id:0 +#: field:account.document.template.line,id:0 +#: field:account.move.template,id:0 +#: field:account.move.template.line,id:0 +#: field:wizard.select.move.template,id:0 +#: field:wizard.select.move.template.line,id:0 +msgid "ID" +msgstr "" + +#. module: account_move_template +#: code:addons/account_move_template/account_document_template.py:85 #, python-format -msgid "Unable to find a valid period !" +msgid "Inconsistency between input lines and filled lines for template %s" +msgstr "" + +#. module: account_move_template +#: field:account.move.template.line,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: account_move_template +#: view:account.move.template:account_move_template.view_move_template_form +#: view:account.move.template:account_move_template.view_move_template_search +#: view:account.move.template:account_move_template.view_move_template_tree +msgid "Journal Entry Template" +msgstr "" + +#. module: account_move_template +#: view:account.move.template.line:account_move_template.view_move_template_line_form +#: view:account.move.template.line:account_move_template.view_move_template_line_tree +msgid "Journal Entry Template Line" +msgstr "" + +#. module: account_move_template +#: field:account.document.template,write_uid:0 +#: field:account.document.template.line,write_uid:0 +#: field:account.move.template,write_uid:0 +#: field:account.move.template.line,write_uid:0 +#: field:wizard.select.move.template,write_uid:0 +#: field:wizard.select.move.template.line,write_uid:0 +msgid "Last Updated by" +msgstr "" + +#. module: account_move_template +#: field:account.document.template,write_date:0 +#: field:account.document.template.line,write_date:0 +#: field:account.move.template,write_date:0 +#: field:account.move.template.line,write_date:0 +#: field:wizard.select.move.template,write_date:0 +#: field:wizard.select.move.template.line,write_date:0 +msgid "Last Updated on" +msgstr "" + +#. module: account_move_template +#: code:addons/account_move_template/account_document_template.py:65 +#, python-format +msgid "Line %s can't refer to itself" +msgstr "" + +#. module: account_move_template +#: field:wizard.select.move.template,line_ids:0 +msgid "Lines" +msgstr "" + +#. module: account_move_template +#: view:wizard.select.move.template:account_move_template.wizard_select_template +msgid "Load" +msgstr "" + +#. module: account_move_template +#: field:account.move.template.line,move_line_type:0 +#: field:wizard.select.move.template.line,move_line_type:0 +msgid "Move Line Type" +msgstr "" + +#. module: account_move_template +#: view:wizard.select.move.template:account_move_template.wizard_select_template +#: field:wizard.select.move.template,template_id:0 +msgid "Move Template" +msgstr "" + +#. module: account_move_template +#: view:wizard.select.move.template.line:account_move_template.wizard_select_template_line +#: view:wizard.select.move.template.line:account_move_template.wizard_select_template_line_tree +msgid "Move Template Line" msgstr "" #. module: account_move_template @@ -113,43 +196,6 @@ msgstr "" msgid "Move Templates" msgstr "" -#. module: account_move_template -#: field:account.move.template,company_id:0 -msgid "Company" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template.line:0 -msgid "Move Template Line" -msgstr "" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_move_template -msgid "account.move.template" -msgstr "" - -#. module: account_move_template -#: field:account.move.template,transitory_acc_id:0 -msgid "Transitory account" -msgstr "" - -#. module: account_move_template -#: constraint:account.move.template:0 -msgid "If the template is \"cross-journals\", the Journals must be different,if the template does not \"cross-journals\" the Journals must be the same!" -msgstr "" - -#. module: account_move_template -#: selection:account.document.template.line,type:0 -#: selection:account.move.template.line,type:0 -msgid "User input" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,account_id:0 -#: field:wizard.select.move.template.line,account_id:0 -msgid "Account" -msgstr "" - #. module: account_move_template #: field:account.document.template,name:0 #: field:account.document.template.line,name:0 @@ -160,114 +206,36 @@ msgid "Name" msgstr "" #. module: account_move_template -#: field:account.move.template,cross_journals:0 -msgid "Cross-Journals" +#: view:wizard.select.move.template:account_move_template.wizard_select_template +msgid "Next" msgstr "" #. module: account_move_template -#: field:wizard.select.move.template,line_ids:0 -msgid "Lines" -msgstr "" - -#. module: account_move_template -#: view:account.move.template.line:0 -msgid "Journal Entry Template Line" -msgstr "" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_move_template_line -msgid "account.move.template.line" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:98 -#, python-format -msgid "At least one amount has to be non-zero!" -msgstr "" - -#. module: account_move_template -#: selection:account.move.template.line,move_line_type:0 -#: selection:wizard.select.move.template.line,move_line_type:0 -msgid "Credit" -msgstr "" - -#. module: account_move_template -#: field:wizard.select.move.template.line,amount:0 -msgid "Amount" -msgstr "" - -#. module: account_move_template -#: view:account.move.template:0 -msgid "Journal Entry Template" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:62 -#: code:addons/account_move_template/account_document_template.py:67 -#: code:addons/account_move_template/account_document_template.py:76 -#, python-format -msgid "Error" -msgstr "" - -#. module: account_move_template -#: sql_constraint:account.move.template.line:0 -msgid "The sequence of the line must be unique per template !" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Load" -msgstr "" - -#. module: account_move_template -#: view:account.move.template.line:0 -msgid "You can refer to other lines using their sequence number (e.g. 'L(1)' for first line). Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1) + L(2) + L(3)'; '1250'" -msgstr "" - -#. module: account_move_template -#: selection:account.document.template.line,type:0 -#: selection:account.move.template.line,type:0 -msgid "Computed" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:149 -#: code:addons/account_move_template/wizard/select_template.py:179 +#: code:addons/account_move_template/wizard/select_template.py:199 #, python-format msgid "No Analytic Journal !" msgstr "" -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_document_template_line -msgid "account.document.template.line" -msgstr "" - -#. module: account_move_template -#: field:account.document.template.line,python_code:0 -#: view:account.move.template.line:0 -#: field:account.move.template.line,python_code:0 -msgid "Python Code" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:77 -#, python-format -msgid "Inconsistency between input lines and filled lines for template %s" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,account_tax_id:0 -msgid "Tax" -msgstr "" - #. module: account_move_template #: field:wizard.select.move.template.line,sequence:0 msgid "Number" msgstr "" #. module: account_move_template -#: field:account.move.template.line,analytic_account_id:0 -msgid "Analytic Account" +#: field:wizard.select.move.template,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: account_move_template +#: field:account.document.template.line,python_code:0 +#: view:account.move.template.line:account_move_template.view_move_template_line_form +#: field:account.move.template.line,python_code:0 +msgid "Python Code" +msgstr "" + +#. module: account_move_template +#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template +msgid "Select Move Template" msgstr "" #. module: account_move_template @@ -276,6 +244,22 @@ msgstr "" msgid "Sequence" msgstr "" +#. module: account_move_template +#: field:wizard.select.move.template,state:0 +msgid "State" +msgstr "" + +#. module: account_move_template +#: field:account.move.template.line,account_tax_id:0 +msgid "Tax" +msgstr "" + +#. module: account_move_template +#: field:account.move.template.line,template_id:0 +#: field:wizard.select.move.template.line,template_id:0 +msgid "Template" +msgstr "" + #. module: account_move_template #: field:account.move.template,template_line_ids:0 #: model:ir.model,name:account_move_template.model_wizard_select_move_template_line @@ -283,28 +267,47 @@ msgid "Template Lines" msgstr "" #. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Cancel" +#: selection:wizard.select.move.template,state:0 +msgid "Template selected" msgstr "" #. module: account_move_template -#: field:wizard.select.move.template,partner_id:0 -msgid "Partner" +#: sql_constraint:account.move.template.line:0 +msgid "The sequence of the line must be unique per template !" msgstr "" #. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_document_template -msgid "account.document.template" +#: field:account.move.template,transitory_acc_id:0 +msgid "Transitory account" msgstr "" #. module: account_move_template -#: field:account.move.template.line,journal_id:0 -msgid "Journal" +#: field:account.document.template.line,type:0 +#: field:account.move.template.line,type:0 +msgid "Type" msgstr "" #. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:63 +#: code:addons/account_move_template/wizard/select_template.py:104 #, python-format -msgid "Line %s can't refer to itself" +msgid "Unable to find a valid period !" +msgstr "" + +#. module: account_move_template +#: selection:account.document.template.line,type:0 +#: selection:account.move.template.line,type:0 +msgid "User input" +msgstr "" + +#. module: account_move_template +#: view:account.move.template.line:account_move_template.view_move_template_line_form +msgid "You can refer to other lines using their sequence number (e.g. 'L(1)' for first line). Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1) + L(2) + L(3)'; '1250'" +msgstr "" + +#. module: account_move_template +#: code:addons/account_move_template/wizard/select_template.py:164 +#: code:addons/account_move_template/wizard/select_template.py:200 +#, python-format +msgid "You have to define an analytic journal on the '%s' journal!" msgstr "" diff --git a/account_move_template/i18n/it.po b/account_move_template/i18n/it.po index 90a7c4ec9..e0b14635a 100644 --- a/account_move_template/i18n/it.po +++ b/account_move_template/i18n/it.po @@ -1,95 +1,63 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * account_move_template # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.1\n" +"Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-18 17:49+0000\n" -"PO-Revision-Date: 2013-10-18 17:39+0000\n" -"Last-Translator: Lorenzo Battistini - Agile BG " -"\n" +"POT-Creation-Date: 2014-12-18 14:45+0000\n" +"PO-Revision-Date: 2014-12-18 14:45+0000\n" +"Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-06-12 06:31+0000\n" -"X-Generator: Launchpad (build 17041)\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" #. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:68 +#: field:account.move.template.line,account_id:0 +#: field:wizard.select.move.template.line,account_id:0 +msgid "Account" +msgstr "Conto" + +#. module: account_move_template +#: field:wizard.select.move.template.line,amount:0 +msgid "Amount" +msgstr "Importo" + +#. module: account_move_template +#: field:account.move.template.line,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Conto analitico" + +#. module: account_move_template +#: code:addons/account_move_template/wizard/select_template.py:96 +#, python-format +msgid "At least one amount has to be non-zero!" +msgstr "Almeno un importo deve essere diverso da zero!" + +#. module: account_move_template +#: view:wizard.select.move.template:account_move_template.wizard_select_template +msgid "Cancel" +msgstr "Annulla" + +#. module: account_move_template +#: code:addons/account_move_template/account_document_template.py:75 #, python-format msgid "Code \"%s\" refers to non existing line" msgstr "Il codice \"%s\" fa riferimento ad una riga inesistente" #. module: account_move_template -#: field:account.move.template.line,move_line_type:0 -#: field:wizard.select.move.template.line,move_line_type:0 -msgid "Move Line Type" -msgstr "Tipo di movimento" +#: field:account.move.template,company_id:0 +msgid "Company" +msgstr "Azienda" #. module: account_move_template -#: selection:wizard.select.move.template,state:0 -msgid "Template selected" -msgstr "Template selezionato" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -#: field:wizard.select.move.template,template_id:0 -msgid "Move Template" -msgstr "Template di registrazione" - -#. module: account_move_template -#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template -msgid "Select Move Template" -msgstr "Scegli template di registrazione" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_wizard_select_move_template -msgid "wizard.select.move.template" -msgstr "wizard.select.move.template" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Next" -msgstr "Avanti" - -#. module: account_move_template -#: field:wizard.select.move.template,state:0 -msgid "State" -msgstr "State" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:150 -#: code:addons/account_move_template/wizard/select_template.py:180 -#, python-format -msgid "You have to define an analytic journal on the '%s' journal!" -msgstr "E' necessario definire un giornale analitico sul sezionale '%s'!" - -#. module: account_move_template -#: field:account.move.template.line,template_id:0 -#: field:wizard.select.move.template.line,template_id:0 -msgid "Template" -msgstr "Template" - -#. module: account_move_template -#: selection:account.move.template.line,move_line_type:0 -#: selection:wizard.select.move.template.line,move_line_type:0 -msgid "Debit" -msgstr "Dare" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:106 -#, python-format -msgid "No period found !" -msgstr "Nessun periodo trovato!" - -#. module: account_move_template -#: field:account.document.template.line,type:0 -#: field:account.move.template.line,type:0 -msgid "Type" -msgstr "Tipo" +#: selection:account.document.template.line,type:0 +#: selection:account.move.template.line,type:0 +msgid "Computed" +msgstr "Calcolato" #. module: account_move_template #: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move @@ -98,16 +66,129 @@ msgid "Create Move from Template" msgstr "Crea registrazione da template" #. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:98 -#, python-format -msgid "Error !" -msgstr "Errore !" +#: field:account.document.template,create_uid:0 +#: field:account.document.template.line,create_uid:0 +#: field:account.move.template,create_uid:0 +#: field:account.move.template.line,create_uid:0 +#: field:wizard.select.move.template,create_uid:0 +#: field:wizard.select.move.template.line,create_uid:0 +msgid "Created by" +msgstr "Creato da" #. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:106 +#: field:account.document.template,create_date:0 +#: field:account.document.template.line,create_date:0 +#: field:account.move.template,create_date:0 +#: field:account.move.template.line,create_date:0 +#: field:wizard.select.move.template,create_date:0 +#: field:wizard.select.move.template.line,create_date:0 +msgid "Created on" +msgstr "Creato il" + +#. module: account_move_template +#: selection:account.move.template.line,move_line_type:0 +#: selection:wizard.select.move.template.line,move_line_type:0 +msgid "Credit" +msgstr "Avere" + +#. module: account_move_template +#: field:account.move.template,cross_journals:0 +msgid "Cross-Journals" +msgstr "Multi-sezionale" + +#. module: account_move_template +#: selection:account.move.template.line,move_line_type:0 +#: selection:wizard.select.move.template.line,move_line_type:0 +msgid "Debit" +msgstr "Dare" + +#. module: account_move_template +#: field:account.document.template,id:0 +#: field:account.document.template.line,id:0 +#: field:account.move.template,id:0 +#: field:account.move.template.line,id:0 +#: field:wizard.select.move.template,id:0 +#: field:wizard.select.move.template.line,id:0 +msgid "ID" +msgstr "ID" + +#. module: account_move_template +#: code:addons/account_move_template/account_document_template.py:85 #, python-format -msgid "Unable to find a valid period !" -msgstr "Impossibile trovare un periodo valido!" +msgid "Inconsistency between input lines and filled lines for template %s" +msgstr "Inconsistenza fra le righe di input previste ed inserite per il template %s" + +#. module: account_move_template +#: field:account.move.template.line,journal_id:0 +msgid "Journal" +msgstr "Sezionale" + +#. module: account_move_template +#: view:account.move.template:account_move_template.view_move_template_form +#: view:account.move.template:account_move_template.view_move_template_search +#: view:account.move.template:account_move_template.view_move_template_tree +msgid "Journal Entry Template" +msgstr "Template di registrazione contabile" + +#. module: account_move_template +#: view:account.move.template.line:account_move_template.view_move_template_line_form +#: view:account.move.template.line:account_move_template.view_move_template_line_tree +msgid "Journal Entry Template Line" +msgstr "Riga del template di registrazione" + +#. module: account_move_template +#: field:account.document.template,write_uid:0 +#: field:account.document.template.line,write_uid:0 +#: field:account.move.template,write_uid:0 +#: field:account.move.template.line,write_uid:0 +#: field:wizard.select.move.template,write_uid:0 +#: field:wizard.select.move.template.line,write_uid:0 +msgid "Last Updated by" +msgstr "Last Updated by" + +#. module: account_move_template +#: field:account.document.template,write_date:0 +#: field:account.document.template.line,write_date:0 +#: field:account.move.template,write_date:0 +#: field:account.move.template.line,write_date:0 +#: field:wizard.select.move.template,write_date:0 +#: field:wizard.select.move.template.line,write_date:0 +msgid "Last Updated on" +msgstr "Last Updated on" + +#. module: account_move_template +#: code:addons/account_move_template/account_document_template.py:65 +#, python-format +msgid "Line %s can't refer to itself" +msgstr "Line %s can't refer to itself" + +#. module: account_move_template +#: field:wizard.select.move.template,line_ids:0 +msgid "Lines" +msgstr "Righe" + +#. module: account_move_template +#: view:wizard.select.move.template:account_move_template.wizard_select_template +msgid "Load" +msgstr "Carica" + +#. module: account_move_template +#: field:account.move.template.line,move_line_type:0 +#: field:wizard.select.move.template.line,move_line_type:0 +msgid "Move Line Type" +msgstr "Tipo di movimento" + +#. module: account_move_template +#: view:wizard.select.move.template:account_move_template.wizard_select_template +#: field:wizard.select.move.template,template_id:0 +msgid "Move Template" +msgstr "Template di registrazione" + +#. module: account_move_template +#: view:wizard.select.move.template.line:account_move_template.wizard_select_template_line +#: view:wizard.select.move.template.line:account_move_template.wizard_select_template_line_tree +msgid "Move Template Line" +msgstr "Riga template di registrazione" #. module: account_move_template #: model:ir.actions.act_window,name:account_move_template.action_move_template_form @@ -115,47 +196,6 @@ msgstr "Impossibile trovare un periodo valido!" msgid "Move Templates" msgstr "Template di registrazioni" -#. module: account_move_template -#: field:account.move.template,company_id:0 -msgid "Company" -msgstr "Azienda" - -#. module: account_move_template -#: view:wizard.select.move.template.line:0 -msgid "Move Template Line" -msgstr "Riga template di registrazione" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_move_template -msgid "account.move.template" -msgstr "account.move.template" - -#. module: account_move_template -#: field:account.move.template,transitory_acc_id:0 -msgid "Transitory account" -msgstr "Transitory account" - -#. module: account_move_template -#: constraint:account.move.template:0 -msgid "" -"If the template is \"cross-journals\", the Journals must be different,if the " -"template does not \"cross-journals\" the Journals must be the same!" -msgstr "" -"Se il template è \"multi-sezionale\", i sezionali devono essere diversi, se " -"il template non è \"multi-sezionale\" i sezionali devono essere gli stessi!" - -#. module: account_move_template -#: selection:account.document.template.line,type:0 -#: selection:account.move.template.line,type:0 -msgid "User input" -msgstr "Input utente" - -#. module: account_move_template -#: field:account.move.template.line,account_id:0 -#: field:wizard.select.move.template.line,account_id:0 -msgid "Account" -msgstr "Conto" - #. module: account_move_template #: field:account.document.template,name:0 #: field:account.document.template.line,name:0 @@ -166,122 +206,37 @@ msgid "Name" msgstr "Nome" #. module: account_move_template -#: field:account.move.template,cross_journals:0 -msgid "Cross-Journals" -msgstr "Multi-sezionale" +#: view:wizard.select.move.template:account_move_template.wizard_select_template +msgid "Next" +msgstr "Avanti" #. module: account_move_template -#: field:wizard.select.move.template,line_ids:0 -msgid "Lines" -msgstr "Righe" - -#. module: account_move_template -#: view:account.move.template.line:0 -msgid "Journal Entry Template Line" -msgstr "Riga del template di registrazione" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_move_template_line -msgid "account.move.template.line" -msgstr "account.move.template.line" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:98 -#, python-format -msgid "At least one amount has to be non-zero!" -msgstr "Almeno un importo deve essere diverso da zero!" - -#. module: account_move_template -#: selection:account.move.template.line,move_line_type:0 -#: selection:wizard.select.move.template.line,move_line_type:0 -msgid "Credit" -msgstr "Avere" - -#. module: account_move_template -#: field:wizard.select.move.template.line,amount:0 -msgid "Amount" -msgstr "Importo" - -#. module: account_move_template -#: view:account.move.template:0 -msgid "Journal Entry Template" -msgstr "Template di registrazione contabile" - -#. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:62 -#: code:addons/account_move_template/account_document_template.py:67 -#: code:addons/account_move_template/account_document_template.py:76 -#, python-format -msgid "Error" -msgstr "Errore" - -#. module: account_move_template -#: sql_constraint:account.move.template.line:0 -msgid "The sequence of the line must be unique per template !" -msgstr "Il numero della riga deve essere unico per template!" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Load" -msgstr "Carica" - -#. module: account_move_template -#: view:account.move.template.line:0 -msgid "" -"You can refer to other lines using their sequence number (e.g. 'L(1)' for " -"first line). Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1) + L(2) + " -"L(3)'; '1250'" -msgstr "" -"Si può fare riferimento alle altre righe usando il loro numero di sequenza " -"(ad es. 'L(1)' per la prima riga). Esempi di codice: 'L(1) * 0.2'; 'L(2) - " -"L(1)'; 'L(1) + L(2) + L(3)'; '1250'" - -#. module: account_move_template -#: selection:account.document.template.line,type:0 -#: selection:account.move.template.line,type:0 -msgid "Computed" -msgstr "Calcolato" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:149 -#: code:addons/account_move_template/wizard/select_template.py:179 +#: code:addons/account_move_template/wizard/select_template.py:199 #, python-format msgid "No Analytic Journal !" msgstr "Nessun giornale analitico!" -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_document_template_line -msgid "account.document.template.line" -msgstr "account.document.template.line" - -#. module: account_move_template -#: field:account.document.template.line,python_code:0 -#: view:account.move.template.line:0 -#: field:account.move.template.line,python_code:0 -msgid "Python Code" -msgstr "Codice python" - -#. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:77 -#, python-format -msgid "Inconsistency between input lines and filled lines for template %s" -msgstr "" -"Inconsistenza fra le righe di input previste ed inserite per il template %s" - -#. module: account_move_template -#: field:account.move.template.line,account_tax_id:0 -msgid "Tax" -msgstr "Imposta" - #. module: account_move_template #: field:wizard.select.move.template.line,sequence:0 msgid "Number" msgstr "Numero" #. module: account_move_template -#: field:account.move.template.line,analytic_account_id:0 -msgid "Analytic Account" -msgstr "Conto analitico" +#: field:wizard.select.move.template,partner_id:0 +msgid "Partner" +msgstr "Partner" + +#. module: account_move_template +#: field:account.document.template.line,python_code:0 +#: view:account.move.template.line:account_move_template.view_move_template_line_form +#: field:account.move.template.line,python_code:0 +msgid "Python Code" +msgstr "Codice python" + +#. module: account_move_template +#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template +msgid "Select Move Template" +msgstr "Scegli template di registrazione" #. module: account_move_template #: field:account.document.template.line,sequence:0 @@ -289,6 +244,22 @@ msgstr "Conto analitico" msgid "Sequence" msgstr "Numero Sequenza" +#. module: account_move_template +#: field:wizard.select.move.template,state:0 +msgid "State" +msgstr "Stato" + +#. module: account_move_template +#: field:account.move.template.line,account_tax_id:0 +msgid "Tax" +msgstr "Imposta" + +#. module: account_move_template +#: field:account.move.template.line,template_id:0 +#: field:wizard.select.move.template.line,template_id:0 +msgid "Template" +msgstr "Template" + #. module: account_move_template #: field:account.move.template,template_line_ids:0 #: model:ir.model,name:account_move_template.model_wizard_select_move_template_line @@ -296,27 +267,47 @@ msgid "Template Lines" msgstr "Righe template" #. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Cancel" -msgstr "Annulla" +#: selection:wizard.select.move.template,state:0 +msgid "Template selected" +msgstr "Template selezionato" #. module: account_move_template -#: field:wizard.select.move.template,partner_id:0 -msgid "Partner" -msgstr "Partner" +#: sql_constraint:account.move.template.line:0 +msgid "The sequence of the line must be unique per template !" +msgstr "Il numero della riga deve essere unico per template!" #. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_document_template -msgid "account.document.template" -msgstr "account.document.template" +#: field:account.move.template,transitory_acc_id:0 +msgid "Transitory account" +msgstr "Conto transitorio" #. module: account_move_template -#: field:account.move.template.line,journal_id:0 -msgid "Journal" -msgstr "Sezionale" +#: field:account.document.template.line,type:0 +#: field:account.move.template.line,type:0 +msgid "Type" +msgstr "Tipo" #. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:63 +#: code:addons/account_move_template/wizard/select_template.py:104 #, python-format -msgid "Line %s can't refer to itself" -msgstr "La riga %s non può fare riferimento a se stessa" +msgid "Unable to find a valid period !" +msgstr "Impossibile trovare un periodo valido!" + +#. module: account_move_template +#: selection:account.document.template.line,type:0 +#: selection:account.move.template.line,type:0 +msgid "User input" +msgstr "Input utente" + +#. module: account_move_template +#: view:account.move.template.line:account_move_template.view_move_template_line_form +msgid "You can refer to other lines using their sequence number (e.g. 'L(1)' for first line). Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1) + L(2) + L(3)'; '1250'" +msgstr "Si può fare riferimento alle altre righe usando il loro numero di sequenza (ad es. 'L(1)' per la prima riga). Esempi di codice: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1) + L(2) + L(3)'; '1250'" + +#. module: account_move_template +#: code:addons/account_move_template/wizard/select_template.py:164 +#: code:addons/account_move_template/wizard/select_template.py:200 +#, python-format +msgid "You have to define an analytic journal on the '%s' journal!" +msgstr "E' necessario definire un giornale analitico sul sezionale '%s'!" + From 676284090ef4e157e7357144e8ceea2a621958c3 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Fri, 19 Dec 2014 11:57:11 +0100 Subject: [PATCH 25/27] Add missing translation --- account_move_template/i18n/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_move_template/i18n/it.po b/account_move_template/i18n/it.po index e0b14635a..55943b3a2 100644 --- a/account_move_template/i18n/it.po +++ b/account_move_template/i18n/it.po @@ -160,7 +160,7 @@ msgstr "Last Updated on" #: code:addons/account_move_template/account_document_template.py:65 #, python-format msgid "Line %s can't refer to itself" -msgstr "Line %s can't refer to itself" +msgstr "La riga %s non può fare riferimento a se stessa" #. module: account_move_template #: field:wizard.select.move.template,line_ids:0 From 14186e6de780d2e4f5e1c07775a1c7438b524ecf Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Fri, 19 Dec 2014 11:58:34 +0100 Subject: [PATCH 26/27] Rem i18n/pt_BR.po because not updated and never used --- account_move_template/i18n/pt_BR.po | 316 ---------------------------- 1 file changed, 316 deletions(-) delete mode 100644 account_move_template/i18n/pt_BR.po diff --git a/account_move_template/i18n/pt_BR.po b/account_move_template/i18n/pt_BR.po deleted file mode 100644 index 93796a033..000000000 --- a/account_move_template/i18n/pt_BR.po +++ /dev/null @@ -1,316 +0,0 @@ -# Brazilian Portuguese translation for account-financial-tools -# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 -# This file is distributed under the same license as the account-financial-tools package. -# FIRST AUTHOR , 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: account-financial-tools\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-10-18 17:49+0000\n" -"PO-Revision-Date: 2014-01-10 11:33+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Brazilian Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-06-12 06:31+0000\n" -"X-Generator: Launchpad (build 17041)\n" - -#. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:68 -#, python-format -msgid "Code \"%s\" refers to non existing line" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,move_line_type:0 -#: field:wizard.select.move.template.line,move_line_type:0 -msgid "Move Line Type" -msgstr "" - -#. module: account_move_template -#: selection:wizard.select.move.template,state:0 -msgid "Template selected" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -#: field:wizard.select.move.template,template_id:0 -msgid "Move Template" -msgstr "" - -#. module: account_move_template -#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template -msgid "Select Move Template" -msgstr "" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_wizard_select_move_template -msgid "wizard.select.move.template" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Next" -msgstr "" - -#. module: account_move_template -#: field:wizard.select.move.template,state:0 -msgid "State" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:150 -#: code:addons/account_move_template/wizard/select_template.py:180 -#, python-format -msgid "You have to define an analytic journal on the '%s' journal!" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,template_id:0 -#: field:wizard.select.move.template.line,template_id:0 -msgid "Template" -msgstr "" - -#. module: account_move_template -#: selection:account.move.template.line,move_line_type:0 -#: selection:wizard.select.move.template.line,move_line_type:0 -msgid "Debit" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:106 -#, python-format -msgid "No period found !" -msgstr "" - -#. module: account_move_template -#: field:account.document.template.line,type:0 -#: field:account.move.template.line,type:0 -msgid "Type" -msgstr "" - -#. module: account_move_template -#: model:ir.actions.act_window,name:account_move_template.action_wizard_select_template_by_move -#: model:ir.ui.menu,name:account_move_template.menu_action_wizard_select_template -msgid "Create Move from Template" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:98 -#, python-format -msgid "Error !" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:106 -#, python-format -msgid "Unable to find a valid period !" -msgstr "" - -#. module: account_move_template -#: model:ir.actions.act_window,name:account_move_template.action_move_template_form -#: model:ir.ui.menu,name:account_move_template.menu_action_move_template_form -msgid "Move Templates" -msgstr "" - -#. module: account_move_template -#: field:account.move.template,company_id:0 -msgid "Company" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template.line:0 -msgid "Move Template Line" -msgstr "" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_move_template -msgid "account.move.template" -msgstr "" - -#. module: account_move_template -#: field:account.move.template,transitory_acc_id:0 -msgid "Transitory account" -msgstr "" - -#. module: account_move_template -#: constraint:account.move.template:0 -msgid "" -"If the template is \"cross-journals\", the Journals must be different,if the " -"template does not \"cross-journals\" the Journals must be the same!" -msgstr "" - -#. module: account_move_template -#: selection:account.document.template.line,type:0 -#: selection:account.move.template.line,type:0 -msgid "User input" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,account_id:0 -#: field:wizard.select.move.template.line,account_id:0 -msgid "Account" -msgstr "" - -#. module: account_move_template -#: field:account.document.template,name:0 -#: field:account.document.template.line,name:0 -#: field:account.move.template,name:0 -#: field:account.move.template.line,name:0 -#: field:wizard.select.move.template.line,name:0 -msgid "Name" -msgstr "" - -#. module: account_move_template -#: field:account.move.template,cross_journals:0 -msgid "Cross-Journals" -msgstr "" - -#. module: account_move_template -#: field:wizard.select.move.template,line_ids:0 -msgid "Lines" -msgstr "" - -#. module: account_move_template -#: view:account.move.template.line:0 -msgid "Journal Entry Template Line" -msgstr "" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_move_template_line -msgid "account.move.template.line" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:98 -#, python-format -msgid "At least one amount has to be non-zero!" -msgstr "" - -#. module: account_move_template -#: selection:account.move.template.line,move_line_type:0 -#: selection:wizard.select.move.template.line,move_line_type:0 -msgid "Credit" -msgstr "" - -#. module: account_move_template -#: field:wizard.select.move.template.line,amount:0 -msgid "Amount" -msgstr "" - -#. module: account_move_template -#: view:account.move.template:0 -msgid "Journal Entry Template" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:62 -#: code:addons/account_move_template/account_document_template.py:67 -#: code:addons/account_move_template/account_document_template.py:76 -#, python-format -msgid "Error" -msgstr "" - -#. module: account_move_template -#: sql_constraint:account.move.template.line:0 -msgid "The sequence of the line must be unique per template !" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Load" -msgstr "" - -#. module: account_move_template -#: view:account.move.template.line:0 -msgid "" -"You can refer to other lines using their sequence number (e.g. 'L(1)' for " -"first line). Examples of code: 'L(1) * 0.2'; 'L(2) - L(1)'; 'L(1) + L(2) + " -"L(3)'; '1250'" -msgstr "" - -#. module: account_move_template -#: selection:account.document.template.line,type:0 -#: selection:account.move.template.line,type:0 -msgid "Computed" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/wizard/select_template.py:149 -#: code:addons/account_move_template/wizard/select_template.py:179 -#, python-format -msgid "No Analytic Journal !" -msgstr "" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_document_template_line -msgid "account.document.template.line" -msgstr "" - -#. module: account_move_template -#: field:account.document.template.line,python_code:0 -#: view:account.move.template.line:0 -#: field:account.move.template.line,python_code:0 -msgid "Python Code" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:77 -#, python-format -msgid "Inconsistency between input lines and filled lines for template %s" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,account_tax_id:0 -msgid "Tax" -msgstr "" - -#. module: account_move_template -#: field:wizard.select.move.template.line,sequence:0 -msgid "Number" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,analytic_account_id:0 -msgid "Analytic Account" -msgstr "" - -#. module: account_move_template -#: field:account.document.template.line,sequence:0 -#: field:account.move.template.line,sequence:0 -msgid "Sequence" -msgstr "" - -#. module: account_move_template -#: field:account.move.template,template_line_ids:0 -#: model:ir.model,name:account_move_template.model_wizard_select_move_template_line -msgid "Template Lines" -msgstr "" - -#. module: account_move_template -#: view:wizard.select.move.template:0 -msgid "Cancel" -msgstr "" - -#. module: account_move_template -#: field:wizard.select.move.template,partner_id:0 -msgid "Partner" -msgstr "" - -#. module: account_move_template -#: model:ir.model,name:account_move_template.model_account_document_template -msgid "account.document.template" -msgstr "" - -#. module: account_move_template -#: field:account.move.template.line,journal_id:0 -msgid "Journal" -msgstr "" - -#. module: account_move_template -#: code:addons/account_move_template/account_document_template.py:63 -#, python-format -msgid "Line %s can't refer to itself" -msgstr "" From a02f7b06822dae0661aed029435b633d1e8bb719 Mon Sep 17 00:00:00 2001 From: Alex Comba Date: Fri, 19 Dec 2014 15:08:34 +0100 Subject: [PATCH 27/27] Replace views by view --- account_move_template/__openerp__.py | 2 +- account_move_template/{views => view}/move_template.xml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename account_move_template/{views => view}/move_template.xml (100%) diff --git a/account_move_template/__openerp__.py b/account_move_template/__openerp__.py index a2ad8ca31..5363c2bc0 100644 --- a/account_move_template/__openerp__.py +++ b/account_move_template/__openerp__.py @@ -30,7 +30,7 @@ 'depends': ['account_accountant', 'analytic'], 'data': [ 'security/ir.model.access.csv', - 'views/move_template.xml', + 'view/move_template.xml', 'wizard/select_template.xml', ], 'test': [ diff --git a/account_move_template/views/move_template.xml b/account_move_template/view/move_template.xml similarity index 100% rename from account_move_template/views/move_template.xml rename to account_move_template/view/move_template.xml