Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-to-issue-#12512
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 3c334c4..4a52526 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -75,7 +75,7 @@
this.content.find('.more').addClass('hidden');
}
- // If not any stock in any warehouses provide a message to end user
+ // If not any stock in any warehouses provide a message to end user
if (context.data.length > 0) {
$(frappe.render_template('item_dashboard_list', context)).appendTo(this.result);
} else {
@@ -86,6 +86,7 @@
get_item_dashboard_data: function(data, max_count, show_item) {
if(!max_count) max_count = 0;
if(!data) data = [];
+
data.forEach(function(d) {
d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production;
d.pending_qty = 0;
@@ -97,9 +98,16 @@
max_count = Math.max(d.actual_or_pending, d.actual_qty,
d.total_reserved, max_count);
});
+
+ var can_write = 0;
+ if(frappe.boot.user.can_write.indexOf("Stock Entry")>=0){
+ can_write = 1;
+ }
+
return {
data: data,
max_count: max_count,
+ can_write:can_write,
show_item: show_item || false
}
}
@@ -187,4 +195,4 @@
frappe.set_route('Form', doc.doctype, doc.name);
})
});
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/dashboard/item_dashboard_list.html b/erpnext/stock/dashboard/item_dashboard_list.html
index 63f2480..7d7f7e4 100644
--- a/erpnext/stock/dashboard/item_dashboard_list.html
+++ b/erpnext/stock/dashboard/item_dashboard_list.html
@@ -40,18 +40,20 @@
</span>
</div>
<div class="col-sm-2 text-right" style="margin-top: 8px;">
- {% if d.actual_qty %}
- <button class="btn btn-default btn-xs btn-move"
- data-warehouse="{{ d.warehouse }}"
- data-actual_qty="{{ d.actual_qty }}"
- data-item="{{ d.item_code }}">{{ __("Move") }}</a>
+ {% if can_write %}
+ {% if d.actual_qty %}
+ <button class="btn btn-default btn-xs btn-move"
+ data-warehouse="{{ d.warehouse }}"
+ data-actual_qty="{{ d.actual_qty }}"
+ data-item="{{ d.item_code }}">{{ __("Move") }}</a>
+ {% endif %}
+ <button style="margin-left: 7px;" class="btn btn-default btn-xs btn-add"
+ data-warehouse="{{ d.warehouse }}"
+ data-actual_qty="{{ d.actual_qty }}"
+ data-item="{{ d.item_code }}"
+ data-rate="{{ d.valuation_rate }}">{{ __("Add") }}</a>
{% endif %}
- <button style="margin-left: 7px;" class="btn btn-default btn-xs btn-add"
- data-warehouse="{{ d.warehouse }}"
- data-actual_qty="{{ d.actual_qty }}"
- data-item="{{ d.item_code }}"
- data-rate="{{ d.valuation_rate }}">{{ __("Add") }}</a>
</div>
</div>
</div>
-{% endfor %}
+{% endfor %}
\ No newline at end of file