diff --git a/addons/product/__init__.py b/addons/product/__init__.py index 3e2fc0c8be4..74db039ee14 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/partner_view.xml b/addons/product/partner_view.xml index 51d012b8577..f40c5ab8032 100644 --- a/addons/product/partner_view.xml +++ b/addons/product/partner_view.xml @@ -9,7 +9,7 @@ - + diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml index 3ddfe1e6900..47031878768 100644 --- a/addons/product/pricelist_view.xml +++ b/addons/product/pricelist_view.xml @@ -4,7 +4,8 @@ - + product.pricelist.version.form @@ -195,7 +196,7 @@ - + Price Types ir.actions.act_window diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 2e0b5a7d963..25ac4fecda6 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -125,11 +125,11 @@ - - + + - + @@ -257,24 +257,24 @@ tree,form,kanban form {"search_default_filter_to_sell":1} - - + + You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on. - + tree - + form - + @@ -440,7 +440,7 @@ Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category. - + @@ -552,7 +552,7 @@ - + @@ -674,11 +674,11 @@ - + - + diff --git a/addons/product/res_config.py b/addons/product/res_config.py new file mode 100644 index 00000000000..4db8af75781 --- /dev/null +++ b/addons/product/res_config.py @@ -0,0 +1,48 @@ +# -*- 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_sale_pricelist_per_customer':fields.boolean("Pricelist per Customer", + group='base.group_user', implied_group='base.group_sale_pricelist_per_customer', + help="""Allows to manage different prices based on rules per category of customers. + Example: 10% for retailers, promotion of 5 EUR on this product, etc. + It assigns the "Pricelist" group to all employees."""), + 'group_sale_uom_per_product':fields.boolean("UOM per product", + group='base.group_user', implied_group='base.group_sale_uom_per_product', + help=""" + Allows you to select and maintain different unit of measures per product. + It assigns the "UOM per product" group to all employees. + """), + '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_stock_packaging':fields.boolean("Manage packaging by products", group='base.group_user', implied_group='base.group_stock_packaging', + help=""" Allows you to create and manage your packaging dimensions and types you want to be maintained in your system. + It assigns the "Packaging" 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 e915362867d..1a622aaa35b 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -19,16 +19,33 @@ + + Sales Pricelists + + + Purchase Pricelists - - Purhase Product UOM + + Product UOM + + Packaging + + + + + + + product pricelist company rule diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml index 91fb931b6fa..63ffc6e033c 100644 --- a/addons/product/wizard/product_price_view.xml +++ b/addons/product/wizard/product_price_view.xml @@ -31,6 +31,7 @@ name="Price List" res_model="product.price_list" src_model="product.product" + groups="base.group_sale_pricelist_per_customer" view_mode="form" target="new" view_type="form" />