lp:~openerp-dev/openobject-server/trunk-kanban-document-bth

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-server

OpenERP Core Team: Pending requested 2013-06-06

Diff: 377 lines (+214/-10)

6 files modified

openerp/addons/base/__openerp__.py (+2/-1)
openerp/addons/base/ir/ir_attachment.py (+12/-2)
openerp/addons/base/ir/ir_attachment_view.xml (+80/-6)
openerp/addons/base/static/src/css/attachment.css (+37/-0)
openerp/addons/base/static/src/css/attachment.sass (+33/-0)
openerp/addons/base/static/src/js/apps.js (+50/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4915. By Chirag Dodiya(OpenERP) on 2014-03-04

[MRG]Merge with trunk

4914. By Sunil Sharma(OpenERP) on 2014-02-13

[MRG]:Merge lp:openobject-server

4913. By Darshan Kalola(OpenERP) on 2014-02-11

[MERGE]sync with trunk.

4912. By Bhumi Thakkar (Open ERP) on 2013-11-11

[MERGE]Merge trunk.

4911. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

4910. By Bhumi Thakkar (Open ERP) on 2013-10-29

[MERGE]Merge trunk.

4909. By Sunil Sharma(OpenERP) on 2013-09-25

[IMP REM]:Apps and web:

4908. By Bhumi Thakkar (Open ERP) on 2013-09-19

[MERGE]Merge trunk.

4907. By Bhumi Thakkar (Open ERP) on 2013-09-13

[MERGE]Merge trunk.

4906. By Bhumi Thakkar (Open ERP) on 2013-09-13

[IMP]Removed file_extension from view.