lp:~openerp-dev/openobject-addons/trunk-mo-disassemble

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2013-05-21

Diff: 1089 lines (+568/-49) (has conflicts)

16 files modified

mrp/__openerp__.py (+6/-0)
mrp/mrp.py (+192/-23)
mrp/mrp_demo.xml (+1/-1)
mrp/mrp_view.xml (+57/-10)
mrp/procurement.py (+28/-0)
mrp/static/src/js/mrp.js (+38/-0)
mrp/test/disassemble_process.yml (+96/-0)
mrp/test/order_demo.yml (+0/-2)
mrp/wizard/__init__.py (+4/-0)
mrp/wizard/change_production_qty.py (+1/-1)
mrp/wizard/disassemble_qty.py (+64/-0)
mrp/wizard/disassemble_qty_view.xml (+37/-0)
mrp/wizard/mrp_product_produce.py (+18/-1)
mrp/wizard/mrp_product_produce_view.xml (+20/-8)
mrp_byproduct/mrp_byproduct.py (+4/-2)
mrp_operations/mrp_operations.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8783. By Jitendra Prajapati(OpenERP) on 2014-04-29

[FIX/IMP]except disassamble coming from procurement.

8782. By Jitendra Prajapati(OpenERP) on 2014-04-29

[MERGE]with main branch

8781. By Jitendra Prajapati(OpenERP) on 2014-04-25

[MERGE]with main branch

8780. By Jitendra Prajapati(OpenERP) on 2014-04-24

[MERGE]with main branch

8779. By Jitendra Prajapati(OpenERP) on 2014-04-14

[MERGE]with main branch

8778. By Jitendra Prajapati(OpenERP) on 2014-04-11

[MERGE]with main branch

8777. By Jitendra Prajapati(OpenERP) on 2014-04-04

[MERGE]with main branch

8776. By Jitendra Prajapati(OpenERP) on 2014-03-27

[MERGE]with main branch

8775. By Jitendra Prajapati(OpenERP) on 2014-03-19

[MERGE]with main branch

8774. By Jitendra Prajapati(OpenERP) on 2014-02-10

[MERGE]with lp:openobject-addons