fixed conflict
diff --git a/accounts/doctype/sales_invoice/sales_invoice_list.js b/accounts/doctype/sales_invoice/sales_invoice_list.js
index fcd6df1..e83611a 100644
--- a/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ b/accounts/doctype/sales_invoice/sales_invoice_list.js
@@ -1,7 +1,8 @@
// render
wn.listview_settings['Sales Invoice'] = {
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) {
data.paid_amount = flt(data.grand_total) ? (((flt(data.grand_total) -
flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) : 0;
diff --git a/patches/patch_list.py b/patches/patch_list.py
index f6a5996..e0493dc 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -242,5 +242,6 @@
"patches.april_2013.p04_update_role_in_pages",
"patches.april_2013.p05_fixes_in_reverse_modules",
"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",
]
\ No newline at end of file