diff --git a/addons/product/__init__.py b/addons/product/__init__.py index 4247b49d41b..a7e0be09dc5 100644 --- a/addons/product/__init__.py +++ b/addons/product/__init__.py @@ -23,5 +23,6 @@ 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 new file mode 100644 index 00000000000..b12f61e5667 --- /dev/null +++ b/addons/product/res_config.py @@ -0,0 +1,37 @@ +# -*- 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_stock_packaging':fields.boolean("Manage packaging by products",group='base.group_user', xml_id='base.group_stock_packaging', + help=""" + It assigns the "Packaging" group to employee."""), + 'group_stock_uom':fields.boolean("Manage your stock counterpart by products",group='base.group_user', xml_id='base.group_stock_uom', + help=""" + It assigns the "UOM in warehouse" group to employee."""), + +} + +product_groups_configuration() \ No newline at end of file diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index 5c993b9cd61..5df18a89786 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -19,6 +19,16 @@ + + Packaging + + + + + UOM in warehouse + + + product pricelist company rule diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py index c2b190bedf8..efb27290d0a 100644 --- a/addons/stock/res_config.py +++ b/addons/stock/res_config.py @@ -50,9 +50,6 @@ class warehouse_configuration(osv.osv_memory): - removal date - alert date It installs the product_expiry module."""), - 'group_stock_packaging':fields.boolean("Manage packaging by products",group='base.group_user', xml_id='base.group_stock_packaging', - help=""" - It assigns the "Packaging" group to employee."""), 'group_stock_production_lot':fields.boolean("Track production lot",group='base.group_user', xml_id='base.group_stock_production_lot', help=""" It assigns the "Production Lots" group to employee."""), @@ -65,9 +62,6 @@ class warehouse_configuration(osv.osv_memory): 'group_stock_counterpart_location':fields.boolean("Manage your stock counterpart by products",group='base.group_user', xml_id='base.group_stock_counterpart_location', help=""" It assigns the "Counter-Part Locations" group to employee."""), - 'group_stock_uom':fields.boolean("Manage your stock counterpart by products",group='base.group_user', xml_id='base.group_stock_uom', - help=""" - It assigns the "UOM in warehouse" group to employee."""), 'group_stock_inventory_properties':fields.boolean("Define stock locations",group='base.group_user', xml_id='base.group_stock_inventory_properties', help=""". It assigns the "" group to employee."""), diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index 182d2a17176..692c72ac690 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -12,11 +12,6 @@ - - Packaging - - - Production Lots @@ -42,11 +37,6 @@ - - UOM in warehouse - - -