From ae17f5752e3597d23f8827d6369d66a55de19cc6 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 30 Jan 2019 20:00:26 +0100 Subject: [PATCH] Mig product_manager_group and product_manager_group_stock to v12 Partial port of intrastat_product_type to v12 --- intrastat_product_type/__manifest__.py | 8 +++---- .../intrastat_product_type.py | 16 +++++++------- intrastat_product_type/post_install.py | 2 +- intrastat_product_type/product_view.xml | 2 +- product_manager_group/__init__.py | 22 ------------------- product_manager_group/__manifest__.py | 9 ++++---- product_manager_group_stock/__manifest__.py | 7 +++--- 7 files changed, 23 insertions(+), 43 deletions(-) diff --git a/intrastat_product_type/__manifest__.py b/intrastat_product_type/__manifest__.py index ad10637..bd50a2b 100644 --- a/intrastat_product_type/__manifest__.py +++ b/intrastat_product_type/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- -# © 2016 Akretion (http://www.akretion.com) +# Copyright 2016-2019 Akretion (http://www.akretion.com) # @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Intrastat Product Type', - 'version': '10.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Accounting', 'license': 'AGPL-3', 'summary': 'Adds a special field Intrastat Type on Products', @@ -21,7 +20,8 @@ This module has been written by Alexis de Lattre from Akretion @@ -60,14 +60,14 @@ class ProductTemplate(models.Model): return super(ProductTemplate, self).create(vals) -class L10nFrIntrastatServiceDeclaration(models.Model): - _inherit = "l10n.fr.intrastat.service.declaration" +#class L10nFrIntrastatServiceDeclaration(models.Model): +# _inherit = "l10n.fr.intrastat.service.declaration" - def _is_service(self, invoice_line): - if invoice_line.product_id.intrastat_type == 'service': - return True - else: - return False +# def _is_service(self, invoice_line): +# if invoice_line.product_id.intrastat_type == 'service': +# return True +# else: +# return False class IntrastatProductDeclaration(models.Model): diff --git a/intrastat_product_type/post_install.py b/intrastat_product_type/post_install.py index 47ca51c..bc839d8 100644 --- a/intrastat_product_type/post_install.py +++ b/intrastat_product_type/post_install.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Akretion (Alexis de Lattre ) +# Copyright 2016-2019 Akretion (Alexis de Lattre ) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). diff --git a/intrastat_product_type/product_view.xml b/intrastat_product_type/product_view.xml index e6a926d..3aa2e02 100644 --- a/intrastat_product_type/product_view.xml +++ b/intrastat_product_type/product_view.xml @@ -1,6 +1,6 @@ diff --git a/product_manager_group/__init__.py b/product_manager_group/__init__.py index fb07fc1..e69de29 100644 --- a/product_manager_group/__init__.py +++ b/product_manager_group/__init__.py @@ -1,22 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Product Manager Group 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 . -# -############################################################################## - diff --git a/product_manager_group/__manifest__.py b/product_manager_group/__manifest__.py index 1562d0e..31120a2 100644 --- a/product_manager_group/__manifest__.py +++ b/product_manager_group/__manifest__.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -# © 2014-2016 Akretion (Alexis de Lattre ) +# Copyright 2014-2019 Akretion +# @author Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Product Manager Group', - 'version': '10.0.0.1.0', + 'version': '12.0.1.0.0', 'category': 'Hidden', 'license': 'AGPL-3', 'summary': 'Add a group Product Manager', @@ -12,9 +13,9 @@ Product Manager Group ===================== -This module adds a group Product Manager. This group used to exist in older versions of OpenERP (5.0, 6.0) but was unfortunately removed in OpenERP 6.1. This group restores this group. +This module adds a group Product Manager. This group used to exist in older versions of OpenERP (5.0, 6.0) but was unfortunately removed in OpenERP 6.1. This module restores this group. -Please contact Alexis de Lattre from Akretion for any help or question about this module. +This module has been written by Alexis de Lattre from Akretion . """, 'author': 'Akretion', 'website': 'http://www.akretion.com', diff --git a/product_manager_group_stock/__manifest__.py b/product_manager_group_stock/__manifest__.py index 0ae737c..0f97fc6 100644 --- a/product_manager_group_stock/__manifest__.py +++ b/product_manager_group_stock/__manifest__.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -# © 2014-2017 Akretion (http://www.akretion.com) +# Copyright 2014-2019 Akretion (http://www.akretion.com) # @author Alexis de Lattre +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Product Manager Group Stock', - 'version': '10.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Hidden', 'license': 'AGPL-3', 'summary': 'Extend the group Product Manager to Stock', @@ -12,7 +13,7 @@ Product Manager Group Stock =========================== -Extends the group Product Manager to Stock Management. +Extends the group *Product Manager* to Stock Management. This module has been written by Alexis de Lattre from Akretion . """,