Merge lp://staging/~jfb-tempo-consulting/unifield-web/US-9958 into lp://staging/unifield-web
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 5048 |
| Proposed branch: | lp://staging/~jfb-tempo-consulting/unifield-web/US-9958 |
| Merge into: | lp://staging/unifield-web |
| Diff against target: |
361 lines (+107/-20) 16 files modified
addons/openerp/controllers/listgrid.py (+3/-1) addons/openerp/controllers/root.py (+9/-1) addons/openerp/controllers/templates/base.mako (+1/-1) addons/openerp/controllers/templates/index.mako (+3/-0) addons/openerp/static/javascript/form.js (+1/-0) addons/openerp/static/javascript/listgrid.js (+3/-2) addons/openerp/static/javascript/openerp/openerp.base.js (+40/-0) addons/openerp/widgets/templates/listgrid/listgrid.mako (+1/-1) addons/sync_client_web/controllers.py (+2/-1) addons/view_calendar/po/javascript/fr.po (+4/-0) doc/openerp-web-win.cfg (+2/-1) doc/openerp-web.cfg (+2/-1) openobject/__init__.py (+9/-4) openobject/controllers/templates/base.mako (+3/-0) openobject/tools/_tools.py (+22/-6) openobject/widgets/_resource.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~jfb-tempo-consulting/unifield-web/US-9958 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Dev Team | Pending | ||
|
Review via email:
|
|||
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
