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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2013-04-22 13:17:24 +05:30
parent e7366f763b faab3c4cf2
commit 79269e9382
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/sales_invoice/sales_invoice_list.js
View File

@@ -1,7 +1,8 @@
// render // render
wn.listview_settings['Sales Invoice'] = { wn.listview_settings['Sales Invoice'] = {
add_fields: ["`tabSales Invoice`.grand_total", "`tabSales Invoice`.outstanding_amount"], add_fields: ["`tabSales Invoice`.grand_total", "`tabSales Invoice`.outstanding_amount"],
add_columns: [{"content":"paid_amount", width:"10%", type:"bar-graph", "label": "Paid"}], add_columns: [{"content":"paid_amount", width:"10%", type:"bar-graph",
label: "Payment Received"}],
prepare_data: function(data) { prepare_data: function(data) {
data.paid_amount = flt(data.grand_total) ? (((flt(data.grand_total) - data.paid_amount = flt(data.grand_total) ? (((flt(data.grand_total) -
flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) : 0; flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) : 0;

1
patches/patch_list.py
View File

@@ -242,5 +242,6 @@ patch_list = [
"patches.april_2013.p04_update_role_in_pages", "patches.april_2013.p04_update_role_in_pages",
"patches.april_2013.p05_fixes_in_reverse_modules", "patches.april_2013.p05_fixes_in_reverse_modules",
"execute:webnotes.delete_doc('DocType Mapper', 'Delivery Note-Packing Slip')", "execute:webnotes.delete_doc('DocType Mapper', 'Delivery Note-Packing Slip')",
"execute:webnotes.reload_doc('Stock', 'DocType', 'Delivery Note Item')",
"patches.april_2013.p06_default_cost_center", "patches.april_2013.p06_default_cost_center",
] ]