lp:~bstanciu/openobject-server/trunk-dev

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:openobject-server

Vo Minh Thu (community): Disapprove on 2011-04-18

Diff: 1520 lines (+412/-413)

46 files modified

MANIFEST.in (+6/-6)
openerp-server.py (+0/-258)
openerp/addons/__init__.py (+9/-9)
openerp/ir/ir.py (+2/-2)
openerp/openerp-server.py (+258/-0)
openerp/osv/expression.py (+1/-1)
openerp/osv/fields.py (+3/-3)
openerp/osv/orm.py (+6/-6)
openerp/osv/osv.py (+4/-4)
openerp/pooler.py (+4/-4)
openerp/report/__init__.py (+1/-1)
openerp/report/custom.py (+8/-8)
openerp/report/interface.py (+4/-4)
openerp/report/print_xml.py (+5/-5)
openerp/report/printscreen/ps_form.py (+4/-4)
openerp/report/printscreen/ps_list.py (+5/-5)
openerp/report/render/html2html/html2html.py (+2/-2)
openerp/report/render/makohtml2html/makohtml2html.py (+1/-1)
openerp/report/render/odt2odt/odt2odt.py (+1/-1)
openerp/report/render/rml2html/rml2html.py (+1/-1)
openerp/report/render/rml2pdf/customfonts.py (+1/-1)
openerp/report/render/rml2pdf/trml2pdf.py (+2/-2)
openerp/report/render/rml2pdf/utils.py (+3/-3)
openerp/report/render/rml2txt/utils.py (+1/-1)
openerp/report/report_sxw.py (+4/-4)
openerp/service/http_server.py (+2/-2)
openerp/service/netrpc_server.py (+3/-3)
openerp/service/security.py (+2/-2)
openerp/service/web_services.py (+12/-12)
openerp/test/test_osv.py (+1/-1)
openerp/test/test_translate.py (+1/-1)
openerp/tools/amount_to_text_en.py (+1/-1)
openerp/tools/config.py (+3/-4)
openerp/tools/convert.py (+5/-5)
openerp/tools/misc.py (+4/-4)
openerp/tools/test_reports.py (+4/-4)
openerp/tools/translate.py (+3/-3)
openerp/tools/yaml_import.py (+3/-3)
openerp/wizard/__init__.py (+9/-9)
openerp/workflow/instance.py (+2/-2)
openerp/workflow/wkf_expr.py (+4/-4)
openerp/workflow/wkf_logs.py (+1/-1)
openerp/workflow/wkf_service.py (+2/-2)
openerp/workflow/workitem.py (+1/-1)
setup.cfg (+2/-2)
setup.py (+11/-11)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #700770: [6.0 rc2] export translation fails with error	Undecided	Fix Released
Bug #715667: [6.0 trunk] setup stops with missing file(s)	Medium	Fix Released

Link a bug report

Related blueprints

3355. By Bogdan Stanciu on 2011-02-09

[FIX] repaired broken setup due to wrong references in various files.

3354. By Olivier Dony (Odoo) on 2011-02-09

[FIX] tools.translate: add missing imports after previous merge

3353. By Olivier Dony (Odoo) on 2011-02-08

[FIX] tools.config: override root_path in config, and avoid saving it

This should help avoid common issues with an obsolete root_path saved in
the config file. We also expand the path on-the-fly, and do the same for
addons_path.

3352. By Olivier Dony (Odoo) on 2011-02-08

[MERGE] merged latest 6.0 fixes up to rev 3339

Revision 3339 = <email address hidden>

3351. By Vo Minh Thu on 2011-02-08

[MERGE] merge of the openerp python module branch.

3350. By Launchpad Translations on behalf of openerp on 2011-02-08

Launchpad automatic translations update.

3349. By Olivier Dony (Odoo) on 2011-02-07

[REL] release: bumped up trunk release to 6.1-dev

3348. By Olivier Dony (Odoo) on 2011-02-07

[IMP] tools.config: reorganize some config options in groups

3347. By Olivier Dony (Odoo) on 2011-02-07

[FIX] orm.write: parent_store updates must be processed in correct order to avoid edge cases

3346. By Olivier Dony (Odoo) on 2011-02-07

[FIX] fields.o2m.set(): typo in previous commit, should pass IDs as list to write()