lp:~mikel-martin/openobject-server/6.1-fix-dbfilter-ignored-in-config-file
Created by
mikel
and last modified
- Get this branch:
- bzr branch lp:~mikel-martin/openobject-server/6.1-fix-dbfilter-ignored-in-config-file
Branch merges
Propose for merging
No branches
dependent on this one.
Ready for review
for merging
into
lp:openobject-server/6.1
- Amit Parik (community): Approve
- OpenERP Core Team: Pending requested
-
Diff: 11 lines (+1/-1)1 file modifiedopenerp/tools/config.py (+1/-1)
Superseded
for merging
into
lp:openobject-server
- Amit Parik (community): Needs Fixing
- OpenERP Core Team: Pending requested
-
Diff: 38687 lines (+16282/-18807) (has conflicts)66 files modifiedopenerp/addons/base/i18n/af.po (+3/-6)
openerp/addons/base/i18n/am.po (+3/-3)
openerp/addons/base/i18n/ar.po (+3/-361)
openerp/addons/base/i18n/bg.po (+3/-426)
openerp/addons/base/i18n/bs.po (+3/-39)
openerp/addons/base/i18n/ca.po (+3/-599)
openerp/addons/base/i18n/cs.po (+3/-568)
openerp/addons/base/i18n/da.po (+3/-46)
openerp/addons/base/i18n/de.po (+3/-603)
openerp/addons/base/i18n/el.po (+3/-436)
openerp/addons/base/i18n/en_GB.po (+10/-586)
openerp/addons/base/i18n/es.po (+10/-597)
openerp/addons/base/i18n/es_CL.po (+11/-608)
openerp/addons/base/i18n/es_CR.po (+6/-7)
openerp/addons/base/i18n/es_EC.po (+11/-606)
openerp/addons/base/i18n/et.po (+3/-265)
openerp/addons/base/i18n/eu.po (+3/-6)
openerp/addons/base/i18n/fa.po (+3/-216)
openerp/addons/base/i18n/fa_AF.po (+3/-3)
openerp/addons/base/i18n/fi.po (+10/-573)
openerp/addons/base/i18n/fr.po (+313/-642)
openerp/addons/base/i18n/gl.po (+3/-595)
openerp/addons/base/i18n/gu.po (+15203/-0)
openerp/addons/base/i18n/he.po (+3/-245)
openerp/addons/base/i18n/hr.po (+3/-494)
openerp/addons/base/i18n/hu.po (+3/-601)
openerp/addons/base/i18n/hy.po (+3/-3)
openerp/addons/base/i18n/id.po (+3/-12)
openerp/addons/base/i18n/is.po (+3/-3)
openerp/addons/base/i18n/it.po (+87/-634)
openerp/addons/base/i18n/ja.po (+31/-6)
openerp/addons/base/i18n/kk.po (+3/-57)
openerp/addons/base/i18n/ko.po (+3/-325)
openerp/addons/base/i18n/lt.po (+3/-72)
openerp/addons/base/i18n/lv.po (+3/-354)
openerp/addons/base/i18n/mk.po (+7/-34)
openerp/addons/base/i18n/mn.po (+3/-361)
openerp/addons/base/i18n/nb.po (+3/-327)
openerp/addons/base/i18n/nl.po (+20/-604)
openerp/addons/base/i18n/nl_BE.po (+5/-16)
openerp/addons/base/i18n/pl.po (+211/-633)
openerp/addons/base/i18n/pt.po (+3/-457)
openerp/addons/base/i18n/pt_BR.po (+125/-594)
openerp/addons/base/i18n/ro.po (+3/-609)
openerp/addons/base/i18n/ru.po (+3/-600)
openerp/addons/base/i18n/sk.po (+3/-480)
openerp/addons/base/i18n/sl.po (+3/-591)
openerp/addons/base/i18n/sq.po (+3/-3)
openerp/addons/base/i18n/sr.po (+3/-466)
openerp/addons/base/i18n/sr@latin.po (+3/-6)
openerp/addons/base/i18n/sv.po (+3/-496)
openerp/addons/base/i18n/th.po (+3/-3)
openerp/addons/base/i18n/tlh.po (+3/-3)
openerp/addons/base/i18n/tr.po (+3/-567)
openerp/addons/base/i18n/uk.po (+3/-273)
openerp/addons/base/i18n/ur.po (+3/-3)
openerp/addons/base/i18n/vi.po (+3/-185)
openerp/addons/base/i18n/zh_CN.po (+10/-528)
openerp/addons/base/i18n/zh_HK.po (+3/-12)
openerp/addons/base/i18n/zh_TW.po (+3/-312)
openerp/addons/base/module/wizard/base_module_upgrade.py (+3/-0)
openerp/modules/loading.py (+1/-1)
openerp/osv/fields.py (+9/-1)
openerp/osv/orm.py (+65/-43)
openerp/release.py (+1/-1)
openerp/tools/config.py (+1/-1)
Related bugs
Bug #940439: Once we save dbfilter in configuration file, It is ignored | Low | Fix Committed |
Related blueprints
Branch information
Recent revisions
- 4259. By Olivier Dony (Odoo)
-
[MERGE] OPW 576295: ir_attachment: fix regression/typo introduced in r.4069
count is explicitly set to False in order to
filter the results coming from upstream before
doing the actual count
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openobject-server