removed merge conflicts

erpnext/__init__.py

@@ -4,7 +4,7 @@ import inspect
 import frappe
 from erpnext.hooks import regional_overrides
 
-__version__ = '8.6.6'
+__version__ = '8.7.0'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/doctype/tax_rule/tax_rule.js

@@ -20,20 +20,22 @@ frappe.ui.form.on("Tax Rule", "refresh", function(frm) {
 })
 
 frappe.ui.form.on("Tax Rule", "customer", function(frm) {
-	frappe.call({
+	if(frm.doc.customer) {
-		method:"erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details",
+		frappe.call({
-		args: {
+			method:"erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details",
-			"party": frm.doc.customer,
+			args: {
-			"party_type": "customer"
+				"party": frm.doc.customer,
-		},
+				"party_type": "customer"
-		callback: function(r) {
+			},
-			if(!r.exc) {
+			callback: function(r) {
-				$.each(r.message, function(k, v) {
+				if(!r.exc) {
-					frm.set_value(k, v);
+					$.each(r.message, function(k, v) {
-				});
+						frm.set_value(k, v);
+					});
+				}
 			}
-		}
+		});
-	});
+	}
 });
 
 frappe.ui.form.on("Tax Rule", "supplier", function(frm) {

erpnext/templates/includes/itemised_tax_breakup.html

@@ -2,14 +2,12 @@
 	<table class="table table-bordered table-hover">
 		<thead>
 			<tr>
-				{% set i = 0 %}
 				{% for key in headers %}
-					{% if i==0 %}
+					{% if loop.first %}
 						<th style="min-width: 120px;" class="text-left">{{ key }}</th>
 					{% else %}
 						<th style="min-width: 80px;" class="text-right">{{ key }}</th>
 					{% endif %}
-					{% set i = i + 1 %}
 				{% endfor%}
 			</tr>
 		</thead>