diff --git a/addons/product/__init__.py b/addons/product/__init__.py index a7e0be09dc5..3e2fc0c8be4 100644 --- a/addons/product/__init__.py +++ b/addons/product/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## import product @@ -23,6 +23,5 @@ import pricelist import report import partner import wizard -import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/product/res_config.py b/addons/product/res_config.py deleted file mode 100644 index 9203e8f171f..00000000000 --- a/addons/product/res_config.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# 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 osv import fields, osv - -class product_groups_configuration(osv.osv_memory): - _inherit = 'res.config.settings' - - _columns = { - 'group_purchase_pricelist_per_supplier':fields.boolean("Pricelist per Supplier",group='base.group_user', xml_id='base.group_purchase_pricelist_per_supplier', - help="""Allows to manage different prices based on rules per category of Supplier. - Example: 10% for retailers, promotion of 5 EUR on this product, etc. - It assigns the "Pricelist" group to all employees."""), - 'group_purchase_uom_per_product':fields.boolean("UOM per purchase product",group='base.group_user', xml_id='base.group_purchase_uom_per_product', - help=""" - Allows you to select and maintain different unit of measures per product. - It assigns the "UOM per purchase product" group to all employees. - """), - -} - -product_groups_configuration() \ No newline at end of file