← Back to branch summary

~openerp-dev/openobject-server/trunk-opw-575650-port-cha

~openerp-dev/openobject-server/trunk-opw-575650-port-cha

Viewing all changes in revision 4638.

Committer: Ajay Chauhan (OpenERP)
Date: 2012-12-13 06:13:23 UTC
mfrom: (4635.1.47 trunk)
Revision ID: cha@tinyerp.com-20121213061323-j9vwkmvkpajiqfgm

[MERGE] merge with lp:openobject-server

files added:
doc/06_misc_auto_join.rst

files removed:
bin

bin/openerp-server.py

openerp/test

openerp/test/__init__.py

openerp/tools/threadinglocal.py

openerp/wizard

openerp/wizard/__init__.py

files renamed:
openerp/cron.py => openerp/service/cron.py

openerp/test/test_osv.py => openerp/tests/test_osv.py

openerp/test/test_translate.py => openerp/tests/test_translate.py

files modified:
debian/control

doc/03_module_dev_04.rst

doc/06_misc.rst

doc/06_misc_import.rst

doc/index.rst

openerp/__init__.py

openerp/addons/base/i18n/de.po

openerp/addons/base/i18n/es.po

openerp/addons/base/i18n/es_DO.po

openerp/addons/base/i18n/hr.po

openerp/addons/base/i18n/hu.po

openerp/addons/base/i18n/it.po

openerp/addons/base/i18n/pl.po

openerp/addons/base/i18n/pt.po

openerp/addons/base/i18n/pt_BR.po

openerp/addons/base/ir/ir_actions.py

openerp/addons/base/ir/ir_cron.py

openerp/addons/base/ir/ir_needaction.py

openerp/addons/base/ir/ir_rule.py

openerp/addons/base/ir/ir_ui_menu.py

openerp/addons/base/module/module.py

openerp/addons/base/res/res_partner_view.xml

openerp/addons/base/res/res_users.py

openerp/addons/base/res/res_users_view.xml

openerp/addons/base/tests/test_expression.py

openerp/addons/base/tests/test_search.py

openerp/cli/__init__.py

openerp/conf/__init__.py

openerp/modules/module.py

openerp/modules/registry.py

openerp/netsvc.py

openerp/osv/expression.py

openerp/osv/fields.py

openerp/osv/orm.py

openerp/osv/osv.py

openerp/osv/query.py

openerp/service/__init__.py

openerp/service/http_server.py

openerp/service/netrpc_server.py

openerp/service/web_services.py

openerp/service/workers.py

openerp/service/wsgi_server.py

openerp/tests/__init__.py

openerp/tests/test_expression.py

openerp/tools/cache.py

openerp/tools/config.py

openerp/tools/image.py

setup.py

Show diffs side-by-side

added added

removed removed

bin/openerp-server.py

doc/03_module_dev_04.rst

doc/06_misc.rst

doc/06_misc_auto_join.rst

doc/06_misc_import.rst

openerp/__init__.py

openerp/addons/base/i18n/de.po

openerp/addons/base/i18n/es.po

openerp/addons/base/i18n/es_DO.po

openerp/addons/base/i18n/hr.po

openerp/addons/base/i18n/hu.po

openerp/addons/base/i18n/it.po

openerp/addons/base/i18n/pl.po

openerp/addons/base/i18n/pt.po

openerp/addons/base/i18n/pt_BR.po

openerp/addons/base/ir/ir_actions.py

openerp/addons/base/ir/ir_cron.py

openerp/addons/base/ir/ir_needaction.py

openerp/addons/base/ir/ir_rule.py

openerp/addons/base/ir/ir_ui_menu.py

openerp/addons/base/module/module.py

openerp/addons/base/res/res_partner_view.xml

openerp/addons/base/res/res_users.py

openerp/addons/base/res/res_users_view.xml

openerp/addons/base/tests/test_expression.py

openerp/addons/base/tests/test_search.py

openerp/cli/__init__.py

openerp/conf/__init__.py

openerp/modules/module.py

openerp/modules/registry.py

openerp/netsvc.py

openerp/osv/expression.py

openerp/osv/fields.py

openerp/osv/orm.py

openerp/osv/osv.py

openerp/osv/query.py

openerp/service/__init__.py

openerp/service/cron.py

openerp/service/http_server.py

openerp/service/netrpc_server.py

openerp/service/web_services.py

openerp/service/workers.py

openerp/service/wsgi_server.py

openerp/test/__init__.py

openerp/tests/__init__.py

openerp/tests/test_expression.py

openerp/tests/test_osv.py

openerp/tools/cache.py

openerp/tools/config.py

openerp/tools/image.py

openerp/tools/threadinglocal.py

openerp/wizard/

openerp/wizard/__init__.py

Older »