[MERGE] main trunk-wms branch
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 4 Feb 2014 11:08:40 +0000 (12:08 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 4 Feb 2014 11:08:40 +0000 (12:08 +0100)
commit19501096f5d0e8cc9490d90c8573eb401d1e503c
tree7c903838f7ec04ff4fe8dfae6722dc3e82337175
parentb9448827556e2388030ff1c26eaf4c40df0204cb
parentd096e9f1b81bb3839743e0c22b869269d3053bdd
[MERGE] main trunk-wms branch

bzr revid: qdp-launchpad@openerp.com-20140204110840-iur4q0t9rz5v2y5i
addons/mrp/mrp.py
addons/mrp/mrp_view.xml