P. Christeas 5ee5a1caef Merge remote branch 'origin/master' into optimize ...

Conflicts:
	bin/osv/expression.py
	bin/osv/orm.py

bzr revid: p_christ@hol.gr-20091026105650-49wvuk3o7qw1ybkn

2009-10-26 12:56:50 +02:00

..

i18n

Merge origin/5.0.4 into xrg

2009-08-28 21:02:03 +03:00

ir

Merge remote branch 'origin/master' into optimize

2009-10-26 12:56:50 +02:00

maintenance

[IMP] maintenance: complete the remarks with the database name

2009-06-05 18:42:16 +02:00

module

Merge remote branch 'origin/master' into optimize

2009-10-26 12:56:50 +02:00

report

[Fix,IMP]:xsl:sml reports for comment node and when there is no type attribute in the node also improved the header for the xsl:xml reports

2009-08-25 12:59:34 +05:30

res

Merge remote branch 'origin/master' v5.0.6 into xrg

2009-09-25 23:49:10 +03:00

rng

Merge remote branch 'origin/master' v5.0.6 into xrg

2009-09-25 23:49:10 +03:00

security

Merge branch 'master' of openobject-server into mdv-gpl3-fwd

2008-12-23 17:46:08 +02:00

__init__.py

[IMP] Update the copyright to 2009

2009-01-04 23:13:29 +01:00

__terp__.py

[IMP] Prefix the certificate ID with 00

2009-02-03 18:09:16 +01:00

base_data.xml

Merge remote branch 'origin/master' v5.0.6 into xrg

2009-09-25 23:49:10 +03:00

base_demo.xml

fix error in demo data

2008-09-22 16:23:50 +02:00

base_menu.xml

bugfixes_in_flight

2008-12-11 09:19:31 +01:00

base_update.xml

[FIX] force fields in the user preferencesform to be editable

2009-01-21 14:51:22 +01:00

base.sql

[FIX] increase size of field "name" of ir.model.data

2009-08-07 15:52:08 +02:00