Merge pull request #5907 from nabinhait/opportunity_status_fix

Added status converted in Opportunity
2016-07-28 16:29:04 +05:30 · 2016-07-28 16:25:46 +05:30 · 2016-07-27 16:33:37 +05:30 · 2016-07-27 16:04:18 +05:30
2 changed files with 3 additions and 3 deletions
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -265,7 +265,7 @@
   "no_copy": 1, 
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
-   "options": "Open\nQuotation\nLost\nReplied\nClosed", 
+   "options": "Open\nQuotation\nConverted\nLost\nReplied\nClosed", 
   "permlevel": 0, 
   "print_hide": 1, 
   "print_hide_if_no_value": 0, 
@@ -974,7 +974,7 @@
 "issingle": 0, 
 "istable": 0, 
 "max_attachments": 0, 
- "modified": "2016-03-03 06:13:49.728079", 
+ "modified": "2016-07-03 06:13:49.728079", 
 "modified_by": "Administrator", 
 "module": "CRM", 
 "name": "Opportunity", 
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -250,7 +250,7 @@ class update_entries_after(object):

 					self.valuation_rate = new_stock_value / new_stock_qty
 				else:
-					self.valuation_rate = self.outgoing_rate
+					self.valuation_rate = sle.outgoing_rate

 		else:
 			if flt(self.qty_after_transaction) >= 0 and sle.outgoing_rate:
Author	SHA1	Message	Date
Nabin Hait	6060499ef2	Merge pull request #5907 from nabinhait/opportunity_status_fix Added status converted in Opportunity	2016-07-28 16:29:04 +05:30
Nabin Hait	27ba588e63	Added status converted in Opportunity	2016-07-28 16:25:46 +05:30
Nabin Hait	ece5077b71	Merge pull request #5890 from nabinhait/sle_fix101 minor fix	2016-07-27 16:33:37 +05:30
Nabin Hait	c85db1cbb2	minor fix	2016-07-27 16:04:18 +05:30