[MERGE]sync with trunk

author sgo@tinyerp.com <>

Thu, 13 Jun 2013 08:48:38 +0000 (14:18 +0530)

committer sgo@tinyerp.com <>

Thu, 13 Jun 2013 08:48:38 +0000 (14:18 +0530)
author sgo@tinyerp.com <>
Thu, 13 Jun 2013 08:48:38 +0000 (14:18 +0530)
committer sgo@tinyerp.com <>
Thu, 13 Jun 2013 08:48:38 +0000 (14:18 +0530)
diff --cc addons/account/account_bank_statement.py
Simple merge
diff --cc addons/account/account_cash_statement.py
Simple merge
diff --cc addons/account/account_view.xml
Simple merge
diff --cc addons/point_of_sale/point_of_sale.py
Simple merge
		1	2
addons/account/account_bank_statement.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account/account_cash_statement.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account/account_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	patch \|	diff1 \|	diff2 \|	blob \| history