[Merge]

author Vir (Open ERP) <vir@tinyerp.com>

Tue, 26 Oct 2010 05:32:54 +0000 (11:02 +0530)

committer Vir (Open ERP) <vir@tinyerp.com>

Tue, 26 Oct 2010 05:32:54 +0000 (11:02 +0530)
author Vir (Open ERP) <vir@tinyerp.com>
Tue, 26 Oct 2010 05:32:54 +0000 (11:02 +0530)
committer Vir (Open ERP) <vir@tinyerp.com>
Tue, 26 Oct 2010 05:32:54 +0000 (11:02 +0530)
diff --cc addons/account/account_view.xml
Simple merge
diff --cc addons/account/project/project_view.xml
Simple merge
diff --cc addons/account/report/account_invoice_report_view.xml
Simple merge
diff --cc addons/account_voucher/voucher_sales_purchase_view.xml
Simple merge
diff --cc addons/hr_evaluation/hr_evaluation.py
Simple merge
author	Vir (Open ERP) <vir@tinyerp.com>
	Tue, 26 Oct 2010 05:32:54 +0000 (11:02 +0530)
committer	Vir (Open ERP) <vir@tinyerp.com>
	Tue, 26 Oct 2010 05:32:54 +0000 (11:02 +0530)
		1	2
addons/account/account_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account/project/project_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account/report/account_invoice_report_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/voucher_sales_purchase_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/hr_evaluation/hr_evaluation.py	patch \|	diff1 \|	diff2 \|	blob \| history