pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] board_manufacturing, mrp, mrp_operations, report_mrp: menu reorganisation + changed all 'workcenter' to 'work center'

Browse Source 
bzr revid: olt@tinyerp.com-20091214145627-ql9ounrorougkgdw
This commit is contained in:
olt@tinyerp.com
2009-12-14 15:56:27 +01:00
parent dd45fa67a5
commit 1f56befb60
13 changed files with 50 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/board_manufacturing/__terp__.py
+1 -1
View File
@@ -28,7 +28,7 @@
This module creates a dashboards for Manufaturing that includes:
* List of next production orders
* List of deliveries (out packing)
* Graph of workcenter load
* Graph of work center load
* List of procurement in exception
""",
'author': 'Tiny',
addons/board_manufacturing/board_manufacturing_view.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<child2>
<action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Workcenter future load"/>
<action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
<action colspan="4" name="%(report_mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
</child2>
addons/mrp/mrp.py
+7 -7
View File
@@ -29,7 +29,7 @@ from mx import DateTime
from tools.translate import _
#----------------------------------------------------------
# Workcenters
# Work Centers
#----------------------------------------------------------
# capacity_hour : capacity per hour. default: 1.0.
# Eg: If 5 concurrent operations at one time: capacity = 5 (because 5 employees)
@@ -39,9 +39,9 @@ from tools.translate import _
#
class mrp_workcenter(osv.osv):
_name = 'mrp.workcenter'
_description = 'Workcenter'
_description = 'Work Center'
_columns = {
'name': fields.char('Workcenter Name', size=64, required=True),
'name': fields.char('Work Center Name', size=64, required=True),
'active': fields.boolean('Active'),
'type': fields.selection([('machine','Machine'),('hr','Human Resource'),('tool','Tool')], 'Type', required=True),
'code': fields.char('Code', size=16),
@@ -107,7 +107,7 @@ class mrp_routing(osv.osv):
'code': fields.char('Code', size=8),
'note': fields.text('Description'),
'workcenter_lines': fields.one2many('mrp.routing.workcenter', 'routing_id', 'Workcenters'),
'workcenter_lines': fields.one2many('mrp.routing.workcenter', 'routing_id', 'Work Centers'),
'location_id': fields.many2one('stock.location', 'Production Location',
help="Keep empty if you produce at the location where the finished products are needed." \
@@ -124,7 +124,7 @@ class mrp_routing_workcenter(osv.osv):
_name = 'mrp.routing.workcenter'
_description = 'Routing workcenter usage'
_columns = {
'workcenter_id': fields.many2one('mrp.workcenter', 'Workcenter', required=True),
'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
'name': fields.char('Name', size=64, required=True),
'sequence': fields.integer('Sequence'),
'cycle_nbr': fields.float('Number of Cycle', required=True,
@@ -437,7 +437,7 @@ class mrp_production(osv.osv):
'move_created_ids': fields.one2many('stock.move', 'production_id', 'Moves Created'),
'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Packing Exception\'.\
\nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
@@ -757,7 +757,7 @@ class mrp_production_workcenter_line(osv.osv):
_order = 'sequence'
_columns = {
'name': fields.char('Work Order', size=64, required=True),
'workcenter_id': fields.many2one('mrp.workcenter', 'Workcenter', required=True),
'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
'cycle': fields.float('Nbr of cycle', digits=(16,2)),
'hour': fields.float('Nbr of hour', digits=(16,2)),
'sequence': fields.integer('Sequence', required=True),
addons/mrp/mrp_view.xml
+24 -35
View File
@@ -35,15 +35,6 @@
parent="menu_mrp_root"
groups="group_mrp_manager"
sequence="-50" />
<menuitem
id="menu_mrp_property_group_action_prop"
name="Properties"
parent="menu_mrp_configuration"
groups="base.group_extended"/>
<menuitem
action="mrp_property_group_action"
id="menu_mrp_property_group_action"
parent="menu_mrp_property_group_action_prop"/>
<record id="mrp_property_tree_view" model="ir.ui.view">
<field name="name">mrp.property.tree</field>
@@ -82,10 +73,15 @@
<menuitem
action="mrp_property_action"
id="menu_mrp_property_action"
parent="menu_mrp_property_group_action_prop"/>
parent="menu_mrp_configuration"
groups="base.group_extended"
sequence="10" />
<menuitem
action="mrp_property_group_action"
id="menu_mrp_property_group_action"
parent="menu_mrp_property_action"/>
<!--
Workcenters
Work Centers
-->
<record id="mrp_workcenter_tree_view" model="ir.ui.view">
@@ -93,7 +89,7 @@
<field name="model">mrp.workcenter</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workcenter">
<tree string="Work Center">
<field name="code"/>
<field name="name"/>
</tree>
@@ -104,7 +100,7 @@
<field name="model">mrp.workcenter</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workcenter">
<form string="Work Center">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="code" select="1"/>
@@ -112,7 +108,7 @@
<field name="company_id" select="1" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="Workcenter">
<page string="Work Center">
<field name="type"/>
<field name="timesheet_id"/>
<separator colspan="4" string="Description"/>
@@ -140,13 +136,12 @@
</field>
</record>
<record id="mrp_workcenter_action" model="ir.actions.act_window">
<field name="name">Workcenters</field>
<field name="name">Work Centers</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.workcenter</field>
<field name="view_type">form</field>
<field name="view_id" ref="mrp_workcenter_tree_view"/>
</record>
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_configuration" groups="base.group_extended" />
<!--
Routings
@@ -157,7 +152,7 @@
<field name="model">mrp.routing.workcenter</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Routing Workcenters">
<tree string="Routing Work Centers">
<field name="sequence"/>
<field name="workcenter_id" select="1"/>
<field name="cycle_nbr"/>
@@ -171,7 +166,7 @@
<field name="model">mrp.routing.workcenter</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Routing Workcenters">
<form string="Routing Work Centers">
<separator colspan="4" string="General Information"/>
<field colspan="4" name="name" select="1"/>
<field name="sequence" select="1"/>
@@ -196,7 +191,7 @@
<field name="location_id"/>
<separator colspan="4" string="Description"/>
<field colspan="4" name="note" nolabel="1"/>
<separator colspan="4" string="Workcenter Operations"/>
<separator colspan="4" string="Work Center Operations"/>
<field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
</form>
</field>
@@ -220,7 +215,10 @@
<field name="view_type">form</field>
<field name="view_id" ref="mrp_routing_tree_view"/>
</record>
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_configuration" groups="base.group_extended"/>
<menuitem name="Routings &amp; Work Centers" id="menu_mrp_routing_and_workcenters" parent="menu_mrp_configuration" groups="base.group_extended"
sequence="100" />
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_routing_and_workcenters" groups="base.group_extended" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_routing_and_workcenters" groups="base.group_extended"/>
<!--
Bill of Materials
@@ -297,17 +295,8 @@
<field name="domain">[('bom_id','=',False)]</field>
<field name="view_id" ref="mrp_bom_tree_view"/>
</record>
<menuitem action="mrp_bom_form_action" id="menu_mrp_bom_form_action" parent="menu_mrp_configuration"/>
<record id="mrp_bom_tree_action" model="ir.actions.act_window">
<field name="name">Bill of Material Structure</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.bom</field>
<field name="view_type">tree</field>
<field name="domain">[('bom_id','=',False)]</field>
<field name="view_id" ref="mrp_bom_tree_view"/>
</record>
<menuitem action="mrp_bom_tree_action" id="menu_bom_tree" parent="menu_mrp_bom_form_action"/>
<menuitem action="mrp_bom_form_action" id="menu_mrp_bom_form_action" parent="menu_mrp_configuration"
sequence="50" />
<record id="mrp_bom_form_action2" model="ir.actions.act_window">
<field name="name">Bill of Materials Components</field>
@@ -316,7 +305,7 @@
<field name="view_type">form</field>
<field name="domain">[('bom_id','!=',False)]</field>
</record>
<menuitem action="mrp_bom_form_action2" id="menu_mrp_bom_form_action2" parent="menu_mrp_configuration"/>
<menuitem action="mrp_bom_form_action2" id="menu_mrp_bom_form_action2" parent="menu_mrp_bom_form_action"/>
<record id="action2" model="ir.actions.act_window">
<field name="name">Bill of Materials Structure</field>
@@ -482,14 +471,14 @@
</page>
<page string="Work Orders">
<field colspan="4" name="workcenter_lines" nolabel="1">
<form string="Production Workcenters">
<form string="Production Work Centers">
<field colspan="4" name="name" select="1"/>
<field colspan="4" name="workcenter_id" select="1"/>
<field name="sequence"/>
<field name="cycle"/>
<field name="hour"/>
</form>
<tree string="Production Workcenters">
<tree string="Production Work Centers">
<field name="sequence"/>
<field name="name"/>
<field name="workcenter_id"/>
addons/mrp/mrp_wizard.xml
+2 -2
View File
@@ -2,14 +2,14 @@
<openerp>
<data>
<wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/>
<menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="-49"/>
<menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="90"/>
<wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Requisitions Only" name="mrp.procurement.compute"/>
<menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
<wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
<menuitem action="wiz_mrp_proc2" id="menu_wiz_mrp_proc2" parent="mrp.mrp_Sched_all" type="wizard"/>
<wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Workcenter load"/>
<wizard id="wizard_workcenter_load" model="mrp.workcenter" name="mrp.workcenter.load" string="Work Center load"/>
<wizard id="wizard_price" menu="False" model="product.product" name="product_price" string="Product Cost Structure"/>
<record id="ir_project_cost_structure" model="ir.values">
addons/mrp/report/price.py
+1 -1
View File
@@ -136,7 +136,7 @@ class report_custom(report_rml):
<col>%s</col>
</row>
</lines>
""" % (_('Workcenter name'), _('Cycles Cost'), _('Total hourly costs'))
""" % (_('Work Center name'), _('Cycles Cost'), _('Total hourly costs'))
prod_header = """
<lines style='header'>
<row>
addons/mrp_operations/__terp__.py
+3 -3
View File
@@ -21,18 +21,18 @@
{
'name': 'Workcenter Production start end workflow',
'name': 'Work Center Production start end workflow',
'version': '1.0',
'category': 'Generic Modules/Production',
'description': """
This module adds state, date_start,date_stop in production order operation lines
(in the "Workcenters" tab)
(in the "Work Centers" tab)
State: draft, confirm, done, cancel
When finishing/confirming,cancelling production orders set all state lines to the according state
Create menus:
Production Management > All Operations
Production Management > All Operations > Operations To Do (state="confirm")
Which is a view on "Workcenters" lines in production order,
Which is a view on "Work Centers" lines in production order,
editable tree
Add buttons in the form view of production order under workcenter tab:
addons/mrp_operations/mrp_operations.py
+2 -2
View File
@@ -29,7 +29,7 @@ from mx import DateTime
from tools.translate import _
#----------------------------------------------------------
# Workcenters
# Work Centers
#----------------------------------------------------------
# capacity_hour : capacity per hour. default: 1.0.
# Eg: If 5 concurrent operations at one time: capacity = 5 (because 5 employees)
@@ -434,7 +434,7 @@ class mrp_operations_operation(osv.osv):
_columns={
'production_id':fields.many2one('mrp.production','Production',required=True),
'workcenter_id':fields.many2one('mrp.workcenter','Workcenter',required=True),
'workcenter_id':fields.many2one('mrp.workcenter','Work Center',required=True),
'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True),
'date_start': fields.datetime('Start Date'),
'date_finished': fields.datetime('End Date'),
addons/mrp_operations/mrp_operations_report.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<report
id="report_wc_barcode"
string="Workcenters Barcode"
string="Work Centers Barcode"
model="mrp.workcenter"
name="mrp.wc.barcode"
rml="mrp_operations/report/mrp_wc_barcode.rml"
addons/mrp_operations/mrp_operations_view.xml
+1 -1
View File
@@ -239,7 +239,7 @@
<field name="model">mrp.production.workcenter.line</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Hours by Workcenter" type="bar">
<graph string="Hours by Work Center" type="bar">
<field name="date_start_date"/>
<field name="hour" operator="+"/>
<field name="workcenter_id" group="True" operator="+"/>
addons/report_mrp/__terp__.py
+1 -1
View File
@@ -25,7 +25,7 @@
'version': '1.0',
'category': 'Generic Modules/Production',
'description': """A module that adds new reports based on MRP cases.
Workcenter loads, Weekly Stock value variation""",
Work Center loads, Weekly Stock value variation""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['mrp'],
addons/report_mrp/report_mrp.py
+2 -2
View File
@@ -24,12 +24,12 @@ from osv import fields,osv
class report_workcenter_load(osv.osv):
_name="report.workcenter.load"
_description="Workcenter Load"
_description="Work Center Load"
_auto = False
_log_access = False
_columns = {
'name': fields.char('Week', size=64, required=True),
'workcenter_id': fields.many2one('mrp.workcenter', 'Workcenter', required=True),
'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
'cycle': fields.float('Nbr of cycle'),
'hour': fields.float('Nbr of hour'),
}
addons/report_mrp/report_mrp_view.xml
+4 -4
View File
@@ -7,7 +7,7 @@
<field name="model">report.workcenter.load</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workcenters load">
<tree string="Work Ccenters load">
<field name="name" select="1"/>
<field name="workcenter_id" select="1"/>
<field name="cycle"/>
@@ -21,7 +21,7 @@
<field name="model">report.workcenter.load</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Workcenter load" type="bar">
<graph string="Work Center load" type="bar">
<field name="name"/>
<field name="cycle" operator="+"/>
<field name="hour" operator="+"/>
@@ -36,7 +36,7 @@
<field name="model">report.workcenter.load</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Workcenter load" type="bar">
<form string="Work Center load" type="bar">
<field name="name" select="1"/>
<field name="workcenter_id" select="1"/>
<field name="cycle"/>
@@ -45,7 +45,7 @@
</field>
</record>
<record id="action_report_workcenter_load_tree" model="ir.actions.act_window">
<field name="name">Workcenter Loads</field>
<field name="name">Work Center Loads</field>
<field name="res_model">report.workcenter.load</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>