mtr f989fe70f8 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll ... bzr revid: mtr@mtr-20110318114852-29h76togtrdlx053		2011-03-18 17:18:52 +05:30
..
i18n	Launchpad automatic translations update.	2011-04-05 04:47:06 +00: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] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll	2011-03-18 17:18:52 +05:30
procurement_pull.py	merged with trunk	2010-12-30 15:28:09 +05:30
procurement_pull_workflow.xml	merged with trunk	2010-12-30 15:28:09 +05:30
stock_location.py	merged with trunk	2010-12-30 15:28:09 +05:30
stock_location_demo_cpu1.xml	merged with trunk	2010-12-30 15:28:09 +05:30
stock_location_demo_cpu3.yml	merged with trunk	2010-12-30 15:28:09 +05:30
stock_location_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30