Ujjvala Collins (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-v62_manufacturing_config-tpa into lp:openobject-addons.
Requested reviews: OpenERP Core Team (openerp) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-v62_manufacturing_config-tpa/+merge/97209 [ADD]: ------ * Added a new configuration wizard for Manufacturing application. -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-v62_manufacturing_config-tpa/+merge/97209 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-v62_manufacturing_config-tpa.
=== modified file 'mrp/__init__.py' --- mrp/__init__.py 2011-10-11 20:05:49 +0000 +++ mrp/__init__.py 2012-03-13 12:53:18 +0000 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -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 <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## @@ -26,5 +26,6 @@ import report import company import procurement +import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'mrp/__openerp__.py' --- mrp/__openerp__.py 2012-02-13 15:27:55 +0000 +++ mrp/__openerp__.py 2012-03-13 12:53:18 +0000 @@ -86,6 +86,7 @@ 'report/mrp_report_view.xml', 'report/mrp_production_order_view.xml', 'board_manufacturing_view.xml', + 'res_config_view.xml', ], @@ -94,7 +95,7 @@ ], 'test': [ 'test/order_demo.yml', - 'test/order_process.yml', + 'test/order_process.yml', 'test/cancel_order.yml', ], 'installable': True, === modified file 'mrp/mrp_view.xml' --- mrp/mrp_view.xml 2012-02-16 16:29:09 +0000 +++ mrp/mrp_view.xml 2012-03-13 12:53:18 +0000 @@ -105,15 +105,17 @@ <menuitem name="Master Bill of Materials" id="menu_mrp_property" parent="menu_mrp_configuration" - groups="base.group_extended" + groups="base.group_mrp_routings,base.group_mrp_properties" sequence="20" /> <menuitem action="mrp_property_action" id="menu_mrp_property_action" + groups="base.group_mrp_properties" parent="menu_mrp_property"/> <menuitem action="mrp_property_group_action" parent="menu_mrp_property" + groups="base.group_mrp_properties" id="menu_mrp_property_group_action"/> <!-- @@ -304,7 +306,7 @@ <field name="search_view_id" ref="mrp_routing_search_view"/> <field name="help">Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field> </record> - <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="1"/> + <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_mrp_routings" sequence="1"/> <!-- Bill of Materials @@ -323,7 +325,7 @@ <newline/> <field name="product_qty"/> <field name="product_uom"/> - <field name="routing_id" groups="base.group_extended"/> + <field name="routing_id" groups="base.group_mrp_routings"/> <newline/> <field name="product_uos_qty" groups="product.group_uos" /> <field name="product_uos" groups="product.group_uos"/> @@ -350,7 +352,7 @@ <newline/> <field name="product_qty"/> <field name="product_uom"/> - <field name="routing_id" groups="base.group_extended"/> + <field name="routing_id" groups="base.group_mrp_routings"/> <newline/> <field name="product_uos_qty" groups="product.group_uos" /> <field name="product_uos" groups="product.group_uos"/> @@ -375,7 +377,7 @@ <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}"> <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/> </page> - <page string="Properties" groups="base.group_extended"> + <page string="Properties" groups="base.group_mrp_properties"> <field name="position"/> <field name="active"/> <field name="sequence"/> @@ -395,7 +397,7 @@ <page string="Revisions" groups="base.group_extended" attrs="{'invisible': [('bom_id','!=',False)]}"> <field colspan="4" name="revision_ids" nolabel="1" widget="one2many_list"/> </page> - <page string="Properties" groups="base.group_extended"> + <page string="Properties" groups="base.group_mrp_properties"> <field name="position"/> <field name="active"/> <field name="sequence"/> @@ -455,7 +457,7 @@ <field name="product_uom"/> <field name="type"/> <field name="method" groups="base.group_extended"/> - <field name="routing_id" groups="base.group_extended"/> + <field name="routing_id" groups="base.group_mrp_routings"/> <field name="date_start" groups="base.group_extended"/> <field name="date_stop" groups="base.group_extended"/> </tree> @@ -477,7 +479,7 @@ <field name="product_uom"/> <field name="type"/> <field name="method" groups="base.group_extended"/> - <field name="routing_id" groups="base.group_extended"/> + <field name="routing_id" groups="base.group_mrp_routings"/> <field name="date_start" groups="base.group_extended"/> <field name="date_stop" groups="base.group_extended"/> </tree> @@ -575,7 +577,7 @@ <field name="product_id"/> <field name="product_qty" sum="Total Qty"/> <field name="product_uom"/> - <field name="routing_id" groups="base.group_extended"/> + <field name="routing_id" groups="base.group_mrp_routings"/> <field name="hour_total" sum="Total Hours" groups="base.group_extended"/> <field name="cycle_total" sum="Total Cycles" groups="base.group_extended"/> <field name="origin"/> @@ -649,7 +651,7 @@ <notebook colspan="4"> <page string="Consumed Products"> <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/> - <field name="routing_id" groups="base.group_extended" select="1"/> + <field name="routing_id" groups="base.group_mrp_routings" select="1"/> <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/> <field name="location_dest_id" domain="[('usage','=','internal')]"/> <separator string="" colspan="4"/> @@ -810,7 +812,7 @@ <separator orientation="vertical"/> <field name="name"/> <field name="product_id"/> - <field name="routing_id" groups="base.group_extended"/> + <field name="routing_id" groups="base.group_mrp_routings"/> <field name="origin"/> </group> <newline/> @@ -961,7 +963,7 @@ <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/> </xpath> <xpath expr="/form/notebook/page/field[@name='close_move']" position="after"> - <group colspan="4" groups="base.group_extended"> + <group colspan="4" groups="base.group_mrp_properties"> <separator colspan="4" string="Properties" /> <field colspan="4" name="property_ids" nolabel="1"/> </group> === added file 'mrp/res_config.py' --- mrp/res_config.py 1970-01-01 00:00:00 +0000 +++ mrp/res_config.py 2012-03-13 12:53:18 +0000 @@ -0,0 +1,83 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# 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 <http://www.gnu.org/licenses/>. +# +############################################################################## + +from osv import fields, osv +import pooler +from tools.translate import _ + +class mrp_configuration(osv.osv_memory): + _name = 'mrp.configuration' + _inherit = 'res.config.settings' + + _columns = { + 'module_stock_planning': fields.boolean('Track work order planning', + help =""" + This allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules. + It installs the stock_planning module. + """), + 'module_mrp_repair': fields.boolean("Track products repair", + help="""Allows to manage all products repairs. + * Add/remove products in the reparation + * Impact for stocks + * Invoicing (products and/or services) + * Warranty concept + * Repair quotation report + * Notes for the technician and for the final customer. + It installs the mrp_repair module."""), + 'module_mrp_operations': fields.boolean("Track dates in work order operations", + help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). + It installs the mrp_operations module."""), + 'module_mrp_subproduct': fields.boolean("Produce several products from one production", + help="""You can configure sub-products in the bill of material. + Without this module: + A + B + C -> D + With this module: + A + B + C -> D + E. + It installs the mrp_subproduct module."""), + 'module_stock_location' : fields.boolean("Allow push/pull flows by product", + help="""Allows to implement Push and Pull inventory flows. + Typically this could be used to: + * Manage product manufacturing chains + * Manage default locations per product + * Define routes within your warehouse according to business needs, such as: + - Quality Control + - After Sales Services + - Supplier Returns. + It installs stock_location module."""), + 'module_mrp_jit': fields.boolean("Allow the just in time scheduling", + help="""This allows Just In Time computation of procurement orders. + All procurement orders will be processed immediately, which could in some + cases entail a small performance impact. + It installs the mrp_jit module."""), + 'module_mrp_operations': fields.boolean("Track dates in work order operations", + help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). + It installs the mrp_operations module."""), + 'group_mrp_routings':fields.boolean("Manage manufacturing operations ",group='base.group_user', implied_group='base.group_mrp_routings', + help="""Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials. + It assigns the "Routings" group to employee."""), + 'group_mrp_properties':fields.boolean("Allow different properties per product in your order",group='base.group_user', implied_group='base.group_mrp_properties', + help="""Allows to define specific property that can be assigned to your bill of materials. + It assigns the "Properties of Product" group to employee."""), + } + +mrp_configuration() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file === added file 'mrp/res_config_view.xml' --- mrp/res_config_view.xml 1970-01-01 00:00:00 +0000 +++ mrp/res_config_view.xml 2012-03-13 12:53:18 +0000 @@ -0,0 +1,57 @@ +<openerp> + <data> + + <record id="view_mrp_config" model="ir.ui.view"> + <field name="name">Manufacturing Application</field> + <field name="model">mrp.configuration</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Manufacturing Application"> + <separator string="Manufacturing Order" colspan="4"/> + <group colspan="4" col="8"> + <group colspan="4" col="4"> + <field name="group_mrp_routings"/> + <newline/> + <field name="module_stock_planning"/> + <newline/> + <field name="module_mrp_repair"/> + <newline/> + </group> + <group colspan="4" col="4"> + <newline/> + <field name="module_mrp_operations"/> + <newline/> + <field name="module_mrp_subproduct"/> + <newline/> + </group> + </group> + + <separator string="Logistic" colspan="4"/> + <group colspan="4" col="4"> + <field name="module_stock_location"/> + <newline/> + <field name="module_mrp_jit"/> + <newline/> + </group> + + <separator string="Bill Of Material" colspan="4"/> + <group colspan="4" col="4"> + <field name="group_mrp_properties"/> + </group> + </form> + </field> + </record> + + <record id="action_mrp_configuration" model="ir.actions.act_window"> + <field name="name">Configure Manufacturing Application</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">mrp.configuration</field> + <field name="view_id" ref="view_mrp_config"/> + <field name="view_type">form</field> + <field name="view_mode">form</field> + </record> + + <menuitem id="base.menu_mrp_config" name="Manufacturing" parent="base.menu_config" sequence="1" action="action_mrp_configuration"/> + + </data> +</openerp> === modified file 'mrp/security/mrp_security.xml' --- mrp/security/mrp_security.xml 2011-12-19 16:54:40 +0000 +++ mrp/security/mrp_security.xml 2012-03-13 12:53:18 +0000 @@ -12,6 +12,23 @@ <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/> </record> + <record id="base.group_mrp_routings" model="res.groups"> + <field name="name">Routings</field> + <field name="category_id" ref="base.module_category_hidden"/> + </record> + + <record id="base.group_mrp_properties" model="res.groups"> + <field name="name">Properties of Product</field> + <field name="category_id" ref="base.module_category_hidden"/> + </record> + + <record id="base.group_user" model="res.groups"> + <field name="implied_ids" eval="[(6,0,[ + ref('base.group_mrp_routings'), + ref('base.group_mrp_properties'), + ])]"/> + </record> + <!-- restrict access to menu --> <record model='ir.ui.menu' id="mrp_Sched_all"> <field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
