P. Christeas 3814e4dc73 Merge commit 'origin/master' into mdv-gpl3-py26 ... Conflicts: bin/report/interface.py bin/report/printscreen/ps_list.py bin/report/render/__init__.py bin/report/render/rml.py bin/report/render/rml2pdf/trml2pdf.py bin/sql_db.py bzr revid: p_christ@hol.gr-20090506201813-qb71ec85xr08obb1		2009-05-06 23:18:13 +03:00
..
i18n	Merge commit 'origin/master' into mdv-gpl3-py26	2009-04-24 20:10:33 +03:00
ir	Merge commit 'origin/master' into mdv-gpl3-py26	2009-05-06 23:18:13 +03:00
maintenance	[FIX] maintenance contract: error when adding a contract without any modules covered	2009-05-05 14:39:15 +02:00
module	Merge commit 'origin/master' into mdv-gpl3-py26	2009-05-06 23:18:13 +03:00
report	[MERGE] backport - Add the missing corporate_defaults.xsl file in the base/report directory	2009-02-18 17:15:02 +01:00
res	Merge commit 'origin/master' into mdv-gpl3-py26	2009-04-24 20:10:33 +03:00
rng	Merge commit 'origin/master' into mdv-gpl3-py26	2009-05-06 23:18:13 +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.sql	Merge commit 'origin/master' into mdv-gpl3-py26	2009-05-06 23:18:13 +03:00
base_data.xml	Merge commit 'origin/master' into mdv-gpl3-py26	2009-04-06 16:06:41 +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