git.inspyration.org Git - odoo/odoo.git/commit

author	xrg <>
	Fri, 20 Nov 2009 14:31:04 +0000 (20:01 +0530)
committer	Harry (Open ERP) <hmo@tinyerp.com>
	Fri, 20 Nov 2009 14:31:04 +0000 (20:01 +0530)
commit	dad1ff955b636ccbad687f2f3f731ee8f512bd6f
tree	e3405d96ef59f72094e5e300db24fb713e2b8838	tree \| snapshot
parent	b2a9a804ebf6c93ebe98751dd6b1008b8fe09306	commit \| diff
parent	f566ea57a83bab87a8c7fa9743d190b4520c89e2	commit \| diff

[merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts

bzr revid: hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9

39 files changed:

bin/addons/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir.xml	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_cron.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_sequence.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_values.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/workflow/print_instance.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/module/report/ir_module_reference_print.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/module/wizard/wizard_export_lang.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/res/ir_property.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/res/res_company.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/res/res_user.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/rng/view.rng	diff1 \|	diff2 \|	blob \| history
bin/import_xml.rng	diff1 \|	diff2 \|	blob \| history
bin/netsvc.py	diff1 \|	diff2 \|	blob \| history
bin/openerp-server.py	diff1 \|	diff2 \|	blob \| history
bin/osv/expression.py	diff1 \|	diff2 \|	blob \| history
bin/osv/fields.py	diff1 \|	diff2 \|	blob \| history
bin/osv/orm.py	diff1 \|	diff2 \|	blob \| history
bin/report/interface.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/rml.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/rml2html/rml2html.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/rml2pdf/trml2pdf.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/simple.py	diff1 \|	diff2 \|	blob \| history
bin/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history
bin/service/security.py	diff1 \|	diff2 \|	blob \| history
bin/service/web_services.py	diff1 \|	diff2 \|	blob \| history
bin/sql_db.py	diff1 \|	diff2 \|	blob \| history
bin/tiny_socket.py	diff1 \|	diff2 \|	blob \| history
bin/tools/config.py	diff1 \|	diff2 \|	blob \| history
bin/tools/convert.py	diff1 \|	diff2 \|	blob \| history
bin/tools/misc.py	diff1 \|	diff2 \|	blob \| history
bin/tools/translate.py	diff1 \|	diff2 \|	blob \| history
bin/wizard/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/workflow/instance.py	diff1 \|	diff2 \|	blob \| history
doc/Changelog-4.x.moved	\|	\|	blob
setup.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

bin/addons/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir.xml	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_cron.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_sequence.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_values.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/workflow/print_instance.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/module/report/ir_module_reference_print.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/module/wizard/wizard_export_lang.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/res/ir_property.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/res/res_company.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/res/res_user.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/rng/view.rng	diff1 \|	diff2 \|	blob \| history
bin/import_xml.rng	diff1 \|	diff2 \|	blob \| history
bin/netsvc.py	diff1 \|	diff2 \|	blob \| history
bin/openerp-server.py	diff1 \|	diff2 \|	blob \| history
bin/osv/expression.py	diff1 \|	diff2 \|	blob \| history
bin/osv/fields.py	diff1 \|	diff2 \|	blob \| history
bin/osv/orm.py	diff1 \|	diff2 \|	blob \| history
bin/report/interface.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/rml.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/rml2html/rml2html.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/rml2pdf/trml2pdf.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/simple.py	diff1 \|	diff2 \|	blob \| history
bin/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history
bin/service/security.py	diff1 \|	diff2 \|	blob \| history
bin/service/web_services.py	diff1 \|	diff2 \|	blob \| history
bin/sql_db.py	diff1 \|	diff2 \|	blob \| history
bin/tiny_socket.py	diff1 \|	diff2 \|	blob \| history
bin/tools/config.py	diff1 \|	diff2 \|	blob \| history
bin/tools/convert.py	diff1 \|	diff2 \|	blob \| history
bin/tools/misc.py	diff1 \|	diff2 \|	blob \| history
bin/tools/translate.py	diff1 \|	diff2 \|	blob \| history
bin/wizard/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/workflow/instance.py	diff1 \|	diff2 \|	blob \| history
doc/Changelog-4.x.moved	\|	\|	blob
setup.py	diff1 \|	diff2 \|	blob \| history