removed merge conflicts
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 618d106..070c93f 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
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'''
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.js b/erpnext/accounts/doctype/tax_rule/tax_rule.js
index 935ea62..16041a8 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.js
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.js
@@ -20,20 +20,22 @@
})
frappe.ui.form.on("Tax Rule", "customer", function(frm) {
- frappe.call({
- method:"erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details",
- args: {
- "party": frm.doc.customer,
- "party_type": "customer"
- },
- callback: function(r) {
- if(!r.exc) {
- $.each(r.message, function(k, v) {
- frm.set_value(k, v);
- });
+ if(frm.doc.customer) {
+ frappe.call({
+ method:"erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details",
+ args: {
+ "party": frm.doc.customer,
+ "party_type": "customer"
+ },
+ callback: function(r) {
+ if(!r.exc) {
+ $.each(r.message, function(k, v) {
+ frm.set_value(k, v);
+ });
+ }
}
- }
- });
+ });
+ }
});
frappe.ui.form.on("Tax Rule", "supplier", function(frm) {
diff --git a/erpnext/templates/includes/itemised_tax_breakup.html b/erpnext/templates/includes/itemised_tax_breakup.html
index 342ce6b..2ffc8b4 100644
--- a/erpnext/templates/includes/itemised_tax_breakup.html
+++ b/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>