mirror of
https://github.com/OCA/manufacture.git
synced 2025-01-28 16:37:15 +02:00
[8.0.1.0.0][mrp_production_request] Backport From 9.0
This commit is contained in:
@@ -82,6 +82,7 @@ Contributors
|
|||||||
|
|
||||||
* Lois Rilo Antelo <lois.rilo@eficent.com>
|
* Lois Rilo Antelo <lois.rilo@eficent.com>
|
||||||
* Jordi Ballester <jordi.ballester@eficent.com>
|
* Jordi Ballester <jordi.ballester@eficent.com>
|
||||||
|
* Opensynergy Indonesia <openerp@opensynergy-indonesia.com>
|
||||||
|
|
||||||
Maintainer
|
Maintainer
|
||||||
----------
|
----------
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
"summary": "Allows you to use Manufacturing Request as a previous "
|
"summary": "Allows you to use Manufacturing Request as a previous "
|
||||||
"step to Manufacturing Orders for better manufacture "
|
"step to Manufacturing Orders for better manufacture "
|
||||||
"planification.",
|
"planification.",
|
||||||
"version": "9.0.1.0.0",
|
"version": "8.0.1.0.0",
|
||||||
"category": "Manufacturing",
|
"category": "Manufacturing",
|
||||||
"website": "https://github.com/OCA/manufacture",
|
"website": "https://github.com/OCA/manufacture",
|
||||||
"author": "Eficent,"
|
"author": "Eficent,"
|
||||||
|
|||||||
@@ -2,14 +2,21 @@
|
|||||||
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
|
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
|
||||||
|
|
||||||
<odoo noupdate="1">
|
<openerp>
|
||||||
|
<data noupdate="1">
|
||||||
|
|
||||||
|
<record id="sequence_mrp_production_request" model="ir.sequence.type">
|
||||||
|
<field name="name">MRP Production Request</field>
|
||||||
|
<field name="code">mrp.production.request</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
<record id="seq_mrp_production_request" model="ir.sequence">
|
<record id="seq_mrp_production_request" model="ir.sequence">
|
||||||
<field name="name">Manufacturing Request</field>
|
<field name="name">Manufacturing Request</field>
|
||||||
<field name="code">mrp.production.request</field>
|
<field name="code">mrp.production.request</field>
|
||||||
<field name="prefix">MR/%(range_year)s/</field>
|
<field name="prefix">MR/%(year)s/</field>
|
||||||
<field name="padding">5</field>
|
<field eval="5" name="padding"/>
|
||||||
<field name="company_id" eval="False"/>
|
<field name="company_id" eval="False"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</data>
|
||||||
|
</openerp>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
from openerp import api, fields, models, _
|
from openerp import api, fields, models, _
|
||||||
import openerp.addons.decimal_precision as dp
|
import openerp.addons.decimal_precision as dp
|
||||||
from openerp.exceptions import UserError
|
from openerp.exceptions import Warning as UserError
|
||||||
|
|
||||||
|
|
||||||
class MrpProductionRequest(models.Model):
|
class MrpProductionRequest(models.Model):
|
||||||
@@ -15,7 +15,7 @@ class MrpProductionRequest(models.Model):
|
|||||||
@api.model
|
@api.model
|
||||||
def _company_get(self):
|
def _company_get(self):
|
||||||
company_id = self.env['res.company']._company_default_get(self._name)
|
company_id = self.env['res.company']._company_default_get(self._name)
|
||||||
return self.env['res.company'].browse(company_id.id)
|
return self.env['res.company'].browse(company_id)
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _get_default_requested_by(self):
|
def _get_default_requested_by(self):
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
||||||
<odoo>
|
<openerp>
|
||||||
|
|
||||||
<data noupdate="0">
|
<data noupdate="0">
|
||||||
|
|
||||||
<record model="ir.module.category" id="module_category_mrp_production_request">
|
<record model="ir.module.category" id="module_category_mrp_production_request">
|
||||||
@@ -25,9 +24,6 @@
|
|||||||
<field name="category_id" ref="module_category_mrp_production_request"/>
|
<field name="category_id" ref="module_category_mrp_production_request"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
|
||||||
<data noupdate="0">
|
|
||||||
|
|
||||||
<record model="ir.rule" id="mrp_production_request_comp_rule">
|
<record model="ir.rule" id="mrp_production_request_comp_rule">
|
||||||
<field name="name">Manufacturing Request multi-company</field>
|
<field name="name">Manufacturing Request multi-company</field>
|
||||||
<field name="model_id" ref="model_mrp_production_request"/>
|
<field name="model_id" ref="model_mrp_production_request"/>
|
||||||
@@ -70,4 +66,4 @@
|
|||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</odoo>
|
</openerp>
|
||||||
|
|||||||
@@ -4,10 +4,11 @@
|
|||||||
|
|
||||||
from openerp.tests.common import TransactionCase
|
from openerp.tests.common import TransactionCase
|
||||||
from openerp import fields
|
from openerp import fields
|
||||||
from openerp.exceptions import UserError
|
from openerp.exceptions import Warning as UserError
|
||||||
|
|
||||||
|
|
||||||
class TestMrpProductionRequest(TransactionCase):
|
class TestMrpProductionRequest(TransactionCase):
|
||||||
|
|
||||||
def setUp(self, *args, **kwargs):
|
def setUp(self, *args, **kwargs):
|
||||||
super(TestMrpProductionRequest, self).setUp(*args, **kwargs)
|
super(TestMrpProductionRequest, self).setUp(*args, **kwargs)
|
||||||
self.production_model = self.env['mrp.production']
|
self.production_model = self.env['mrp.production']
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
||||||
<odoo>
|
<openerp>
|
||||||
|
<data>
|
||||||
<record model="ir.ui.view" id="view_mrp_production_request_form">
|
<record model="ir.ui.view" id="view_mrp_production_request_form">
|
||||||
<field name="name">mrp.production.request.form</field>
|
<field name="name">mrp.production.request.form</field>
|
||||||
<field name="model">mrp.production.request</field>
|
<field name="model">mrp.production.request</field>
|
||||||
@@ -221,4 +221,5 @@
|
|||||||
<field name="key2">client_action_multi</field>
|
<field name="key2">client_action_multi</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</data>
|
||||||
|
</openerp>
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
||||||
<odoo>
|
<openerp>
|
||||||
|
<data>
|
||||||
|
|
||||||
<record id="mrp_production_form_view" model="ir.ui.view">
|
<record id="mrp_production_form_view" model="ir.ui.view">
|
||||||
<field name="name">mrp.production.form - mrp_production_request</field>
|
<field name="name">mrp.production.form - mrp_production_request</field>
|
||||||
@@ -15,4 +16,5 @@
|
|||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</data>
|
||||||
|
</openerp>
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
||||||
<odoo>
|
<openerp>
|
||||||
|
<data>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="procurement_form_view">
|
<record model="ir.ui.view" id="procurement_form_view">
|
||||||
<field name="name">procurement.order.form - mrp_production_request</field>
|
<field name="name">procurement.order.form - mrp_production_request</field>
|
||||||
@@ -14,4 +15,5 @@
|
|||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</data>
|
||||||
|
</openerp>
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
||||||
<odoo>
|
<openerp>
|
||||||
|
<data>
|
||||||
|
|
||||||
<record model="ir.ui.view" id="view_template_property_form">
|
<record model="ir.ui.view" id="view_template_property_form">
|
||||||
<field name="name">product.template.form - mrp_production_request</field>
|
<field name="name">product.template.form - mrp_production_request</field>
|
||||||
@@ -15,4 +16,5 @@
|
|||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</data>
|
||||||
|
</openerp>
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
|
||||||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
|
||||||
<odoo>
|
<openerp>
|
||||||
|
<data>
|
||||||
|
|
||||||
<record id="mrp_production_request_create_mo_view" model="ir.ui.view">
|
<record id="mrp_production_request_create_mo_view" model="ir.ui.view">
|
||||||
<field name="name">mrp.production.request.create.mo.form</field>
|
<field name="name">mrp.production.request.create.mo.form</field>
|
||||||
@@ -15,7 +16,7 @@
|
|||||||
options='{"no_open": True}'/>
|
options='{"no_open": True}'/>
|
||||||
<field name="pending_qty"/>
|
<field name="pending_qty"/>
|
||||||
<button name="compute_product_line_ids" type="object"
|
<button name="compute_product_line_ids" type="object"
|
||||||
string="Compute lines" colspan="2" icon="fa-cogs"/>
|
string="Compute lines" colspan="2" icon="gtk-execute"/>
|
||||||
</group>
|
</group>
|
||||||
<group colspan="4">
|
<group colspan="4">
|
||||||
<field name="product_line_ids" nolabel="1">
|
<field name="product_line_ids" nolabel="1">
|
||||||
@@ -56,4 +57,5 @@
|
|||||||
<field name="target">new</field>
|
<field name="target">new</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</data>
|
||||||
|
</openerp>
|
||||||
|
|||||||
@@ -3,3 +3,4 @@
|
|||||||
product-attribute
|
product-attribute
|
||||||
account-analytic
|
account-analytic
|
||||||
product-variant
|
product-variant
|
||||||
|
stock-logistics-warehouse
|
||||||
|
|||||||
Reference in New Issue
Block a user