diff --git a/account_fiscal_position_translate/__init__.py b/account_fiscal_position_translate/__init__.py deleted file mode 100644 index c930e87..0000000 --- a/account_fiscal_position_translate/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Fiscal Position Translate module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from . import account diff --git a/account_fiscal_position_translate/__manifest__.py b/account_fiscal_position_translate/__manifest__.py deleted file mode 100644 index 57a90ed..0000000 --- a/account_fiscal_position_translate/__manifest__.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Fiscal Position Translate module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - - -{ - 'name': 'Account Fiscal Position Translate', - 'version': '0.1', - 'category': 'Accounting & Finance', - 'license': 'AGPL-3', - 'summary': 'Make the Notes field on fiscal position translatable', - 'description': """ -Account Fiscal Position Translate -================================= - -Makes the Notes field on the fiscal position translatable (it was native on 7.0, but it is not on 8.0). - -Please contact Alexis de Lattre from Akretion for any help or question about this module. - """, - 'author': 'Akretion', - 'website': 'http://www.akretion.com', - 'depends': ['account'], - 'data': [], - 'installable': False, -} diff --git a/account_fiscal_position_translate/account.py b/account_fiscal_position_translate/account.py deleted file mode 100644 index 1724e5c..0000000 --- a/account_fiscal_position_translate/account.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Fiscal Position Translate module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm, fields - - -class account_fiscal_position(orm.Model): - _inherit = 'account.fiscal.position' - - _columns = { - # add translate=True - 'note': fields.text('Notes', translate=True), - } diff --git a/account_usability/account.py b/account_usability/account.py index 2d03b1e..5af82d1 100644 --- a/account_usability/account.py +++ b/account_usability/account.py @@ -203,6 +203,8 @@ class AccountBankStatementLine(models.Model): class AccountFiscalPosition(models.Model): _inherit = 'account.fiscal.position' + note = fields.Text(translate=True) + @api.model def get_fiscal_position_no_partner( self, company_id=None, vat_subjected=False, country_id=None): diff --git a/base_company_extension/__manifest__.py b/base_company_extension/__manifest__.py index 4db2e51..9c9887b 100644 --- a/base_company_extension/__manifest__.py +++ b/base_company_extension/__manifest__.py @@ -1,29 +1,11 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Base Company Extension module for Odoo -# Copyright (C) 2014-2015 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - +# © 2014-2016 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Base Company Extension', - 'version': '0.1', + 'version': '10.0.1.0.0', 'category': 'Partner', 'license': 'AGPL-3', 'summary': 'Adds capital and title on company', diff --git a/base_company_extension/company.py b/base_company_extension/company.py index 277728e..72bf3f6 100644 --- a/base_company_extension/company.py +++ b/base_company_extension/company.py @@ -1,26 +1,9 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Base Company Extension module for Odoo -# Copyright (C) 2014-2015 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# © 2014-2016 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, fields +from odoo import models, fields class ResCompany(models.Model): diff --git a/base_company_extension/company_view.xml b/base_company_extension/company_view.xml index 1e96d6a..da447c8 100644 --- a/base_company_extension/company_view.xml +++ b/base_company_extension/company_view.xml @@ -1,13 +1,11 @@ - - company.extension.form @@ -21,6 +19,4 @@ - -