odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] mrp, project_mrp: removed dependancy of mrp in project_mrp 

bzr revid: qdp-launchpad@openerp.com-20121217134326-akrijtur8tg0frl1
This commit is contained in:
Quentin (OpenERP) 2012-12-17 14:43:26 +01:00
parent 2c77d3178e
commit 73a9e83274
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/mrp/mrp_workflow.xml
View File

@ -116,10 +116,6 @@
<!-- Procurement -->
<record id="act_need_production" model="workflow.activity">
<field name="wkf_id" ref="procurement.wkf_procurement"/>
<field name="name">need_production</field>
</record>
<record id="act_produce" model="workflow.activity">
<field name="wkf_id" ref="procurement.wkf_procurement"/>
<field name="name">produce</field>
@ -130,13 +126,8 @@
<record id="trans_confirm_mto_need_production" model="workflow.transition">
<field name="act_from" ref="procurement.act_confirm_mto"/>
<field name="act_to" ref="act_need_production"/>
<field name="condition">check_produce()</field>
</record>
<record id="trans_product_check_produce" model="workflow.transition">
<field name="act_from" ref="act_need_production"/>
<field name="act_to" ref="act_produce"/>
<field name="condition">is_product() and check_bom_exists()</field>
<field name="condition">check_produce() and is_product() and check_bom_exists()</field>
</record>
<record id="trans_produce_finished_prod" model="workflow.transition">

2
addons/project_mrp/__openerp__.py
View File

@ -49,7 +49,7 @@ task is completed.
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'],
'depends': ['project', 'procurement', 'sale', 'mrp', 'mrp_jit'],
'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
'data': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'],
'demo': ['project_mrp_demo.xml'],
'test': ['test/project_task_procurement.yml'],

4
addons/project_mrp/project_mrp_workflow.xml
View File

@ -9,9 +9,9 @@
</record>
<record id="trans_product_check_produce_service" model="workflow.transition">
<field name="act_from" ref="mrp.act_need_production"/>
<field name="act_from" ref="procurement.act_confirm_mto"/>
<field name="act_to" ref="act_produce_service"/>
<field name="condition">not is_product()</field>
<field name="condition">check_produce() and not is_product()</field>
</record>
<record id="trans_produce_service_make_done" model="workflow.transition">
<field name="act_from" ref="act_produce_service"/>