Merge branch 'hotfix'

bumped to version 8.0.3
[Fix] patch v7_2.contact_address_links
2017-03-30 23:50:27 +05:30 · 2017-03-31 00:20:27 +06:00 · 2017-03-30 23:14:58 +05:30 · 2017-03-30 23:14:58 +05:30 · 2017-03-30 19:52:42 +05:30 · 2017-03-30 20:22:42 +06:00
8 changed files with 12 additions and 7 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
-__version__ = '8.0.1'
+__version__ = '8.0.3'
 def get_default_company(user=None):
 	'''Get default company for user'''
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -2094,7 +2094,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-03-29 16:26:36.507924", 
+ "modified": "2017-03-30 16:26:36.507924", 
 "modified_by": "Administrator", 
 "module": "Accounts", 
 "name": "Sales Invoice Item", 
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -381,3 +381,4 @@ erpnext.patches.v7_2.move_dates_from_salary_structure_to_employee
 erpnext.patches.v7_2.make_all_assessment_group
 erpnext.patches.v8_0.manufacturer_childtable_migrate
 erpnext.patches.v8_0.repost_reserved_qty_for_multiple_sales_uom
 erpnext.patches.v8_0.addresses_linked_to_lead
--- a/erpnext/patches/v7_2/contact_address_links.py
+++ b/erpnext/patches/v7_2/contact_address_links.py
@@ -9,7 +9,7 @@ def execute():
 	map_fields = (
 		('Customer', 'customer'),
 		('Supplier', 'supplier'),
-		('Load', 'lead'),
+		('Lead', 'lead'),
 		('Sales Partner', 'sales_partner')
 	)
 	for doctype in ('Contact', 'Address'):
--- a/erpnext/patches/v8_0/addresses_linked_to_lead.py
+++ b/erpnext/patches/v8_0/addresses_linked_to_lead.py
@@ -0,0 +1,4 @@
 import frappe
 def execute():
 	frappe.db.sql("""UPDATE `tabDynamic Link` SET link_doctype = 'Lead' WHERE link_doctype = 'Load'""")
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -1532,7 +1532,7 @@
 "istable": 1, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2017-03-13 19:35:44.119169", 
+ "modified": "2017-03-30 19:35:44.119169", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Quotation Item", 
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -1871,7 +1871,7 @@
 "istable": 1, 
 "max_attachments": 0, 
 "menu_index": 0, 
- "modified": "2017-03-13 16:18:49.367870", 
+ "modified": "2017-03-30 16:18:49.367870", 
 "modified_by": "Administrator", 
 "module": "Selling", 
 "name": "Sales Order Item", 
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -1894,7 +1894,7 @@
 "issingle": 0, 
 "istable": 1, 
 "max_attachments": 0, 
- "modified": "2017-03-13 19:34:42.305637", 
+ "modified": "2017-03-30 19:34:42.305637", 
 "modified_by": "Administrator", 
 "module": "Stock", 
 "name": "Delivery Note Item",
Author	SHA1	Message	Date
Nabin Hait	b596deb57d	Merge branch 'hotfix'	2017-03-30 23:50:27 +05:30
Nabin Hait	79fddcfac1	bumped to version 8.0.3	2017-03-31 00:20:27 +06:00
Revant Nandgaonkar	3d5bdeb90d	[Fix] patch v7_2.contact_address_links	2017-03-30 23:14:58 +05:30
Revant Nandgaonkar	d07c041125	[Fix] Addresses linked back to Lead	2017-03-30 23:14:58 +05:30
Nabin Hait	e64b75153a	Merge branch 'hotfix'	2017-03-30 19:52:42 +05:30
Nabin Hait	b207a0542a	bumped to version 8.0.2	2017-03-30 20:22:42 +06:00
Nabin Hait	620bde7144	Updated modified date to reload sales uom	2017-03-30 19:50:45 +05:30