Merge lp:~openerp-dev/openobject-client-web/6.0-opw-16576-vro into lp:openobject-client-web/trunk
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-dev/openobject-client-web/6.0-opw-16576-vro |
Merge into: | lp:openobject-client-web/trunk |
Diff against target: |
31613 lines (+28743/-13) (has conflicts) 268 files modified
addons/openerp/controllers/attachment.py (+1/-1) addons/openerp/controllers/root.py (+1/-1) addons/openerp/po/javascript/ar.po.OTHER (+103/-0) addons/openerp/po/javascript/bg.po.OTHER (+103/-0) addons/openerp/po/javascript/ca.po (+5/-0) addons/openerp/po/javascript/da.po.OTHER (+103/-0) addons/openerp/po/javascript/de.po (+5/-0) addons/openerp/po/javascript/en_AU.po.OTHER (+101/-0) addons/openerp/po/javascript/en_CA.po.OTHER (+103/-0) addons/openerp/po/javascript/en_GB.po.OTHER (+103/-0) addons/openerp/po/javascript/es.po (+5/-0) addons/openerp/po/javascript/es_CL.po (+101/-0) addons/openerp/po/javascript/eu.po (+5/-0) addons/openerp/po/javascript/fi.po.OTHER (+103/-0) addons/openerp/po/javascript/fr.po (+5/-0) addons/openerp/po/javascript/gl.po (+5/-0) addons/openerp/po/javascript/he.po.OTHER (+101/-0) addons/openerp/po/javascript/hr.po (+5/-0) addons/openerp/po/javascript/hu.po (+5/-0) addons/openerp/po/javascript/id.po.OTHER (+105/-0) addons/openerp/po/javascript/it.po (+5/-0) addons/openerp/po/javascript/lt.po (+5/-0) addons/openerp/po/javascript/lv.po (+5/-0) addons/openerp/po/javascript/mk.po.OTHER (+103/-0) addons/openerp/po/javascript/mn.po (+6/-0) addons/openerp/po/javascript/nb.po.OTHER (+105/-0) addons/openerp/po/javascript/nl.po (+5/-0) addons/openerp/po/javascript/pl.po (+5/-0) addons/openerp/po/javascript/pt.po (+5/-0) addons/openerp/po/javascript/pt_BR.po (+5/-0) addons/openerp/po/javascript/ro.po.OTHER (+101/-0) addons/openerp/po/javascript/ru.po (+5/-0) addons/openerp/po/javascript/sk.po (+5/-0) addons/openerp/po/javascript/sr.po (+5/-0) addons/openerp/po/javascript/sr@latin.po (+5/-0) addons/openerp/po/javascript/sv.po (+5/-0) addons/openerp/po/javascript/th.po.OTHER (+103/-0) addons/openerp/po/javascript/tr.po (+5/-0) addons/openerp/po/javascript/uk.po (+5/-0) addons/openerp/po/javascript/zh_CN.po (+5/-0) addons/openerp/po/messages/ar.po.OTHER (+1655/-0) addons/openerp/po/messages/bg.po.OTHER (+1578/-0) addons/openerp/po/messages/ca.po (+5/-0) addons/openerp/po/messages/da.po.OTHER (+1558/-0) addons/openerp/po/messages/de.po (+5/-0) addons/openerp/po/messages/en_AU.po.OTHER (+1541/-0) addons/openerp/po/messages/en_CA.po.OTHER (+1682/-0) addons/openerp/po/messages/en_GB.po.OTHER (+1597/-0) addons/openerp/po/messages/es.po (+5/-0) addons/openerp/po/messages/es_CL.po (+67/-3) addons/openerp/po/messages/et.po (+5/-0) addons/openerp/po/messages/eu.po (+5/-0) addons/openerp/po/messages/fi.po.OTHER (+1566/-0) addons/openerp/po/messages/fr.po (+5/-0) addons/openerp/po/messages/gl.po (+5/-0) addons/openerp/po/messages/he.po (+5/-0) addons/openerp/po/messages/hr.po (+5/-0) addons/openerp/po/messages/hu.po (+5/-0) addons/openerp/po/messages/id.po.OTHER (+1577/-0) addons/openerp/po/messages/it.po (+5/-0) addons/openerp/po/messages/lt.po (+5/-0) addons/openerp/po/messages/lv.po (+5/-0) addons/openerp/po/messages/mk.po.OTHER (+1544/-0) addons/openerp/po/messages/mn.po (+5/-0) addons/openerp/po/messages/nb.po.OTHER (+2023/-0) addons/openerp/po/messages/nl.po (+5/-0) addons/openerp/po/messages/pl.po (+5/-0) addons/openerp/po/messages/pt.po (+5/-0) addons/openerp/po/messages/pt_BR.po (+5/-0) addons/openerp/po/messages/ro.po.OTHER (+1553/-0) addons/openerp/po/messages/ru.po (+5/-0) addons/openerp/po/messages/sk.po (+5/-0) addons/openerp/po/messages/sr.po (+5/-0) addons/openerp/po/messages/sr@latin.po (+5/-0) addons/openerp/po/messages/sv.po (+5/-0) addons/openerp/po/messages/th.po.OTHER (+1539/-0) addons/openerp/po/messages/tr.po (+5/-0) addons/openerp/po/messages/uk.po.OTHER (+1602/-0) addons/openerp/po/messages/vi.po (+5/-0) addons/openerp/po/messages/zh_CN.po (+5/-0) addons/openerp/static/javascript/form.js (+24/-1) addons/openerp/static/javascript/m2o.js (+3/-2) addons/openerp/widgets/form/_form.py (+1/-1) addons/openerp/widgets/sidebar.py (+1/-1) addons/openerp/widgets/templates/sidebar.mako (+1/-1) addons/view_calendar/po/javascript/ar.po.OTHER (+66/-0) addons/view_calendar/po/javascript/bg.po.OTHER (+66/-0) addons/view_calendar/po/javascript/ca.po.OTHER (+67/-0) addons/view_calendar/po/javascript/da.po (+6/-1) addons/view_calendar/po/javascript/de.po (+5/-0) addons/view_calendar/po/javascript/en_AU.po.OTHER (+66/-0) addons/view_calendar/po/javascript/en_CA.po.OTHER (+66/-0) addons/view_calendar/po/javascript/en_GB.po.OTHER (+66/-0) addons/view_calendar/po/javascript/es.po (+5/-0) addons/view_calendar/po/javascript/eu.po (+5/-0) addons/view_calendar/po/javascript/fa.po (+5/-0) addons/view_calendar/po/javascript/fi.po.OTHER (+66/-0) addons/view_calendar/po/javascript/fr.po (+5/-0) addons/view_calendar/po/javascript/gl.po (+5/-0) addons/view_calendar/po/javascript/he.po (+5/-0) addons/view_calendar/po/javascript/hr.po (+5/-0) addons/view_calendar/po/javascript/hu.po (+5/-0) addons/view_calendar/po/javascript/id.po.OTHER (+66/-0) addons/view_calendar/po/javascript/it.po (+5/-0) addons/view_calendar/po/javascript/lt.po (+5/-0) addons/view_calendar/po/javascript/lv.po (+5/-0) addons/view_calendar/po/javascript/mk.po.OTHER (+66/-0) addons/view_calendar/po/javascript/nb.po.OTHER (+66/-0) addons/view_calendar/po/javascript/nl.po (+5/-0) addons/view_calendar/po/javascript/pl.po (+5/-0) addons/view_calendar/po/javascript/pt.po (+5/-0) addons/view_calendar/po/javascript/pt_BR.po (+5/-0) addons/view_calendar/po/javascript/ru.po (+5/-0) addons/view_calendar/po/javascript/sk.po (+5/-0) addons/view_calendar/po/javascript/sr.po (+5/-0) addons/view_calendar/po/javascript/sr@latin.po (+5/-0) addons/view_calendar/po/javascript/sv.po (+5/-0) addons/view_calendar/po/javascript/tr.po (+5/-0) addons/view_calendar/po/javascript/uk.po (+5/-0) addons/view_calendar/po/javascript/zh_CN.po (+5/-0) addons/view_calendar/po/messages/ar.po.OTHER (+215/-0) addons/view_calendar/po/messages/bg.po.OTHER (+215/-0) addons/view_calendar/po/messages/ca.po.OTHER (+216/-0) addons/view_calendar/po/messages/da.po.OTHER (+215/-0) addons/view_calendar/po/messages/de.po (+5/-0) addons/view_calendar/po/messages/en_AU.po.OTHER (+215/-0) addons/view_calendar/po/messages/en_CA.po.OTHER (+215/-0) addons/view_calendar/po/messages/en_GB.po.OTHER (+215/-0) addons/view_calendar/po/messages/es.po (+5/-0) addons/view_calendar/po/messages/eu.po (+5/-0) addons/view_calendar/po/messages/fi.po.OTHER (+215/-0) addons/view_calendar/po/messages/fr.po (+5/-0) addons/view_calendar/po/messages/gl.po (+5/-0) addons/view_calendar/po/messages/he.po.OTHER (+215/-0) addons/view_calendar/po/messages/hr.po (+5/-0) addons/view_calendar/po/messages/hu.po (+5/-0) addons/view_calendar/po/messages/id.po.OTHER (+215/-0) addons/view_calendar/po/messages/it.po (+5/-0) addons/view_calendar/po/messages/lt.po (+5/-0) addons/view_calendar/po/messages/lv.po (+5/-0) addons/view_calendar/po/messages/nb.po.OTHER (+215/-0) addons/view_calendar/po/messages/nl.po (+5/-0) addons/view_calendar/po/messages/pl.po (+5/-0) addons/view_calendar/po/messages/pt.po (+5/-0) addons/view_calendar/po/messages/pt_BR.po (+5/-0) addons/view_calendar/po/messages/ru.po (+5/-0) addons/view_calendar/po/messages/sk.po (+5/-0) addons/view_calendar/po/messages/sr.po (+5/-0) addons/view_calendar/po/messages/sr@latin.po (+5/-0) addons/view_calendar/po/messages/sv.po (+5/-0) addons/view_calendar/po/messages/tr.po (+5/-0) addons/view_calendar/po/messages/zh_CN.po (+5/-0) addons/view_diagram/po/javascript/ar.po.OTHER (+46/-0) addons/view_diagram/po/javascript/bg.po.OTHER (+46/-0) addons/view_diagram/po/javascript/ca.po.OTHER (+47/-0) addons/view_diagram/po/javascript/da.po (+6/-1) addons/view_diagram/po/javascript/de.po (+5/-0) addons/view_diagram/po/javascript/en_AU.po.OTHER (+46/-0) addons/view_diagram/po/javascript/en_CA.po.OTHER (+46/-0) addons/view_diagram/po/javascript/en_GB.po.OTHER (+46/-0) addons/view_diagram/po/javascript/es.po (+5/-0) addons/view_diagram/po/javascript/eu.po (+5/-0) addons/view_diagram/po/javascript/fi.po.OTHER (+46/-0) addons/view_diagram/po/javascript/fr.po (+5/-0) addons/view_diagram/po/javascript/gl.po (+5/-0) addons/view_diagram/po/javascript/he.po (+5/-0) addons/view_diagram/po/javascript/hr.po (+5/-0) addons/view_diagram/po/javascript/hu.po (+5/-0) addons/view_diagram/po/javascript/id.po.OTHER (+46/-0) addons/view_diagram/po/javascript/it.po (+5/-0) addons/view_diagram/po/javascript/lt.po (+5/-0) addons/view_diagram/po/javascript/lv.po (+5/-0) addons/view_diagram/po/javascript/mk.po.OTHER (+46/-0) addons/view_diagram/po/javascript/nb.po.OTHER (+46/-0) addons/view_diagram/po/javascript/nl.po (+5/-0) addons/view_diagram/po/javascript/pl.po (+5/-0) addons/view_diagram/po/javascript/pt.po (+5/-0) addons/view_diagram/po/javascript/pt_BR.po (+5/-0) addons/view_diagram/po/javascript/ru.po (+5/-0) addons/view_diagram/po/javascript/sk.po (+5/-0) addons/view_diagram/po/javascript/sr.po (+5/-0) addons/view_diagram/po/javascript/sr@latin.po (+5/-0) addons/view_diagram/po/javascript/sv.po (+5/-0) addons/view_diagram/po/javascript/th.po.OTHER (+46/-0) addons/view_diagram/po/javascript/tr.po (+5/-0) addons/view_diagram/po/javascript/uk.po (+5/-0) addons/view_diagram/po/javascript/zh_CN.po (+5/-0) addons/view_diagram/po/messages/ar.po.OTHER (+128/-0) addons/view_diagram/po/messages/bg.po.OTHER (+128/-0) addons/view_diagram/po/messages/ca.po.OTHER (+129/-0) addons/view_diagram/po/messages/da.po (+128/-0) addons/view_diagram/po/messages/de.po (+5/-0) addons/view_diagram/po/messages/en_AU.po.OTHER (+128/-0) addons/view_diagram/po/messages/en_CA.po.OTHER (+128/-0) addons/view_diagram/po/messages/en_GB.po.OTHER (+128/-0) addons/view_diagram/po/messages/es.po (+5/-0) addons/view_diagram/po/messages/eu.po (+5/-0) addons/view_diagram/po/messages/fi.po.OTHER (+128/-0) addons/view_diagram/po/messages/fr.po (+5/-0) addons/view_diagram/po/messages/gl.po (+5/-0) addons/view_diagram/po/messages/hr.po (+5/-0) addons/view_diagram/po/messages/hu.po (+5/-0) addons/view_diagram/po/messages/id.po.OTHER (+128/-0) addons/view_diagram/po/messages/it.po (+5/-0) addons/view_diagram/po/messages/lt.po (+5/-0) addons/view_diagram/po/messages/lv.po (+5/-0) addons/view_diagram/po/messages/nb.po (+128/-0) addons/view_diagram/po/messages/nl.po (+5/-0) addons/view_diagram/po/messages/pl.po (+5/-0) addons/view_diagram/po/messages/pt.po (+5/-0) addons/view_diagram/po/messages/pt_BR.po (+5/-0) addons/view_diagram/po/messages/ru.po (+5/-0) addons/view_diagram/po/messages/sk.po (+5/-0) addons/view_diagram/po/messages/sr.po (+5/-0) addons/view_diagram/po/messages/sr@latin.po (+5/-0) addons/view_diagram/po/messages/sv.po (+5/-0) addons/view_diagram/po/messages/th.po.OTHER (+128/-0) addons/view_diagram/po/messages/tr.po (+5/-0) addons/view_diagram/po/messages/uk.po (+5/-0) addons/view_diagram/po/messages/zh_CN.po (+5/-0) addons/view_graph/po/javascript/de.po (+5/-0) addons/view_graph/po/javascript/fr.po (+5/-0) addons/view_graph/po/javascript/gl.po (+5/-0) addons/view_graph/po/javascript/it.po (+5/-0) addons/view_graph/po/javascript/nl.po (+5/-0) addons/view_graph/po/javascript/pt_BR.po (+5/-0) addons/view_graph/po/javascript/sr.po (+5/-0) addons/view_graph/po/javascript/sr@latin.po (+5/-0) addons/view_graph/po/javascript/sv.po (+5/-0) addons/view_graph/po/javascript/tr.po.OTHER (+20/-0) addons/view_graph/po/javascript/uk.po (+5/-0) addons/view_graph/po/messages/ar.po.OTHER (+26/-0) addons/view_graph/po/messages/bg.po.OTHER (+26/-0) addons/view_graph/po/messages/ca.po.OTHER (+27/-0) addons/view_graph/po/messages/da.po.OTHER (+26/-0) addons/view_graph/po/messages/de.po (+5/-0) addons/view_graph/po/messages/en_AU.po.OTHER (+26/-0) addons/view_graph/po/messages/en_CA.po.OTHER (+26/-0) addons/view_graph/po/messages/en_GB.po.OTHER (+26/-0) addons/view_graph/po/messages/es.po (+5/-0) addons/view_graph/po/messages/eu.po (+5/-0) addons/view_graph/po/messages/fi.po.OTHER (+26/-0) addons/view_graph/po/messages/fr.po (+5/-0) addons/view_graph/po/messages/gl.po (+5/-0) addons/view_graph/po/messages/he.po.OTHER (+26/-0) addons/view_graph/po/messages/hr.po (+5/-0) addons/view_graph/po/messages/hu.po (+5/-0) addons/view_graph/po/messages/id.po.OTHER (+26/-0) addons/view_graph/po/messages/it.po (+5/-0) addons/view_graph/po/messages/lt.po (+5/-0) addons/view_graph/po/messages/lv.po (+5/-0) addons/view_graph/po/messages/mk.po.OTHER (+26/-0) addons/view_graph/po/messages/nb.po (+26/-0) addons/view_graph/po/messages/nl.po (+5/-0) addons/view_graph/po/messages/pl.po (+5/-0) addons/view_graph/po/messages/pt.po (+5/-0) addons/view_graph/po/messages/pt_BR.po (+5/-0) addons/view_graph/po/messages/ru.po (+5/-0) addons/view_graph/po/messages/sk.po (+5/-0) addons/view_graph/po/messages/sr.po (+5/-0) addons/view_graph/po/messages/sr@latin.po (+5/-0) addons/view_graph/po/messages/sv.po (+5/-0) addons/view_graph/po/messages/th.po.OTHER (+26/-0) addons/view_graph/po/messages/tr.po (+5/-0) addons/view_graph/po/messages/uk.po (+5/-0) addons/view_graph/po/messages/zh_CN.po (+11/-0) addons/widget_ckeditor/po/javascript/fr.po (+5/-0) addons/widget_ckeditor/po/messages/fr.po (+5/-0) Contents conflict in addons/openerp/po/javascript/ar.po Contents conflict in addons/openerp/po/javascript/bg.po Text conflict in addons/openerp/po/javascript/ca.po Contents conflict in addons/openerp/po/javascript/da.po Text conflict in addons/openerp/po/javascript/de.po Contents conflict in addons/openerp/po/javascript/en_AU.po Contents conflict in addons/openerp/po/javascript/en_CA.po Contents conflict in addons/openerp/po/javascript/en_GB.po Text conflict in addons/openerp/po/javascript/es.po Conflict adding file addons/openerp/po/javascript/es_CL.po. Moved existing file to addons/openerp/po/javascript/es_CL.po.moved. Text conflict in addons/openerp/po/javascript/eu.po Contents conflict in addons/openerp/po/javascript/fi.po Text conflict in addons/openerp/po/javascript/fr.po Text conflict in addons/openerp/po/javascript/gl.po Contents conflict in addons/openerp/po/javascript/he.po Text conflict in addons/openerp/po/javascript/hr.po Text conflict in addons/openerp/po/javascript/hu.po Contents conflict in addons/openerp/po/javascript/id.po Text conflict in addons/openerp/po/javascript/it.po Text conflict in addons/openerp/po/javascript/lt.po Text conflict in addons/openerp/po/javascript/lv.po Contents conflict in addons/openerp/po/javascript/mk.po Text conflict in addons/openerp/po/javascript/mn.po Contents conflict in addons/openerp/po/javascript/nb.po Text conflict in addons/openerp/po/javascript/nl.po Text conflict in addons/openerp/po/javascript/pl.po Text conflict in addons/openerp/po/javascript/pt.po Text conflict in addons/openerp/po/javascript/pt_BR.po Contents conflict in addons/openerp/po/javascript/ro.po Text conflict in addons/openerp/po/javascript/ru.po Text conflict in addons/openerp/po/javascript/sk.po Text conflict in addons/openerp/po/javascript/sr.po Text conflict in addons/openerp/po/javascript/sr@latin.po Text conflict in addons/openerp/po/javascript/sv.po Contents conflict in addons/openerp/po/javascript/th.po Text conflict in addons/openerp/po/javascript/tr.po Text conflict in addons/openerp/po/javascript/uk.po Text conflict in addons/openerp/po/javascript/zh_CN.po Contents conflict in addons/openerp/po/messages/ar.po Contents conflict in addons/openerp/po/messages/bg.po Text conflict in addons/openerp/po/messages/ca.po Contents conflict in addons/openerp/po/messages/da.po Text conflict in addons/openerp/po/messages/de.po Contents conflict in addons/openerp/po/messages/en_AU.po Contents conflict in addons/openerp/po/messages/en_CA.po Contents conflict in addons/openerp/po/messages/en_GB.po Text conflict in addons/openerp/po/messages/es.po Text conflict in addons/openerp/po/messages/es_CL.po Text conflict in addons/openerp/po/messages/et.po Text conflict in addons/openerp/po/messages/eu.po Contents conflict in addons/openerp/po/messages/fi.po Text conflict in addons/openerp/po/messages/fr.po Text conflict in addons/openerp/po/messages/gl.po Text conflict in addons/openerp/po/messages/he.po Text conflict in addons/openerp/po/messages/hr.po Text conflict in addons/openerp/po/messages/hu.po Contents conflict in addons/openerp/po/messages/id.po Text conflict in addons/openerp/po/messages/it.po Text conflict in addons/openerp/po/messages/lt.po Text conflict in addons/openerp/po/messages/lv.po Contents conflict in addons/openerp/po/messages/mk.po Text conflict in addons/openerp/po/messages/mn.po Contents conflict in addons/openerp/po/messages/nb.po Text conflict in addons/openerp/po/messages/nl.po Text conflict in addons/openerp/po/messages/pl.po Text conflict in addons/openerp/po/messages/pt.po Text conflict in addons/openerp/po/messages/pt_BR.po Contents conflict in addons/openerp/po/messages/ro.po Text conflict in addons/openerp/po/messages/ru.po Text conflict in addons/openerp/po/messages/sk.po Text conflict in addons/openerp/po/messages/sr.po Text conflict in addons/openerp/po/messages/sr@latin.po Text conflict in addons/openerp/po/messages/sv.po Contents conflict in addons/openerp/po/messages/th.po Text conflict in addons/openerp/po/messages/tr.po Contents conflict in addons/openerp/po/messages/uk.po Text conflict in addons/openerp/po/messages/vi.po Text conflict in addons/openerp/po/messages/zh_CN.po Text conflict in addons/openerp/static/javascript/form.js Contents conflict in addons/view_calendar/po/javascript/ar.po Contents conflict in addons/view_calendar/po/javascript/bg.po Contents conflict in addons/view_calendar/po/javascript/ca.po Text conflict in addons/view_calendar/po/javascript/da.po Text conflict in addons/view_calendar/po/javascript/de.po Contents conflict in addons/view_calendar/po/javascript/en_AU.po Contents conflict in addons/view_calendar/po/javascript/en_CA.po Contents conflict in addons/view_calendar/po/javascript/en_GB.po Text conflict in addons/view_calendar/po/javascript/es.po Text conflict in addons/view_calendar/po/javascript/eu.po Text conflict in addons/view_calendar/po/javascript/fa.po Contents conflict in addons/view_calendar/po/javascript/fi.po Text conflict in addons/view_calendar/po/javascript/fr.po Text conflict in addons/view_calendar/po/javascript/gl.po Text conflict in addons/view_calendar/po/javascript/he.po Text conflict in addons/view_calendar/po/javascript/hr.po Text conflict in addons/view_calendar/po/javascript/hu.po Contents conflict in addons/view_calendar/po/javascript/id.po Text conflict in addons/view_calendar/po/javascript/it.po Text conflict in addons/view_calendar/po/javascript/lt.po Text conflict in addons/view_calendar/po/javascript/lv.po Contents conflict in addons/view_calendar/po/javascript/mk.po Contents conflict in addons/view_calendar/po/javascript/nb.po Text conflict in addons/view_calendar/po/javascript/nl.po Text conflict in addons/view_calendar/po/javascript/pl.po Text conflict in addons/view_calendar/po/javascript/pt.po Text conflict in addons/view_calendar/po/javascript/pt_BR.po Text conflict in addons/view_calendar/po/javascript/ru.po Text conflict in addons/view_calendar/po/javascript/sk.po Text conflict in addons/view_calendar/po/javascript/sr.po Text conflict in addons/view_calendar/po/javascript/sr@latin.po Text conflict in addons/view_calendar/po/javascript/sv.po Text conflict in addons/view_calendar/po/javascript/tr.po Text conflict in addons/view_calendar/po/javascript/uk.po Text conflict in addons/view_calendar/po/javascript/zh_CN.po Contents conflict in addons/view_calendar/po/messages/ar.po Contents conflict in addons/view_calendar/po/messages/bg.po Contents conflict in addons/view_calendar/po/messages/ca.po Contents conflict in addons/view_calendar/po/messages/da.po Text conflict in addons/view_calendar/po/messages/de.po Contents conflict in addons/view_calendar/po/messages/en_AU.po Contents conflict in addons/view_calendar/po/messages/en_CA.po Contents conflict in addons/view_calendar/po/messages/en_GB.po Text conflict in addons/view_calendar/po/messages/es.po Text conflict in addons/view_calendar/po/messages/eu.po Contents conflict in addons/view_calendar/po/messages/fi.po Text conflict in addons/view_calendar/po/messages/fr.po Text conflict in addons/view_calendar/po/messages/gl.po Contents conflict in addons/view_calendar/po/messages/he.po Text conflict in addons/view_calendar/po/messages/hr.po Text conflict in addons/view_calendar/po/messages/hu.po Contents conflict in addons/view_calendar/po/messages/id.po Text conflict in addons/view_calendar/po/messages/it.po Text conflict in addons/view_calendar/po/messages/lt.po Text conflict in addons/view_calendar/po/messages/lv.po Contents conflict in addons/view_calendar/po/messages/nb.po Text conflict in addons/view_calendar/po/messages/nl.po Text conflict in addons/view_calendar/po/messages/pl.po Text conflict in addons/view_calendar/po/messages/pt.po Text conflict in addons/view_calendar/po/messages/pt_BR.po Text conflict in addons/view_calendar/po/messages/ru.po Text conflict in addons/view_calendar/po/messages/sk.po Text conflict in addons/view_calendar/po/messages/sr.po Text conflict in addons/view_calendar/po/messages/sr@latin.po Text conflict in addons/view_calendar/po/messages/sv.po Text conflict in addons/view_calendar/po/messages/tr.po Text conflict in addons/view_calendar/po/messages/zh_CN.po Contents conflict in addons/view_diagram/po/javascript/ar.po Contents conflict in addons/view_diagram/po/javascript/bg.po Contents conflict in addons/view_diagram/po/javascript/ca.po Text conflict in addons/view_diagram/po/javascript/da.po Text conflict in addons/view_diagram/po/javascript/de.po Contents conflict in addons/view_diagram/po/javascript/en_AU.po Contents conflict in addons/view_diagram/po/javascript/en_CA.po Contents conflict in addons/view_diagram/po/javascript/en_GB.po Text conflict in addons/view_diagram/po/javascript/es.po Text conflict in addons/view_diagram/po/javascript/eu.po Contents conflict in addons/view_diagram/po/javascript/fi.po Text conflict in addons/view_diagram/po/javascript/fr.po Text conflict in addons/view_diagram/po/javascript/gl.po Text conflict in addons/view_diagram/po/javascript/he.po Text conflict in addons/view_diagram/po/javascript/hr.po Text conflict in addons/view_diagram/po/javascript/hu.po Contents conflict in addons/view_diagram/po/javascript/id.po Text conflict in addons/view_diagram/po/javascript/it.po Text conflict in addons/view_diagram/po/javascript/lt.po Text conflict in addons/view_diagram/po/javascript/lv.po Contents conflict in addons/view_diagram/po/javascript/mk.po Contents conflict in addons/view_diagram/po/javascript/nb.po Text conflict in addons/view_diagram/po/javascript/nl.po Text conflict in addons/view_diagram/po/javascript/pl.po Text conflict in addons/view_diagram/po/javascript/pt.po Text conflict in addons/view_diagram/po/javascript/pt_BR.po Text conflict in addons/view_diagram/po/javascript/ru.po Text conflict in addons/view_diagram/po/javascript/sk.po Text conflict in addons/view_diagram/po/javascript/sr.po Text conflict in addons/view_diagram/po/javascript/sr@latin.po Text conflict in addons/view_diagram/po/javascript/sv.po Contents conflict in addons/view_diagram/po/javascript/th.po Text conflict in addons/view_diagram/po/javascript/tr.po Text conflict in addons/view_diagram/po/javascript/uk.po Text conflict in addons/view_diagram/po/javascript/zh_CN.po Contents conflict in addons/view_diagram/po/messages/ar.po Contents conflict in addons/view_diagram/po/messages/bg.po Contents conflict in addons/view_diagram/po/messages/ca.po Text conflict in addons/view_diagram/po/messages/de.po Contents conflict in addons/view_diagram/po/messages/en_AU.po Contents conflict in addons/view_diagram/po/messages/en_CA.po Contents conflict in addons/view_diagram/po/messages/en_GB.po Text conflict in addons/view_diagram/po/messages/es.po Text conflict in addons/view_diagram/po/messages/eu.po Contents conflict in addons/view_diagram/po/messages/fi.po Text conflict in addons/view_diagram/po/messages/fr.po Text conflict in addons/view_diagram/po/messages/gl.po Text conflict in addons/view_diagram/po/messages/hr.po Text conflict in addons/view_diagram/po/messages/hu.po Contents conflict in addons/view_diagram/po/messages/id.po Text conflict in addons/view_diagram/po/messages/it.po Text conflict in addons/view_diagram/po/messages/lt.po Text conflict in addons/view_diagram/po/messages/lv.po Text conflict in addons/view_diagram/po/messages/nl.po Text conflict in addons/view_diagram/po/messages/pl.po Text conflict in addons/view_diagram/po/messages/pt.po Text conflict in addons/view_diagram/po/messages/pt_BR.po Text conflict in addons/view_diagram/po/messages/ru.po Text conflict in addons/view_diagram/po/messages/sk.po Text conflict in addons/view_diagram/po/messages/sr.po Text conflict in addons/view_diagram/po/messages/sr@latin.po Text conflict in addons/view_diagram/po/messages/sv.po Contents conflict in addons/view_diagram/po/messages/th.po Text conflict in addons/view_diagram/po/messages/tr.po Text conflict in addons/view_diagram/po/messages/uk.po Text conflict in addons/view_diagram/po/messages/zh_CN.po Text conflict in addons/view_graph/po/javascript/de.po Text conflict in addons/view_graph/po/javascript/fr.po Text conflict in addons/view_graph/po/javascript/gl.po Text conflict in addons/view_graph/po/javascript/it.po Text conflict in addons/view_graph/po/javascript/nl.po Text conflict in addons/view_graph/po/javascript/pt_BR.po Text conflict in addons/view_graph/po/javascript/sr.po Text conflict in addons/view_graph/po/javascript/sr@latin.po Text conflict in addons/view_graph/po/javascript/sv.po Contents conflict in addons/view_graph/po/javascript/tr.po Text conflict in addons/view_graph/po/javascript/uk.po Contents conflict in addons/view_graph/po/messages/ar.po Contents conflict in addons/view_graph/po/messages/bg.po Contents conflict in addons/view_graph/po/messages/ca.po Contents conflict in addons/view_graph/po/messages/da.po Text conflict in addons/view_graph/po/messages/de.po Contents conflict in addons/view_graph/po/messages/en_AU.po Contents conflict in addons/view_graph/po/messages/en_CA.po Contents conflict in addons/view_graph/po/messages/en_GB.po Text conflict in addons/view_graph/po/messages/es.po Text conflict in addons/view_graph/po/messages/eu.po Contents conflict in addons/view_graph/po/messages/fi.po Text conflict in addons/view_graph/po/messages/fr.po Text conflict in addons/view_graph/po/messages/gl.po Contents conflict in addons/view_graph/po/messages/he.po Text conflict in addons/view_graph/po/messages/hr.po Text conflict in addons/view_graph/po/messages/hu.po Contents conflict in addons/view_graph/po/messages/id.po Text conflict in addons/view_graph/po/messages/it.po Text conflict in addons/view_graph/po/messages/lt.po Text conflict in addons/view_graph/po/messages/lv.po Contents conflict in addons/view_graph/po/messages/mk.po Text conflict in addons/view_graph/po/messages/nl.po Text conflict in addons/view_graph/po/messages/pl.po Text conflict in addons/view_graph/po/messages/pt.po Text conflict in addons/view_graph/po/messages/pt_BR.po Text conflict in addons/view_graph/po/messages/ru.po Text conflict in addons/view_graph/po/messages/sk.po Text conflict in addons/view_graph/po/messages/sr.po Text conflict in addons/view_graph/po/messages/sr@latin.po Text conflict in addons/view_graph/po/messages/sv.po Contents conflict in addons/view_graph/po/messages/th.po Text conflict in addons/view_graph/po/messages/tr.po Text conflict in addons/view_graph/po/messages/uk.po Text conflict in addons/view_graph/po/messages/zh_CN.po Text conflict in addons/widget_ckeditor/po/javascript/fr.po Text conflict in addons/widget_ckeditor/po/messages/fr.po |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-client-web/6.0-opw-16576-vro |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jay Vora (Serpent Consulting Services) | Pending | ||
Review via email: mp+70539@code.launchpad.net |
Description of the change
Hello,
A difference has been noticed between v5 and v6.
In v5, under the Attachments section, filenames would appear with their extension. Thus eventually, when you click the link to open the file, it's related handler would be available to open it.
In v6, the extension does not appear and so the related handler has to be manually searched for each attachment which is quite annoying.
Steps to reproduce this behavior:
1. Create an invoice and print the "Invoices" report.
2. Refresh the page to see a new attachment link under the "Attachments" section (it will be without an extension).
3. Click the link to bring up a dialog box (the file type is recognized as BIN).
This proposal resolves the issue.
Thanks
Unmerged revisions
- 4675. By Valencia Rodrigues (OpenERP)
-
[IMP] : Attachment filename extensions in the sidebar
- 4674. By Chirag Patel(OpenERP)
-
[FIX] Correction over the commit http://
bazaar. launchpad. net/~openerp/ openobject- client- web/6.0/ revision/ 4671 - 4673. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 4672. By Jay Vora (Serpent Consulting Services)
-
[MERGE] Merged Mohammed's branch for the fix of reloading M2M field when the result of on_change method returns []
- 4671. By Xavier (Open ERP)
-
[FIX] m2o search popup failing to open when calling it explicitly (via looking glass) if no text has been entered in the input
- 4670. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 4669. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 4668. By Jay Vora (Serpent Consulting Services)
-
[REVERT] Reverted the revision 4665 <email address hidden>
- 4667. By Sananaz (Open ERP)
-
[REV] Revert revision 4657.
- 4666. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.