From ba86cd5b55f864565c0c0443e9db364f266b8866 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 5 Mar 2012 18:50:47 +0530 Subject: [PATCH 1/8] [ADD] added new configuration view of warehouse bzr revid: tpa@tinyerp.com-20120305132047-vzchsc9d5kb8z2xr --- addons/stock/__init__.py | 1 + addons/stock/__openerp__.py | 1 + addons/stock/res_config_view.xml | 74 ++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 addons/stock/res_config_view.xml diff --git a/addons/stock/__init__.py b/addons/stock/__init__.py index 0a241209593..0f1e96a9c67 100644 --- a/addons/stock/__init__.py +++ b/addons/stock/__init__.py @@ -24,5 +24,6 @@ import partner import product import report import wizard +import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 8bca2dc82f0..88ddead6645 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -81,6 +81,7 @@ Thanks to the double entry management, the inventory controlling is powerful and "report/report_stock_move_view.xml", "report/report_stock_view.xml", "board_warehouse_view.xml", + "res_config_view.xml", ], 'test': [ 'test/opening_stock.yml', diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml new file mode 100644 index 00000000000..a40e824f7a5 --- /dev/null +++ b/addons/stock/res_config_view.xml @@ -0,0 +1,74 @@ + + + + + Warehouse Application + warehouse.configuration + form + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + Configure Warehouse Application + ir.actions.act_window + warehouse.configuration + + form + form + + + + + + From 232ccfedb881e890383156485a4e0d5d3e7c0f50 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 6 Mar 2012 12:40:36 +0530 Subject: [PATCH 2/8] [ADD] aded res_config.py in stock bzr revid: tpa@tinyerp.com-20120306071036-lwa5ry0o9u4xw2n2 --- addons/stock/res_config.py | 78 ++++++++++++++++++++++++ addons/stock/res_config_view.xml | 26 ++++---- addons/stock/security/stock_security.xml | 35 +++++++++++ 3 files changed, 126 insertions(+), 13 deletions(-) create mode 100644 addons/stock/res_config.py diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py new file mode 100644 index 00000000000..c2b190bedf8 --- /dev/null +++ b/addons/stock/res_config.py @@ -0,0 +1,78 @@ +# -*- 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 +import pooler +from tools.translate import _ + +class warehouse_configuration(osv.osv_memory): + _name = 'warehouse.configuration' + _inherit = 'res.config.settings' + + _columns = { + 'module_stock_no_autopicking': fields.boolean("Allow an intermediate picking process to provide raw materials to production orders", + help="""This module allows an intermediate picking process to provide raw materials to production orders. + For example to manage production made by your + suppliers (sub-contracting). To achieve this, set the assembled product + which is sub-contracted to "No Auto-Picking" and put the location of the + supplier in the routing of the assembly operation. + It installs the stock_no_autopicking module."""), + 'module_claim_from_delivery': fields.boolean("Track claim issue from delivery ", + help="""Adds a Claim link to the delivery order. + It installs the claim_from_delivery module."""), + 'module_stock_invoice_directly': fields.boolean("Invoice picking right after delivery", + help="""This allows to automatically launch + the invoicing wizard if the delivery is to be invoiced When you send or deliver goods. + It installs the stock_invoice_directly module."""), + 'module_product_expiry': fields.boolean("Allow to manage expiry date on product ", + help="""Track different dates on products and production lots. + Following dates can be tracked: + - end of life + - best before date + - 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."""), + 'group_stock_tracking_lot':fields.boolean("Track lot of your incoming and outgoing products ",group='base.group_user', xml_id='base.group_stock_tracking_lot', + help=""" + It assigns the "Tracking lots" group to employee."""), + 'group_stock_inventory_valuation':fields.boolean("Track inventory valuation by products ",group='base.group_user', xml_id='base.group_stock_inventory_valuation', + help=""" + It assigns the "Inventory valuation" group to employee."""), + '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."""), + } + +warehouse_configuration() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml index a40e824f7a5..1e129ed2e83 100644 --- a/addons/stock/res_config_view.xml +++ b/addons/stock/res_config_view.xml @@ -9,38 +9,38 @@
- + - + - + - + - + - + - + - + - + - + - + @@ -48,9 +48,9 @@ - + - + diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index f83a5d362ab..182d2a17176 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -12,6 +12,41 @@ + + Packaging + + + + + Production Lots + + + + + Tracking lots + + + + + Inventory valuation + + + + + Counter-Part Locations + + + + + Inventory properties in partner form + + + + + UOM in warehouse + + + From 7a316408c1f16c5b61d9245b61753e8741d88f3e Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 6 Mar 2012 16:08:04 +0530 Subject: [PATCH 3/8] [IMP] apply new groups on fields bzr revid: tpa@tinyerp.com-20120306103804-ffum2zffoi3xnxl3 --- addons/stock/partner_view.xml | 2 +- addons/stock/product_view.xml | 18 +-- addons/stock/res_config_view.xml | 16 +-- addons/stock/stock_view.xml | 204 +++++++++++++++---------------- 4 files changed, 120 insertions(+), 120 deletions(-) diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml index 04cd0207dd3..ff55108a26d 100644 --- a/addons/stock/partner_view.xml +++ b/addons/stock/partner_view.xml @@ -12,7 +12,7 @@ - + diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index bded802dfe6..8cbea604b05 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -42,10 +42,10 @@ - - - - + + + + @@ -116,11 +116,11 @@ - + - - - + + + @@ -169,7 +169,7 @@ - + diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml index 1e129ed2e83..46ab77e2e3d 100644 --- a/addons/stock/res_config_view.xml +++ b/addons/stock/res_config_view.xml @@ -1,7 +1,7 @@ - + Warehouse Application warehouse.configuration form @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -30,13 +30,13 @@ - + - + @@ -46,7 +46,7 @@ - + @@ -63,12 +63,12 @@ Configure Warehouse Application ir.actions.act_window warehouse.configuration - + form form - + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 4264a488436..de1019906db 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -22,11 +22,11 @@ action="product.product_category_action_form" id="menu_product_category_config_stock" parent="stock.menu_product_in_config_stock" sequence="0"/> + parent="stock.menu_product_in_config_stock" sequence="2" groups="base.group_stock_uom"/> @@ -42,10 +42,10 @@ - - + +