Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. ... bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk		2014-01-16 11:39:10 +01:00
..
i18n	Launchpad automatic translations update.	2013-11-20 05:25:25 +00:00
process	[REM] more nonsensical @model + @ref	2013-04-29 14:52:17 +02:00
report	[REF] removed explicit model instanciations.	2013-04-15 12:23:49 +02:00
security	[IMP] Security Rule: removed duplicates due to inheritancies of groups	2011-12-12 19:11:13 +01:00
static/img	[IMP] Backport one feature from website: this feature allows to specify a file	2014-01-09 16:45:50 +01:00
test	[IMP] cleanup of Yaml files: do not translate assert messages	2013-03-21 14:18:24 +01:00
wizard	[REF] removed explicit model instanciations.	2013-04-15 12:23:49 +02:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[MERGE] trunk-website-demo-partner-bth	2013-11-28 18:36:21 +01:00
membership.py	[IMP] Improved Help	2013-06-05 12:34:25 +05:30
membership_demo.xml	[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.	2014-01-16 11:39:10 +01:00
membership_demo.yml	[IMP]Improved code.	2013-10-31 16:17:19 +05:30
membership_view.xml	[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry	2013-09-10 14:48:03 +02:00