Merge pull request #2042 from rmehta/pos-module
added icon for pos
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/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 04ad37f..d9035f4 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -203,7 +203,8 @@
target.qty = flt(obj.qty) - flt(obj.received_qty)
target.stock_qty = (flt(obj.qty) - flt(obj.received_qty)) * flt(obj.conversion_factor)
target.amount = (flt(obj.qty) - flt(obj.received_qty)) * flt(obj.rate)
- target.base_amount = (flt(obj.qty) - flt(obj.received_qty)) * flt(obj.base_rate)
+ target.base_amount = (flt(obj.qty) - flt(obj.received_qty)) * \
+ flt(obj.rate) * flt(source_parent.conversion_rate)
doc = get_mapped_doc("Purchase Order", source_name, {
"Purchase Order": {
@@ -235,8 +236,7 @@
def update_item(obj, target, source_parent):
target.amount = flt(obj.amount) - flt(obj.billed_amt)
target.base_amount = target.amount * flt(source_parent.conversion_rate)
- if flt(obj.base_rate):
- target.qty = target.base_amount / flt(obj.base_rate)
+ target.qty = target.amount / flt(obj.rate) if flt(obj.rate) else flt(obj.qty)
doc = get_mapped_doc("Purchase Order", source_name, {
"Purchase Order": {
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">