Merge with 2.3.15

diff --cc inventory/adjustments.php
Simple merge

diff --cc inventory/transfers.php
Simple merge

diff --cc purchasing/po_entry_items.php
Simple merge

diff --cc sales/sales_order_entry.php
index 60c1ff12423093fa6fcc8c5699eb57e4bb398426,da9b9ce9a275b94a72ae8c3a1534eeaec92d6ae3..bbd7b036c82738a060d9e765201240d4644db40c
--- 1/sales/sales_order_entry.php
--- 2/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@@ -739,6 -742,7 +763,7 @@@ if ($customer_error == "") 
  } else {
        display_error($customer_error);
  }
+ 
  end_form();
  end_page();
 -?>
 +?>