Merge pull request #2498 from anandpdoshi/anand-dec-15
[minor] use frappe.attach_print() in salary slip and recurring document
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index e21ff74..3681081 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -71,7 +71,7 @@
},
contact_person: function() {
- this.supplier_address();
+ erpnext.utils.get_contact_details(this.frm);
},
buying_price_list: function() {
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 6065ad5..5064703 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -175,7 +175,7 @@
"fieldtype": "Data",
"hidden": 0,
"label": "PO No",
- "no_copy": 1,
+ "no_copy": 0,
"oldfieldname": "po_no",
"oldfieldtype": "Data",
"permlevel": 0,
@@ -1021,7 +1021,7 @@
"idx": 1,
"is_submittable": 1,
"issingle": 0,
- "modified": "2014-12-12 12:35:09.652211",
+ "modified": "2014-12-16 10:36:47.295144",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 2eeba50..ec50b95 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -180,7 +180,7 @@
"fieldtype": "Data",
"hidden": 0,
"label": "Customer's Purchase Order No",
- "no_copy": 0,
+ "no_copy": 1,
"oldfieldname": "po_no",
"oldfieldtype": "Data",
"permlevel": 0,
@@ -1013,7 +1013,7 @@
"idx": 1,
"in_create": 0,
"is_submittable": 1,
- "modified": "2014-12-12 12:36:59.262500",
+ "modified": "2014-12-16 10:37:08.934881",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",