pso (OpenERP) 8048661b01 [MERGE] Merge with main branch ... bzr revid: pso@tinyerp.com-20120719073136-a7a5t43y2nm51zji		2012-07-19 13:01:36 +05:30
..
data	[MERGE] manual merge of the branch from noviat lp:~noviat/openobject-addons/trunk-account_coda. The bzr merge commande was going crazy because of an initial wrong merge between this branch and the trunk, an extra .bzr folder and because of wrongly removed translations files...	2011-12-23 11:36:37 +01:00
i18n	[MERGE] Merge with main branch	2012-07-19 13:01:36 +05:30
report	[IMP] set logging.getLogger(__name__)	2012-06-22 12:18:54 +05:30
security	[MERGE] manual merge of the branch from noviat lp:~noviat/openobject-addons/trunk-account_coda. The bzr merge commande was going crazy because of an initial wrong merge between this branch and the trunk, an extra .bzr folder and because of wrongly removed translations files...	2011-12-23 11:36:37 +01:00
wizard	[MERGE] merged with maint runk	2012-06-29 14:36:18 +02:00
__init__.py	[FIX] a_b_s_e: removed un-necessary res.company.bank_ids field	2012-01-27 13:58:40 +01:00
__openerp__.py	[MERGE] active becomes auto_install: install this module when its dependencies (that can be empty) are satisfied	2012-01-30 22:18:12 +01:00
account_bank_statement.py	[MERGE] Merge with main branch	2012-07-19 13:01:36 +05:30
account_bank_statement_report.xml	[MERGE] manual merge of the branch from noviat lp:~noviat/openobject-addons/trunk-account_coda. The bzr merge commande was going crazy because of an initial wrong merge between this branch and the trunk, an extra .bzr folder and because of wrongly removed translations files...	2011-12-23 11:36:37 +01:00
account_bank_statement_view.xml	[MERGE] account_*: Merge mdi branch with little improvments	2012-06-18 12:14:45 +05:30
res_partner_bank.py	[IMP] account_bank_statement_extensions: cleaned import statements	2011-12-23 17:30:47 +01:00