← Back to branch summary

~openerp-dev/openobject-server/trunk-bug-1065988-aja

~openerp-dev/openobject-server/trunk-bug-1065988-aja

Viewing all changes in revision 4479.

Committer: Xavier Morel
Date: 2012-10-10 15:51:01 UTC
mfrom: (4408.2.46 trunk-newimport-phase2-xmo)
Revision ID: xmo@openerp.com-20121010155101-fs38ceua1mp7rw6z

[MERGE] second and last phase of new import

files added:
doc/import.rst

doc/o2m.txt

openerp/addons/base/ir/ir_fields.py

openerp/tests/addons/test_impex/tests/contacts_big.json

openerp/tests/addons/test_impex/tests/test_load.py

files modified:
.bzrignore

doc/api/user_img_specs.rst

doc/conf.py

doc/index.rst.inc

openerp/addons/base/ir/__init__.py

openerp/addons/base/ir/ir.xml

openerp/addons/base/ir/ir_actions.py

openerp/osv/expression.py

openerp/osv/fields.py

openerp/osv/orm.py

openerp/osv/query.py

openerp/sql_db.py

openerp/tests/addons/test_impex/models.py

openerp/tests/addons/test_impex/tests/__init__.py

openerp/tests/addons/test_impex/tests/test_import.py

openerp/tests/test_misc.py

openerp/tools/misc.py

setup.py

Show diffs side-by-side

added added

removed removed

doc/api/user_img_specs.rst

doc/index.rst.inc

openerp/addons/base/ir/__init__.py

openerp/addons/base/ir/ir.xml

openerp/addons/base/ir/ir_actions.py

openerp/addons/base/ir/ir_fields.py

openerp/osv/expression.py

openerp/osv/fields.py

openerp/osv/orm.py

openerp/osv/query.py

openerp/sql_db.py

openerp/tests/addons/test_impex/models.py

openerp/tests/addons/test_impex/tests/__init__.py

openerp/tests/addons/test_impex/tests/contacts_big.json

openerp/tests/addons/test_impex/tests/test_import.py

openerp/tests/addons/test_impex/tests/test_load.py

openerp/tests/test_misc.py

openerp/tools/misc.py

Older »