Merge lp://qastaging/~openerp-dev/openobject-client/6.1-opw-603062-acl into lp://qastaging/openobject-client
Proposed by
Anaël Closson (openerp)
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~openerp-dev/openobject-client/6.1-opw-603062-acl |
| Merge into: | lp://qastaging/openobject-client |
| Diff against target: |
2986 lines (+659/-258) (has conflicts) 66 files modified
bin/common/common.py (+0/-3) bin/modules/gui/window/form.py (+2/-2) bin/po/ar.po (+48/-6) bin/po/be.po (+5/-0) bin/po/bg.po (+137/-102) bin/po/bs.po (+5/-0) bin/po/ca.po (+5/-0) bin/po/cs.po (+5/-0) bin/po/da.po (+5/-0) bin/po/de.po (+12/-2) bin/po/el.po (+5/-0) bin/po/en_AU.po (+5/-0) bin/po/en_CA.po (+5/-0) bin/po/en_GB.po (+5/-0) bin/po/es.po (+5/-0) bin/po/es_CR.po (+5/-0) bin/po/es_EC.po (+5/-0) bin/po/et.po (+5/-0) bin/po/eu.po (+5/-0) bin/po/fa.po (+73/-65) bin/po/fi.po (+5/-0) bin/po/fr.po (+5/-0) bin/po/gl.po (+5/-0) bin/po/he.po (+5/-0) bin/po/hr.po (+5/-0) bin/po/hu.po (+11/-1) bin/po/id.po (+5/-0) bin/po/is.po (+27/-16) bin/po/it.po (+5/-0) bin/po/iu.po (+5/-0) bin/po/ja.po (+5/-0) bin/po/ko.po (+5/-0) bin/po/lo.po (+5/-0) bin/po/lt.po (+5/-0) bin/po/lv.po (+5/-0) bin/po/mk.po (+5/-0) bin/po/ml.po (+5/-0) bin/po/mn.po (+5/-0) bin/po/nb.po (+5/-0) bin/po/nl.po (+5/-0) bin/po/oc.po (+5/-0) bin/po/pl.po (+5/-0) bin/po/pt.po (+5/-0) bin/po/pt_BR.po (+5/-0) bin/po/ro.po (+5/-0) bin/po/rom.po (+5/-0) bin/po/ru.po (+5/-0) bin/po/sk.po (+29/-19) bin/po/sl.po (+5/-0) bin/po/sr.po (+5/-0) bin/po/sr@latin.po (+5/-0) bin/po/sv.po (+5/-0) bin/po/ta.po (+5/-0) bin/po/th.po (+5/-0) bin/po/tr.po (+5/-0) bin/po/uk.po (+5/-0) bin/po/ur.po (+5/-0) bin/po/vi.po (+5/-0) bin/po/zh_CN.po (+5/-0) bin/po/zh_TW.po (+5/-0) bin/tools/win32.py (+4/-4) bin/widget/screen/screen.py (+1/-1) bin/widget/view/form_gtk/action.py (+4/-0) bin/widget/view/form_gtk/image.py (+5/-1) bin/widget/view/form_gtk/one2many_list.py (+50/-35) setup.py (+1/-1) Text conflict in bin/po/ar.po Text conflict in bin/po/be.po Text conflict in bin/po/bg.po Text conflict in bin/po/bs.po Text conflict in bin/po/ca.po Text conflict in bin/po/cs.po Text conflict in bin/po/da.po Text conflict in bin/po/de.po Text conflict in bin/po/el.po Text conflict in bin/po/en_AU.po Text conflict in bin/po/en_CA.po Text conflict in bin/po/en_GB.po Text conflict in bin/po/es.po Text conflict in bin/po/es_CR.po Text conflict in bin/po/es_EC.po Text conflict in bin/po/et.po Text conflict in bin/po/eu.po Text conflict in bin/po/fa.po Text conflict in bin/po/fi.po Text conflict in bin/po/fr.po Text conflict in bin/po/gl.po Text conflict in bin/po/he.po Text conflict in bin/po/hr.po Text conflict in bin/po/hu.po Text conflict in bin/po/id.po Text conflict in bin/po/is.po Text conflict in bin/po/it.po Text conflict in bin/po/iu.po Text conflict in bin/po/ja.po Text conflict in bin/po/ko.po Text conflict in bin/po/lo.po Text conflict in bin/po/lt.po Text conflict in bin/po/lv.po Text conflict in bin/po/mk.po Text conflict in bin/po/ml.po Text conflict in bin/po/mn.po Text conflict in bin/po/nb.po Text conflict in bin/po/nl.po Text conflict in bin/po/oc.po Text conflict in bin/po/pl.po Text conflict in bin/po/pt.po Text conflict in bin/po/pt_BR.po Text conflict in bin/po/ro.po Text conflict in bin/po/rom.po Text conflict in bin/po/ru.po Text conflict in bin/po/sk.po Text conflict in bin/po/sl.po Text conflict in bin/po/sr.po Text conflict in bin/po/sr@latin.po Text conflict in bin/po/sv.po Text conflict in bin/po/ta.po Text conflict in bin/po/th.po Text conflict in bin/po/tr.po Text conflict in bin/po/uk.po Text conflict in bin/po/ur.po Text conflict in bin/po/vi.po Text conflict in bin/po/zh_CN.po Text conflict in bin/po/zh_TW.po |
| To merge this branch: | bzr merge lp://qastaging/~openerp-dev/openobject-client/6.1-opw-603062-acl |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP sa GTK client R&D | Pending | ||
|
Review via email:
|
|||
Description of the change
Drag and drop of image when path contains special char doesn't work.
Example: go to employees form view, try to change the picture by drag and drop on windows.
To post a comment you must log in.
Unmerged revisions
- 2109. By Anaël Closson (openerp)
-
[FIX] OPW 603062 : drag and drop of accented chars fails silently under windows
- 2108. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 2107. By Olivier Dony (Odoo)
-
[FIX] OPW 600261: incorrect call to search for all IDs just to find if one ID exists
The exists() method was created for this purpose,
and even that method did not exist, a search with
a restricted domain would at least avoid returning
a possibly huge list of useless results. - 2106. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 2105. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 2104. By Xavier ALT
-
[FIX] win32: also include GTK's share\locale overwise standard GTK terms will not be translated
- 2103. By Xavier ALT
-
[FIX] fix 'dictionary changed size during iteration' when adding row to one2many'
- 2102. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 2101. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
- 2100. By Launchpad Translations on behalf of openerp
-
Launchpad automatic translations update.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
