Merge branch 'hotfix'

bumped to version 8.6.2
adds options to currency fields (#10118 )
2017-07-27 12:18:15 +05:30 · 2017-07-27 12:48:15 +06:00 · 2017-07-27 11:38:17 +05:30 · 2017-07-27 11:37:30 +05:30 · 2017-07-25 18:02:58 +05:30 · 2017-07-25 18:32:58 +06:00
4 changed files with 24 additions and 5 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -4,7 +4,7 @@ import inspect
 import frappe
 from erpnext.hooks import regional_overrides

-__version__ = '8.6.0'
+__version__ = '8.6.2'

 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -209,7 +209,10 @@ class GrossProfitGenerator(object):
 						sle.voucher_detail_no == row.item_row:
 							previous_stock_value = len(my_sle) > i+1 and \
 								flt(my_sle[i+1].stock_value) or 0.0
-							return  previous_stock_value - flt(sle.stock_value)
+							if previous_stock_value:
+								return previous_stock_value - flt(sle.stock_value)
+							else:
+								return flt(row.qty) * self.get_average_buying_rate(row, item_code)
 			else:
 				return flt(row.qty) * self.get_average_buying_rate(row, item_code)

--- a/erpnext/hr/doctype/repayment_schedule/repayment_schedule.json
+++ b/erpnext/hr/doctype/repayment_schedule/repayment_schedule.json
@@ -1,5 +1,6 @@
 {
 "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
 "allow_import": 0, 
 "allow_rename": 0, 
 "beta": 0, 
@@ -12,6 +13,7 @@
 "engine": "InnoDB", 
 "fields": [
  {
+   "allow_bulk_edit": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
@@ -22,6 +24,7 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
+   "in_global_search": 0, 
   "in_list_view": 1, 
   "in_standard_filter": 0, 
   "label": "Payment Date", 
@@ -40,6 +43,7 @@
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
@@ -50,11 +54,13 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
+   "in_global_search": 0, 
   "in_list_view": 1, 
   "in_standard_filter": 0, 
   "label": "Principal Amount", 
   "length": 0, 
   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -68,6 +74,7 @@
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
@@ -78,11 +85,13 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
+   "in_global_search": 0, 
   "in_list_view": 1, 
   "in_standard_filter": 0, 
   "label": "Interest Amount", 
   "length": 0, 
   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -96,6 +105,7 @@
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
@@ -106,11 +116,13 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
+   "in_global_search": 0, 
   "in_list_view": 1, 
   "in_standard_filter": 0, 
   "label": "Total Payment", 
   "length": 0, 
   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -124,6 +136,7 @@
   "unique": 0
  }, 
  {
+   "allow_bulk_edit": 0, 
   "allow_on_submit": 0, 
   "bold": 0, 
   "collapsible": 0, 
@@ -134,11 +147,13 @@
   "ignore_user_permissions": 0, 
   "ignore_xss_filter": 0, 
   "in_filter": 0, 
+   "in_global_search": 0, 
   "in_list_view": 1, 
   "in_standard_filter": 0, 
   "label": "Balance Loan Amount", 
   "length": 0, 
   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "precision": "", 
   "print_hide": 0, 
@@ -152,17 +167,17 @@
   "unique": 0
  }
 ], 
+ "has_web_view": 0, 
 "hide_heading": 0, 
 "hide_toolbar": 0, 
 "idx": 0, 
 "image_view": 0, 
 "in_create": 0, 
- "in_dialog": 0, 
 "is_submittable": 0, 
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-01-09 12:00:10.818772", 
+ "modified": "2017-07-26 14:47:29.862084", 
 "modified_by": "Administrator", 
 "module": "HR", 
 "name": "Repayment Schedule", 
@@ -172,6 +187,7 @@
 "quick_entry": 1, 
 "read_only": 0, 
 "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
 "sort_field": "modified", 
 "sort_order": "DESC", 
 "track_changes": 1, 
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -3659,7 +3659,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2017-07-19 13:45:02.965353", 
+ "modified": "2017-07-25 13:45:02.965353", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Sales Order",
Author	SHA1	Message	Date
mbauskar	cfc2693b2e	Merge branch 'hotfix'	2017-07-27 12:18:15 +05:30
mbauskar	448d919cc1	bumped to version 8.6.2	2017-07-27 12:48:15 +06:00
tundebabzy	87ec6a12ef	adds options to currency fields (#10118 )	2017-07-27 11:38:17 +05:30
rohitwaghchaure	059f99e621	[Fix] Wrong avg. buying rate in the Gross Profit report (#10110 )	2017-07-27 11:37:30 +05:30
Saurabh	4c28fa77bd	Merge branch 'hotfix'	2017-07-25 18:02:58 +05:30
Saurabh	394dbca0e4	bumped to version 8.6.1	2017-07-25 18:32:58 +06:00
Saurabh	33ebd9f88e	Merge pull request #10088 from saurabh6790/hot_fix_v_8_6_0 [hot][fix] updated modified date for sales order	2017-07-25 17:58:12 +05:30
Saurabh	4c1caa7e98	[hot][fix] updated modified date for sales order	2017-07-25 17:35:14 +05:30