fp b698ba6e29 merge ... bzr revid: fp@fp-laptop-20110917173827-8ccsfwycvelvh4bi		2011-09-17 19:38:27 +02:00
..
i18n	Launchpad automatic translations update.	2011-09-06 04:40:18 +00:00
report	[Merge]	2011-09-17 13:03:17 +02:00
security	merged with trunk	2010-12-30 15:28:09 +05:30
test	[MERGE] merged the dev3 branch	2011-01-14 01:11:01 +01:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[MERGE] Other improvements of descriptions in module manifests.	2011-03-18 15:06:18 +01:00
sale_margin.py	merge	2011-09-17 19:38:27 +02:00
sale_margin_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30