Olivier Dony 560915cb68 [MERGE] merged latest fixes from 6.0 up to r.4556 ... Rev 4556 = revision-id: jvo@tinyerp.com-20110502133745-s1zyed65h6ojwkvk. bzr revid: odo@openerp.com-20110502184643-d3qzosqdurscd51i		2011-05-02 20:46:43 +02:00
..
i18n	Launchpad automatic translations update.	2011-05-02 04:37:31 +00:00
report	merged with trunk	2010-12-30 15:28:09 +05:30
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] merged latest fixes from 6.0 up to r.4556	2011-05-02 20:46:43 +02:00
sale_margin_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30