[FIX] mrp_operations_time_control: Some fixes

This commit is contained in:
oihane
2014-09-25 13:43:38 +02:00
committed by Pedro M. Baeza
parent 57dfe41f60
commit 647420bf9b
8 changed files with 257 additions and 79 deletions

View File

@@ -1,10 +1,9 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# 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,
@@ -12,7 +11,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# 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/.
#
##############################################################################

View File

@@ -3,8 +3,8 @@
##############################################################################
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# 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,
@@ -12,7 +12,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# 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/.
#
##############################################################################
@@ -20,15 +20,30 @@
{
"name": "MRP Operations Time Control",
"version": "1.0",
"depends": ["base", "mrp", "mrp_operations_extension"],
"author": "OdooMRP team",
"contributors": ["Mikel Arregi <mikelarregi@avanzosc.es>"],
"category": "mrp",
"depends": [
"base",
"mrp",
"mrp_operations_extension",
],
"author": "OdooMRP team,"
"AvanzOSC,"
"Serv. Tecnol. Avanzados - Pedro M. Baeza",
"website": "http://www.odoomrp.com",
"contributors": [
"Mikel Arregi <mikelarregi@avanzosc.es>",
"Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>",
"Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
"Ana Juaristi <ajuaristio@gmail.com>"
],
"category": "Manufacturing",
"description": """
Manufacturing operations time control
""",
'data': ["views/operation_time_view.xml",
"views/mrp_production_view.xml"],
'data': [
"views/operation_time_view.xml",
"views/mrp_production_view.xml",
"security/ir.model.access.csv",
],
"installable": True,
"auto_install": False,
}

View File

@@ -0,0 +1,199 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_operations_time_control
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 8.0rc1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-09-17 10:16+0000\n"
"PO-Revision-Date: 2014-09-17 10:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: mrp_operations_time_control
#: view:mrp.work.order.produce:mrp_operations_time_control.view_mrp_product_produce_wizard
msgid "Cancel"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.work.order.produce:mrp_operations_time_control.view_mrp_product_produce_wizard
msgid "Confirm"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.work.order.produce:mrp_operations_time_control.view_mrp_product_produce_wizard
msgid "Consume Lines"
msgstr ""
#. module: mrp_operations_time_control
#: selection:mrp.work.order.produce,mode:0
msgid "Consume Only"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,create_uid:0
msgid "Created by"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,create_date:0
msgid "Created on"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_tree_view
msgid "Finished"
msgstr ""
#. module: mrp_operations_time_control
#: view:operation.time.line:mrp_operations_time_control.view_operation_time_lines_search
msgid "Group By..."
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,id:0
msgid "ID"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_form_view
msgid "Information"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,write_uid:0
msgid "Last Updated by"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,write_date:0
msgid "Last Updated on"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,lot_id:0
msgid "Lot"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,mode:0
msgid "Mode"
msgstr ""
#. module: mrp_operations_time_control
#: model:ir.actions.act_window,name:mrp_operations_time_control.operation_time_lines_action
#: model:ir.ui.menu,name:mrp_operations_time_control.menu_operation_time_lines_action
msgid "Operation Time Lines"
msgstr ""
#. module: mrp_operations_time_control
#: view:operation.time.line:mrp_operations_time_control.operation_time_lines_form_view
#: view:operation.time.line:mrp_operations_time_control.operation_time_lines_tree_view
msgid "Operation time lines"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_tree_view
msgid "Pending"
msgstr ""
#. module: mrp_operations_time_control
#: model:ir.actions.act_window,name:mrp_operations_time_control.act_mrp_work_order_produce
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_form_view
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_tree_view
#: view:mrp.work.order.produce:mrp_operations_time_control.view_mrp_product_produce_wizard
msgid "Produce"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,product_id:0
msgid "Product"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_form_view
msgid "Product Lines"
msgstr ""
#. module: mrp_operations_time_control
#: model:ir.model,name:mrp_operations_time_control.model_mrp_work_order_produce
msgid "Product Produce"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_form_view
msgid "Product to Produce"
msgstr ""
#. module: mrp_operations_time_control
#: view:operation.time.line:mrp_operations_time_control.view_operation_time_lines_search
msgid "Production Order"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,consume_lines:0
msgid "Products Consumed"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_tree_view
msgid "Resume"
msgstr ""
#. module: mrp_operations_time_control
#: view:operation.time.line:mrp_operations_time_control.view_operation_time_lines_search
msgid "Search Operation Time Lines"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,product_qty:0
msgid "Select Quantity"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_tree_view
msgid "Set Draft"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_tree_view
msgid "Start"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.work.order.produce:mrp_operations_time_control.view_mrp_product_produce_wizard
msgid "To Consume"
msgstr ""
#. module: mrp_operations_time_control
#: field:mrp.work.order.produce,track_production:0
msgid "Track production"
msgstr ""
#. module: mrp_operations_time_control
#: view:mrp.production.workcenter.line:mrp_operations_time_control.operation_time_form_view
#: view:operation.time.line:mrp_operations_time_control.operation_time_lines_tree_view
msgid "Uptime"
msgstr ""
#. module: mrp_operations_time_control
#: view:operation.time.line:mrp_operations_time_control.view_operation_time_lines_search
msgid "User"
msgstr ""
#. module: mrp_operations_time_control
#: model:ir.model,name:mrp_operations_time_control.model_mrp_production_workcenter_line
#: view:operation.time.line:mrp_operations_time_control.view_operation_time_lines_search
msgid "Work Order"
msgstr ""
#. module: mrp_operations_time_control
#: view:operation.time.line:mrp_operations_time_control.operation_time_lines_form_view
msgid "hours"
msgstr ""

