Merge lp://qastaging/~openerp-community-testers/openobject-server/7.0-bug-938513 into lp://qastaging/openobject-server
Proposed by
Jean-Sébastien SUZANNE
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~openerp-community-testers/openobject-server/7.0-bug-938513 |
| Merge into: | lp://qastaging/openobject-server |
| Diff against target: |
11298 lines (+3843/-862) (has conflicts) 22 files modified
openerp/__init__.py (+0/-2) openerp/addons/base/i18n/de.po (+24/-1) openerp/addons/base/i18n/es_EC.po (+84/-64) openerp/addons/base/i18n/es_MX.po (+12/-2) openerp/addons/base/i18n/hr.po (+201/-136) openerp/addons/base/i18n/hu.po (+56/-16) openerp/addons/base/i18n/it.po (+12/-1) openerp/addons/base/i18n/nl.po (+224/-155) openerp/addons/base/i18n/pt.po (+11/-0) openerp/addons/base/i18n/pt_BR.po (+3162/-415) openerp/addons/base/ir/ir_model.py (+4/-0) openerp/addons/base/ir/osv_memory_autovacuum.py (+1/-1) openerp/addons/base/module/module.py (+30/-16) openerp/addons/base/module/module_view.xml (+3/-14) openerp/addons/base/res/res_company.py (+3/-3) openerp/addons/base/res/res_config.py (+3/-1) openerp/addons/base/res/res_partner_view.xml (+1/-0) openerp/modules/loading.py (+3/-5) openerp/osv/orm.py (+1/-1) openerp/run_tests.py (+0/-29) openerp/tools/config.py (+2/-0) setup.py (+6/-0) Text conflict in openerp/addons/base/i18n/de.po Text conflict in openerp/addons/base/i18n/es_EC.po Text conflict in openerp/addons/base/i18n/es_MX.po Text conflict in openerp/addons/base/i18n/hr.po Text conflict in openerp/addons/base/i18n/hu.po Text conflict in openerp/addons/base/i18n/it.po Text conflict in openerp/addons/base/i18n/nl.po Text conflict in openerp/addons/base/i18n/pt.po Text conflict in openerp/addons/base/i18n/pt_BR.po |
| To merge this branch: | bzr merge lp://qastaging/~openerp-community-testers/openobject-server/7.0-bug-938513 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Core Team | Pending | ||
|
Review via email:
|
|||
Description of the change
If the key server_wide_modules not null in openerp server config file then
the value is put in openerp.
this functionnality already exist by optparse but not in config.
this merge is linked with the bug report https:/
To post a comment you must log in.
Unmerged revisions
- 4812. By Jean-Sébastien SUZANNE
-
[FIX]bug 938513, read also on config file to know the server wide modules to load if not in optparse
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
