nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflict while merging v4 into v5

Browse Source
This commit is contained in:
Nabin Hait
2015-02-10 16:37:18 +05:30
parent 2813f38c5a eac82039e3
commit 15cd12214e
55 changed files with 7612 additions and 3974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/templates/form_grid/item_grid.html
View File

@@ -64,7 +64,7 @@
var delivered = doc.doctype==="Sales Order Item" ?
doc.delivered_qty : doc.received_qty,
completed =
100 - cint((doc.qty - delivered) * 100 / doc.qty),
100 - cint((flt(doc.qty) - flt(delivered)) * 100 / flt(doc.qty)),
title = __("Delivered");
%}
{% include "templates/form_grid/includes/progress.html" %}
@@ -96,7 +96,7 @@
{% if(in_list(["Sales Order Item", "Purchase Order Item"],
doc.doctype) && frm.doc.docstatus===1 && doc.amount) {
var completed =
100 - cint((doc.amount - doc.billed_amt) * 100 / doc.amount),
100 - cint((flt(doc.amount) - flt(doc.billed_amt)) * 100 / flt(doc.amount)),
title = __("Billed");
%}
<br><small>&nbsp;</small>