Merge lp://staging/~jfb-tempo-consulting/unifield-web/US-2156_trunk into lp://staging/unifield-web
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 4933 |
| Proposed branch: | lp://staging/~jfb-tempo-consulting/unifield-web/US-2156_trunk |
| Merge into: | lp://staging/unifield-web |
| Diff against target: |
464 lines (+108/-33) 13 files modified
addons/openerp/controllers/form.py (+18/-4) addons/openerp/controllers/impex.py (+2/-3) addons/openerp/controllers/tree.py (+5/-3) addons/openerp/utils/rpc.py (+2/-2) addons/openerp/utils/utils.py (+14/-2) addons/openerp/validators.py (+3/-0) addons/openerp/widgets/form/_form.py (+20/-3) addons/openerp/widgets/form/_m2m.py (+1/-0) addons/openerp/widgets/form/_o2m.py (+1/-1) addons/openerp/widgets/listgrid.py (+18/-1) addons/openerp/widgets/listgroup.py (+22/-10) addons/openerp/widgets/screen.py (+2/-1) openobject/i18n/format.py (+0/-3) |
| To merge this branch: | bzr merge lp://staging/~jfb-tempo-consulting/unifield-web/US-2156_trunk |
| 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
