Christophe Simonis 0c7f17c0ac merge upstream ... bzr revid: chs@openerp.com-20121217172614-3z1pstu5th26wuuc		2012-12-17 18:26:14 +01:00
..
data	[IMP] openerp python module.	2011-02-07 13:57:23 +01:00
i18n	Launchpad automatic translations update.	2012-12-17 04:44:38 +00:00
ir	[MERGE] trunk-style-improvements-xmo (Python stylistic improvement)	2012-12-17 12:01:50 +01:00
module	merge upstream	2012-12-17 18:26:14 +01:00
report	[IMP] remove useless <br/> and space	2012-08-24 14:36:13 +02:00
res	merge upstream	2012-12-17 18:26:14 +01:00
rng	[IMP] revert improt add	2012-11-26 08:21:47 +01:00
security	[FIX] remove res.partner.address model	2012-12-11 19:29:34 +01:00
static/src	[REM] remove // FIXME comments are they are now fixed	2012-11-14 17:57:17 +01:00
test	[MERGE] Sync with trunk	2012-10-19 09:58:56 +05:30
tests	[IMP] ir.ui.menu: deleting a menu should orphan its children w/o corrupting the `parent_store` struct: test + fix	2012-12-13 15:58:21 +01:00
__init__.py	Remove OpenERP Enterprise.	2012-08-22 11:58:23 +05:30
__openerp__.py	merge upstream	2012-12-17 18:26:14 +01:00
base.sql	[FIX] lang on res.users is still used	2012-11-22 16:21:59 +01:00
base_data.xml	[IMP] logo of company: False or OpenERP logo if demo data	2012-12-15 22:32:19 +01:00
base_demo.xml	[MERGE] trunk-acl-thu (check read/write access restrictions on fields with a groups attribute)	2012-12-17 11:15:28 +01:00
base_menu.xml	[FIX] open menu	2012-09-16 16:47:45 +02:00
currency_data.xml	[FIX] base: USD currency symbol should be displayed before the amount	2012-09-27 10:25:49 +02:00