Update patched files from FA 2.3.18

author Maxime Bourget <bmx007@gmail.com>

Sat, 7 Sep 2013 14:14:49 +0000 (15:14 +0100)

committer Maxime Bourget <bmx007@gmail.com>

Sat, 7 Sep 2013 14:14:49 +0000 (15:14 +0100)
author Maxime Bourget <bmx007@gmail.com>
Sat, 7 Sep 2013 14:14:49 +0000 (15:14 +0100)
committer Maxime Bourget <bmx007@gmail.com>
Sat, 7 Sep 2013 14:14:49 +0000 (15:14 +0100)
diff --cc purchasing/po_entry_items.php
Simple merge
diff --cc sales/sales_order_entry.php
Simple merge
author	Maxime Bourget <bmx007@gmail.com>
	Sat, 7 Sep 2013 14:14:49 +0000 (15:14 +0100)
committer	Maxime Bourget <bmx007@gmail.com>
	Sat, 7 Sep 2013 14:14:49 +0000 (15:14 +0100)
		1	2
purchasing/po_entry_items.php	patch \|	diff1 \|	diff2 \|	blob \| history
sales/sales_order_entry.php	patch \|	diff1 \|	diff2 \|	blob \| history