View File

@@ -1,14 +1,9 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2008-2013 AvanzOSC S.L. (Mikel Arregi) All Rights Reserved
#
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# 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,
@@ -16,7 +11,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# 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/.
#
##############################################################################

View File

@@ -1,14 +1,9 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2008-2013 AvanzOSC S.L. (Mikel Arregi) All Rights Reserved
#
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# 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,
@@ -16,14 +11,12 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# 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 openerp import api, models, fields, exceptions
from datetime import datetime
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
from openerp import api, models, fields
class MrpProductionWorkcenterLine(models.Model):

View File

@@ -0,0 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_operation_time_line_user,access_operation_time_line_user,model_operation_time_line,mrp.group_mrp_user,1,1,1,1
access_operation_time_line_manager,access_operation_time_line_manager,model_operation_time_line,mrp.group_mrp_manager,1,1,1,1
access_operation_time_line_sale,access_operation_time_line_sale,model_operation_time_line,base.group_sale_salesman,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_operation_time_line_user access_operation_time_line_user model_operation_time_line mrp.group_mrp_user 1 1 1 1
3 access_operation_time_line_manager access_operation_time_line_manager model_operation_time_line mrp.group_mrp_manager 1 1 1 1
4 access_operation_time_line_sale access_operation_time_line_sale model_operation_time_line base.group_sale_salesman 1 0 0 0

View File

@@ -1,46 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<record model="ir.ui.view"
id="mrp_production_operation_buttons_form_view">
<field name="name">mrp.production.operation.buttons.form
</field>
<field name="model">mrp.production</field>
<field name="inherit_id"
ref="mrp_operations.mrp_production_form_inherit_view" />
<field name="arch" type="xml">
<button name="button_start_working" position="attributes">
<attribute name="icon"></attribute>
</button>
<button name="button_resume" position="attributes">
<attribute name="icon" ></attribute>
</button>
<button name="button_done" position="attributes">
<attribute name="icon" ></attribute>
</button>
<button name="button_pause" position="attributes">
<attribute name="icon" ></attribute>
</button>
<button name="button_draft" position="attributes">
<attribute name="icon" ></attribute>
</button>
<button name="button_cancel" position="attributes">
<attribute name="icon" ></attribute>
</button>
</field>
</record>
<record model="ir.ui.view"
id="mrp_production_operation_time_form_view">
<record model="ir.ui.view" id="mrp_production_operation_time_form_view">
<field name="name">mrp.production.operation.time.form
</field>
<field name="model">mrp.production</field>
<field name="inherit_id"
ref="mrp_operations_extension.mrp_production_form_view_inh" />
<field name="arch" type="xml">
<field name="product_line" position="after">
<field name="operation_time_lines" nolabel="1" colspan="4" col="4"/>
</field>
<page string="Information" position="after">
<page string="Uptime">
<field name="operation_time_lines"
nolabel="1" colspan="4" col="4" />
</page>
</page>
</field>
</record>
</data>

View File

@@ -30,15 +30,9 @@
<field name="operation_time_lines" />
</page>
</page>
<group string="Product to Produce" position="after">
<group string="Product Lines" colspan="4" col="4">
<field name="routing_wc_line" colspan="4" col="4"/>
<field name="product_line" nolabel="1" colspan="4" col="4"/>
</group>
</group>
</field>
</record>
<record model="ir.ui.view" id="operation_time_tree_view">
<field name="name">Operation Time Form View</field>
<field name="model">mrp.production.workcenter.line</field>
@@ -46,15 +40,20 @@
ref="mrp_operations.mrp_production_workcenter_tree_view_inherit" />
<field name="arch" type="xml">
<field name="state" position="after">
<button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
<button name="button_start_working" string="Start" states="draft" icon="gtk-media-play"/>
<button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
<button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
<button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
<button name="button_draft" string="Set Draft"
states="cancel" icon="gtk-convert" />
<button name="button_start_working" string="Start"
states="draft" icon="gtk-media-play" />
<button name="button_resume" string="Resume"
states="pause" icon="gtk-media-pause" />
<button name="button_pause" string="Pending"
states="startworking" icon="gtk-media-pause" />
<button name="button_done" string="Finished"
states="startworking" icon="terp-check" />
</field>
</field>
</record>
<record model="ir.ui.view" id="operation_time_lines_form_view">
<field name="name">operation.time.line.form</field>
<field name="model">operation.time.line</field>