[IMP] Add security rules from bzr branch
[WIP] Use new stat buttons from bzr
[IMP] Picking priorities to priority of move instead + propagation + show package operations after done
[IMP] Change the barcodes to code128 and make a little bigger
[IMP] Make partial move_type by default when doing picking assign
[IMP] Show quantity available
[IMP] Package bar code printing from barcode itf
[IMP] event_sale: extra QWeb report for printing event badges, with HTML fields for custom content
[IMP] Location barcode
[FIX] ir.attachment mess, restore list view
[ADD] "Model" Column in base_action_rule tree view.
Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco
Merge branch 'master-wmssecurity3-jco' into master-wmsstaging-jco
Merge remote-tracking branch 'odoo/master' into master-wmsstaging-jco
[FIX] website_mail_group: fixed discussion group data, wrongly forward-ported
[REV][FIX] Reverting regression introduced in forward-port
04211015fc3d4be2a8c65b9d977c2d9c4dac8be7
[FIX] website: fix incomplete refactoring
[REV] attempt to revert incorrect removals in f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
[FIX] bunch of changes lost in incorrect merge f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
[MERGE] master