Merge pull request #2044 from nabinhait/hotfix
PO-PI mapping: divisional loss issue fixed
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index c5e9418..fda6548 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -103,7 +103,7 @@
company: cur_frm.doc.company
}
})
- });
+ }, "icon-download", "btn-default");
},
delivery_note_btn: function() {
@@ -123,7 +123,7 @@
};
}
});
- });
+ }, "icon-download", "btn-default");
},
tc_name: function() {
diff --git a/erpnext/utilities/doctype/note/note_list.html b/erpnext/utilities/doctype/note/note_list.html
index e106dd4..d3289d2 100644
--- a/erpnext/utilities/doctype/note/note_list.html
+++ b/erpnext/utilities/doctype/note/note_list.html
@@ -3,7 +3,7 @@
<div class="text-ellipsis">
{%= list.get_avatar_and_id(doc) %}
- {% if(doc.public) { %}
+ {% if(!doc.public) { %}
<span style="margin-right: 8px;"
title="{%= __("Private") %}" class="filterable"
data-filter="public,=,Yes">