merged hotfix branch into staging (#10191)
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)
* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159)
This reverts commit 4d2e782e42e9875429b5c55934c41dbc5d1d7b20.
* [Fix] Unable to save asset because of float error issue (#10157)
* bumped to version 8.6.4
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)
* Set billing hours to 0 in timesheet #9535 (#10139)
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
* [Fix] Timesheet Company Issue
* Added delivery date in SO parent form. Fixes #10104 (#10155)
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
* bumped to version 8.6.5
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 2aabfc6..d018968 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -423,7 +423,9 @@
erpnext.patches.v8_1.update_expense_claim_status
erpnext.patches.v8_3.update_company_total_sales
erpnext.patches.v8_4.make_scorecard_records
-erpnext.patches.v8_1.set_delivery_date_in_so_item
+erpnext.patches.v8_1.set_delivery_date_in_so_item #2017-07-28
erpnext.patches.v8_5.fix_tax_breakup_for_non_invoice_docs
erpnext.patches.v8_5.remove_quotations_route_in_sidebar
erpnext.patches.v8_5.update_existing_data_in_project_type
+erpnext.patches.v8_5.update_customer_group_in_POS_profile
+erpnext.patches.v8_6.update_timesheet_company_from_PO
\ No newline at end of file