Merge lp://staging/~jfb-tempo-consulting/unifield-web/US-9406 into lp://staging/unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 5044
Proposed branch: lp://staging/~jfb-tempo-consulting/unifield-web/US-9406
Merge into: lp://staging/unifield-web
Diff against target: 1043 lines (+671/-21)
25 files modified
addons/openerp/controllers/actions.py (+6/-1)
addons/openerp/controllers/form.py (+3/-1)
addons/openerp/controllers/preferences.py (+9/-0)
addons/openerp/controllers/root.py (+13/-5)
addons/openerp/controllers/templates/closepopup.mako (+1/-1)
addons/openerp/controllers/templates/closepref.mako (+26/-0)
addons/openerp/controllers/templates/header.mako (+2/-1)
addons/openerp/controllers/templates/index.mako (+24/-0)
addons/openerp/controllers/view_log.py (+1/-1)
addons/openerp/po/messages/fr.po (+16/-0)
addons/openerp/static/css/jquery.signature.css (+12/-0)
addons/openerp/static/css/listgrid.css (+9/-2)
addons/openerp/static/javascript/form.js (+2/-1)
addons/openerp/static/javascript/jquery.signature.js (+456/-0)
addons/openerp/static/javascript/listgrid.js (+7/-2)
addons/openerp/static/javascript/m2m.js (+5/-1)
addons/openerp/static/javascript/openerp/openerp.base.js (+5/-2)
addons/openerp/widgets/form/_form.py (+7/-1)
addons/openerp/widgets/form/templates/button.mako (+1/-1)
addons/openerp/widgets/form/templates/notebook.mako (+1/-1)
addons/openerp/widgets/form/templates/signature.mako (+27/-0)
addons/openerp/widgets/listgrid.py (+16/-0)
addons/openerp/widgets/templates/listgrid/image.mako (+15/-0)
addons/openerp/widgets/templates/listgrid/listgrid.mako (+4/-0)
openobject/controllers/templates/base.mako (+3/-0)
To merge this branch: bzr merge lp://staging/~jfb-tempo-consulting/unifield-web/US-9406
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+432399@code.staging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches