chm@openerp.com 13469c23d8 [MERGE] from trunk ... bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy		2014-04-24 15:58:41 +02:00
..
controllers	[REM] remove disable_db and ensure_db() from addons	2014-01-30 10:23:08 +01:00
data	[IMP] payment: renamed env field to environment, to avoid conflicts	2014-04-16 14:10:55 +02:00
doc	[MERGE] trunk-website-al	2014-01-31 01:51:57 +01:00
models	[IMP] payment_transfer: Transfer -> Wire Transfer + updated test	2014-04-04 10:45:28 +02:00
static	[RENAME] payment_acquirer_* -> payment_ *	2014-01-22 18:57:02 +01:00
views	[FIX] website_sale: payment if free	2014-01-28 17:38:15 +01:00
__init__.py	[RENAME] payment_acquirer_* -> payment_ *	2014-01-22 18:57:02 +01:00
__openerp__.py	[FIX] payment_*: fixed openerp.py file	2014-01-22 19:42:56 +01:00