[MERGE] merged with main addons

author Darshan Kalola (OpenERP Trainee) <darshankalola@gmail.com>

Mon, 10 Jun 2013 07:14:31 +0000 (12:44 +0530)

committer Darshan Kalola (OpenERP Trainee) <darshankalola@gmail.com>

Mon, 10 Jun 2013 07:14:31 +0000 (12:44 +0530)
author Darshan Kalola (OpenERP Trainee) <darshankalola@gmail.com>
Mon, 10 Jun 2013 07:14:31 +0000 (12:44 +0530)
committer Darshan Kalola (OpenERP Trainee) <darshankalola@gmail.com>
Mon, 10 Jun 2013 07:14:31 +0000 (12:44 +0530)
diff --cc addons/account/account_invoice_view.xml
Simple merge
diff --cc addons/account/account_view.xml
Simple merge
diff --cc addons/account/project/project_view.xml
Simple merge
diff --cc addons/account_followup/report/account_followup_report.xml
Simple merge
diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge
diff --cc addons/procurement/procurement_view.xml
Simple merge
author	Darshan Kalola (OpenERP Trainee) <darshankalola@gmail.com>
	Mon, 10 Jun 2013 07:14:31 +0000 (12:44 +0530)
committer	Darshan Kalola (OpenERP Trainee) <darshankalola@gmail.com>
	Mon, 10 Jun 2013 07:14:31 +0000 (12:44 +0530)
		1	2
addons/account/account_invoice_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account/account_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account/project/project_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_followup/report/account_followup_report.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/procurement/procurement_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history